From a728c0f63e15c18ef599e599e4e46456b624abda Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@thkukuk.de>
Date: Tue, 8 Dec 2009 14:41:40 +0000
Subject: Relevant BUGIDs: 2892529

Purpose of commit: bugfix

Commit summary:
---------------

2009-12-08  Thorsten Kukuk  <kukuk@thkukuk.de>

        * configure.in: Rename DEBUG to PAM_DEBUG.
        * libpam/pam_env.c: Likewise
        * libpam/pam_handlers.c: Likewise
        * libpam/pam_miscc.c: Likewise
        * libpam/pam_password.c: Likewise
        * libpam/include/security/_pam_macros.h: Likewise
        * libpamc/test/modules/pam_secret.c: Likewise
        * modules/pam_group/pam_group.c: Likewise
        * modules/pam_listfile/pam_listfile.c: Likewise
        * modules/pam_unix/pam_unix_auth.c: Likewise
        * modules/pam_unix/pam_unix_passwd.c: Likewise
---
 libpam/include/security/_pam_macros.h | 4 ++--
 libpam/pam_env.c                      | 2 +-
 libpam/pam_handlers.c                 | 2 +-
 libpam/pam_misc.c                     | 2 +-
 libpam/pam_password.c                 | 2 --
 5 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'libpam')

diff --git a/libpam/include/security/_pam_macros.h b/libpam/include/security/_pam_macros.h
index bd107cfb..e891e226 100644
--- a/libpam/include/security/_pam_macros.h
+++ b/libpam/include/security/_pam_macros.h
@@ -62,7 +62,7 @@ do {                                              \
 
 /* some debugging code */
 
-#ifdef DEBUG
+#ifdef PAM_DEBUG
 
 /*
  * This provides the necessary function to do debugging in PAM.
@@ -191,6 +191,6 @@ do {                                                                        \
 #define _pam_show_mem(X,XS)              do { } while (0)
 #define _pam_show_reply(reply, replies)  do { } while (0)
 
-#endif /* DEBUG */
+#endif /* PAM_DEBUG */
 
 #endif  /* PAM_MACROS_H */
diff --git a/libpam/pam_env.c b/libpam/pam_env.c
index dcdac7ab..1c8403d6 100644
--- a/libpam/pam_env.c
+++ b/libpam/pam_env.c
@@ -21,7 +21,7 @@
 
 /* helper functions */
 
-#ifdef DEBUG
+#ifdef PAM_DEBUG
 static void _pam_dump_env(pam_handle_t *pamh)
 {
     int i;
diff --git a/libpam/pam_handlers.c b/libpam/pam_handlers.c
index bca3dd31..59a1929f 100644
--- a/libpam/pam_handlers.c
+++ b/libpam/pam_handlers.c
@@ -239,7 +239,7 @@ static int _pam_parse_conf_file(pam_handle_t *pamh, FILE *f
 		argv = NULL;
 	    }
 
-#ifdef DEBUG
+#ifdef PAM_DEBUG
 	    {
 		int y;
 
diff --git a/libpam/pam_misc.c b/libpam/pam_misc.c
index b690fd3e..0e607276 100644
--- a/libpam/pam_misc.c
+++ b/libpam/pam_misc.c
@@ -171,7 +171,7 @@ int _pam_mkargv(char *s, char ***argv, int *argc)
     char **our_argv = NULL;
     char **argvbuf;
     char *argvbufp;
-#ifdef DEBUG
+#ifdef PAM_DEBUG
     int count=0;
 #endif
 
diff --git a/libpam/pam_password.c b/libpam/pam_password.c
index 70917c58..75db5e50 100644
--- a/libpam/pam_password.c
+++ b/libpam/pam_password.c
@@ -4,8 +4,6 @@
  * $Id$
  */
 
-/* #define DEBUG */
-
 #include "pam_private.h"
 
 #include <stdio.h>
-- 
cgit v1.2.1