Changeset 537 in openpam

Timestamp:

03/31/12 16:20:13 (14 months ago)

Author:

des

Message:

Save errno before calling asprintf(), since asprintf() may touch errno,
which will cause syslog() to log the wrong error message if the format
string contains %m.

File:

• trunk/lib/openpam_log.c (modified) (3 diffs)

trunk/lib/openpam_log.c

@@ -40 +40 @@
 #endif
 
-#include <ctype.h>
+#include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <syslog.h>
 
@@ -102 +101 @@
         char *format;
         int priority;
+        int serrno;
 
         switch (level) {
@@ -121 +121 @@
         }
         va_start(ap, fmt);
+        serrno = errno;
         if (asprintf(&format, "in %s(): %s", func, fmt) > 0) {
+                errno = serrno;
                 vsyslog(priority, format, ap);
                 FREE(format);
         } else {
+                errno = serrno;
                 vsyslog(priority, fmt, ap);
         }