Changeset 29060 in vbox

Timestamp:

May 5, 2010 9:14:49 AM (15 years ago)

Author:

vboxsync

Message:

pam: nits

File:

• trunk/src/VBox/Additions/common/pam/pam_vbox.c (modified) (8 diffs)

trunk/src/VBox/Additions/common/pam/pam_vbox.c

@@ -25 +25 @@
 
 #ifdef _DEBUG
- #define PAM_DEBUG
+# define PAM_DEBUG
 #endif
 
@@ -34 +34 @@
 #include <security/pam_appl.h>
 #ifdef RT_OS_LINUX
-#include <security/_pam_macros.h>
+# include <security/_pam_macros.h>
 #endif
 
@@ -53 +53 @@
 /** For debugging. */
 #ifdef _DEBUG
- static pam_handle_t *g_pam_handle;
- static int g_verbosity = 99;
+static pam_handle_t *g_pam_handle;
+static int g_verbosity = 99;
 #else
- static int g_verbosity = 0;
+static int g_verbosity = 0;
 #endif
 
@@ -67 +67 @@
 {
 #ifdef RT_OS_LINUX
-        openlog("pam_vbox", LOG_PID, LOG_AUTHPRIV);
-        syslog(LOG_ERR, pszBuf);
-        closelog();
+    openlog("pam_vbox", LOG_PID, LOG_AUTHPRIV);
+    syslog(LOG_ERR, pszBuf);
+    closelog();
 #elif defined(RT_OS_SOLARIS)
-        syslog(LOG_ERR, "pam_vbox: %s\n", pszBuf);
+    syslog(LOG_ERR, "pam_vbox: %s\n", pszBuf);
 #endif
 }
@@ -87 +87 @@
     char *buf;
     va_start(va, pszFormat);
-    /** @todo is this NULL terminated? */
     if (RT_SUCCESS(RTStrAPrintfV(&buf, pszFormat, va)))
     {
@@ -106 +105 @@
 static void pam_vbox_log(pam_handle_t *h, const char *pszFormat, ...)
 {
-    va_list va;
-    char *buf;
-    va_start(va, pszFormat);
-    /** @todo is this NULL terminated? */
-    if (RT_SUCCESS(RTStrAPrintfV(&buf, pszFormat, va)))
-    {
-        if (g_verbosity)
+    if (g_verbosity)
+    {
+        va_list va;
+        char *buf;
+        va_start(va, pszFormat);
+        if (RT_SUCCESS(RTStrAPrintfV(&buf, pszFormat, va)))
         {
             /* Only do normal logging in debug mode; could contain
@@ -119 +117 @@
             /* Log to syslog */
             pam_vbox_writesyslog(buf);
+            RTStrFree(buf);
         }
-        RTStrFree(buf);
-    }
-    va_end(va);
+        va_end(va);
+    }
 }
 
@@ -265 +263 @@
     {
         if (!RTStrICmp(argv[i], "debug"))
-            g_verbosity=1;
+            g_verbosity = 1;
         else
             pam_vbox_error(h, "pam_sm_authenticate: unknown command line argument \"%s\"\n", argv[i]);