Changeset 209 in openpam for trunk/lib

Timestamp:

May 1, 2003, 6:18:06 PM (16 years ago)

Author:

Dag-Erling Smørgrav

Message:

Add a global variable controlling the output of debugging messages.
This allows modules etc. to emit PAM_LOG_DEBUG messages independently
of whether libpam was compiled with -DDEBUG.

Location:

trunk/lib

Files:

• openpam_impl.h (modified) (2 diffs)
• openpam_log.c (modified) (4 diffs)

trunk/lib/openpam_impl.h

@@ -32 +32 @@
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_impl.h#20 $
+ * $P4: //depot/projects/openpam/lib/openpam_impl.h#21 $
  */
 
@@ -44 +44 @@
 extern const char *_pam_err_name[PAM_NUM_ERRORS];
 extern const char *_pam_item_name[PAM_NUM_ITEMS];
+
+extern int _openpam_debug;
 
 /*

trunk/lib/openpam_log.c

@@ -32 +32 @@
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_log.c#17 $
+ * $P4: //depot/projects/openpam/lib/openpam_log.c#18 $
  */
 
@@ -45 +45 @@
 
 #include "openpam_impl.h"
+
+int _openpam_debug = 0;
 
 #if defined(openpam_log)
@@ -63 +65 @@
         switch (level) {
         case PAM_LOG_DEBUG:
-#ifndef DEBUG
-                return;
-#else
+                if (!_openpam_debug)
+                        return;
                 priority = LOG_DEBUG;
                 break;
-#endif
         case PAM_LOG_VERBOSE:
                 priority = LOG_INFO;
@@ -109 +109 @@
         switch (level) {
         case PAM_LOG_DEBUG:
-#ifndef DEBUG
-                return;
-#else
+                if (!_openpam_debug)
+                        return;
                 priority = LOG_DEBUG;
                 break;
-#endif
         case PAM_LOG_VERBOSE:
                 priority = LOG_INFO;