Changeset 522 in openpam

Timestamp:

Jan 11, 2012, 12:13:25 AM (9 years ago)

Author:

Dag-Erling Smørgrav

Message:

Add another log level, PAM_LOG_LIBDEBUG, with a negative priority. It
is currently equivalent to PAM_LOG_DEBUG, and is used only by the
library call tracing macros (ENTER*() and RETURN*()). It should
eventually replace PAM_LOG_DEBUG throughout the library, except
perhaps for a few particularly interesting messages; PAM_LOG_DEBUG
will be reserved for modules.

Location:

trunk

Files:

• include/security/openpam.h (modified) (1 diff)
• lib/openpam_debug.h (modified) (3 diffs)
• lib/openpam_log.c (modified) (1 diff)

trunk/include/security/openpam.h

@@ -164 +164 @@
  */
 enum {
+        PAM_LOG_LIBDEBUG = -1,
         PAM_LOG_DEBUG,
         PAM_LOG_VERBOSE,

trunk/lib/openpam_debug.h

@@ -40 +40 @@
 
 #ifdef OPENPAM_DEBUG
-#define ENTER() openpam_log(PAM_LOG_DEBUG, "entering")
+#define ENTER() openpam_log(PAM_LOG_LIBDEBUG, "entering")
 #define ENTERI(i) do { \
         int i_ = (i); \
         if (i_ > 0 && i_ < PAM_NUM_ITEMS) \
-                openpam_log(PAM_LOG_DEBUG, "entering: %s", pam_item_name[i_]); \
+                openpam_log(PAM_LOG_LIBDEBUG, "entering: %s", pam_item_name[i_]); \
         else \
-                openpam_log(PAM_LOG_DEBUG, "entering: %d", i_); \
+                openpam_log(PAM_LOG_LIBDEBUG, "entering: %d", i_); \
 } while (0)
 #define ENTERN(n) do { \
         int n_ = (n); \
-        openpam_log(PAM_LOG_DEBUG, "entering: %d", n_); \
+        openpam_log(PAM_LOG_LIBDEBUG, "entering: %d", n_); \
 } while (0)
 #define ENTERS(s) do { \
         const char *s_ = (s); \
         if (s_ == NULL) \
-                openpam_log(PAM_LOG_DEBUG, "entering: NULL"); \
+                openpam_log(PAM_LOG_LIBDEBUG, "entering: NULL"); \
         else \
-                openpam_log(PAM_LOG_DEBUG, "entering: '%s'", s_); \
+                openpam_log(PAM_LOG_LIBDEBUG, "entering: '%s'", s_); \
 } while (0)
-#define RETURNV() openpam_log(PAM_LOG_DEBUG, "returning")
+#define RETURNV() openpam_log(PAM_LOG_LIBDEBUG, "returning")
 #define RETURNC(c) do { \
         int c_ = (c); \
         if (c_ >= 0 && c_ < PAM_NUM_ERRORS) \
-                openpam_log(PAM_LOG_DEBUG, "returning %s", pam_err_name[c_]); \
+                openpam_log(PAM_LOG_LIBDEBUG, "returning %s", pam_err_name[c_]); \
         else \
-                openpam_log(PAM_LOG_DEBUG, "returning %d!", c_); \
+                openpam_log(PAM_LOG_LIBDEBUG, "returning %d!", c_); \
         return (c_); \
 } while (0)
 #define RETURNN(n) do { \
         int n_ = (n); \
-        openpam_log(PAM_LOG_DEBUG, "returning %d", n_); \
+        openpam_log(PAM_LOG_LIBDEBUG, "returning %d", n_); \
         return (n_); \
 } while (0)
@@ -76 +76 @@
         void *p_ = (p); \
         if (p_ == NULL) \
-                openpam_log(PAM_LOG_DEBUG, "returning NULL"); \
+                openpam_log(PAM_LOG_LIBDEBUG, "returning NULL"); \
         else \
-                openpam_log(PAM_LOG_DEBUG, "returning %p", p_); \
+                openpam_log(PAM_LOG_LIBDEBUG, "returning %p", p_); \
         return (p_); \
 } while (0)
@@ -84 +84 @@
         const char *s_ = (s); \
         if (s_ == NULL) \
-                openpam_log(PAM_LOG_DEBUG, "returning NULL"); \
+                openpam_log(PAM_LOG_LIBDEBUG, "returning NULL"); \
         else \
-                openpam_log(PAM_LOG_DEBUG, "returning '%s'", s_); \
+                openpam_log(PAM_LOG_LIBDEBUG, "returning '%s'", s_); \
         return (s_); \
 } while (0)

trunk/lib/openpam_log.c

@@ -72 +72 @@
 
         switch (level) {
+        case PAM_LOG_LIBDEBUG:
         case PAM_LOG_DEBUG:
                 if (!openpam_debug)