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

diff --git a/ChangeLog b/ChangeLog
index 547b2d58193b28a00aded3c9d39cc68b0b1d49d6..80e00631d38acdf4f05b3f552bf36e337b0aa662 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+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
+
 2009-12-08  Tomas Mraz  <t8m@centrum.cz>
 
        * modules/pam_unix/passverify.c(unix_update_shadow): Create a shadow

diff --git a/configure.in b/configure.in
index 3cc05ed4cddccdef74306935b38f985cb9ec3343..96cf572b886a0620f47c604b7ab3b34668a08ba8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -234,7 +234,7 @@ AC_ARG_ENABLE([debug],
     AS_HELP_STRING([--enable-debug],[specify you are building with debugging on]))
 
 if test x"$enable_debug" = x"yes" ; then
-   AC_DEFINE([DEBUG],,
+   AC_DEFINE([PAM_DEBUG],,
                [lots of stuff gets written to /var/run/pam-debug.log])
 fi
 

diff --git a/libpam/include/security/_pam_macros.h b/libpam/include/security/_pam_macros.h
index bd107cfb68cb191fd69b87e462b1d91b6c5f7cad..e891e2261b5e93f689500901b779e6959127490a 100644 (file)
--- 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 dcdac7abaa8cc6b28dafd730c0ebe388bd3f95cd..1c8403d6f6f19d8627402b1b4e0b6040fa0dcdbf 100644 (file)
--- 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 bca3dd314564e18542aeb79c4ebb35c25119a6ee..59a1929f846dca9387da9f8f818212a387bcfc00 100644 (file)
--- 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 b690fd3ef9f8e8e26091c26b946b3ae3a0895527..0e607276ef23ce6e0b37ec8b04a66f788c098920 100644 (file)
--- 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 70917c58efd6e0ea1608621bad1216ff7b0f94fb..75db5e50999338579cd71de7e70e5fe96f0a9d51 100644 (file)
--- a/libpam/pam_password.c
+++ b/libpam/pam_password.c
@@ -4,8 +4,6 @@
  * $Id$
  */
 
-/* #define DEBUG */
-
 #include "pam_private.h"
 
 #include <stdio.h>

diff --git a/libpamc/test/modules/pam_secret.c b/libpamc/test/modules/pam_secret.c
index 830f1a78ea867a6b922fbfe6fa4fa983aa8a162b..6316f7f59bb97205ae3934f20d0f35fad5d2959a 100644 (file)
--- a/libpamc/test/modules/pam_secret.c
+++ b/libpamc/test/modules/pam_secret.c
@@ -9,8 +9,6 @@
  *          NEEDS TO BE INTEGRATED MORE NATIVELY.
  */
 
-/* #define DEBUG */
-
 #include <fcntl.h>
 #include <pwd.h>
 #include <stdio.h>
@@ -178,7 +176,7 @@ static int converse(pam_handle_t *pamh, struct ps_state_s *new)
        }
     }
 
-#ifdef DEBUG
+#ifdef PAM_DEBUG
     if (retval == PAM_SUCCESS) {
        D(("reply has length=%d and control=%u",
           PAM_BP_LENGTH(new->current_reply),

diff --git a/modules/pam_group/pam_group.c b/modules/pam_group/pam_group.c
index 4a931c4f85afcffbce3d474d14645ff2f086410b..3dc7f78e7768696db6ab1be91bc18d15ee3037c9 100644 (file)
--- a/modules/pam_group/pam_group.c
+++ b/modules/pam_group/pam_group.c
@@ -605,7 +605,7 @@ static int check_account(pam_handle_t *pamh, const char *service,
            no_grps = 0;
            _pam_drop(grps);
        }
-#ifdef DEBUG
+#ifdef PAM_DEBUG
        {
            int z;
            for (z=0; z<no_grps; ++z) {
@@ -719,11 +719,11 @@ static int check_account(pam_handle_t *pamh, const char *service,
     /* now set the groups for the user */
 
     if (no_grps > 0) {
-#ifdef DEBUG
+#ifdef PAM_DEBUG
        int err;
 #endif
        D(("trying to set %d groups", no_grps));
-#ifdef DEBUG
+#ifdef PAM_DEBUG
        for (err=0; err<no_grps; ++err) {
            D(("gid[%d]=%d", err, grps[err]));
        }

diff --git a/modules/pam_listfile/pam_listfile.c b/modules/pam_listfile/pam_listfile.c
index 3768aa720eb87403920b894893cdb640a636c96a..616d2201a1413b1e4f73f6e3d70a4ef57b8d591c 100644 (file)
--- a/modules/pam_listfile/pam_listfile.c
+++ b/modules/pam_listfile/pam_listfile.c
@@ -18,7 +18,7 @@
 #include <pwd.h>
 #include <grp.h>
 
-#ifdef DEBUG
+#ifdef PAM_DEBUG
 #include <assert.h>
 #endif
 
@@ -199,23 +199,23 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED,
            if(apply_type==APPLY_TYPE_USER) {
                if(strcmp(user_name, apply_val)) {
                    /* Does not apply to this user */
-#ifdef DEBUG
+#ifdef PAM_DEBUG
                    pam_syslog(pamh,LOG_DEBUG,
                              "don't apply: apply=%s, user=%s",
                             apply_val,user_name);
-#endif /* DEBUG */
+#endif /* PAM_DEBUG */
                    free(ifname);
                    return PAM_IGNORE;
                }
            } else if(apply_type==APPLY_TYPE_GROUP) {
                if(!pam_modutil_user_in_group_nam_nam(pamh,user_name,apply_val)) {
                    /* Not a member of apply= group */
-#ifdef DEBUG
+#ifdef PAM_DEBUG
                    pam_syslog(pamh,LOG_DEBUG,
 
                             "don't apply: %s not a member of group %s",
                             user_name,apply_val);
-#endif /* DEBUG */
+#endif /* PAM_DEBUG */
                    free(ifname);
                    return PAM_IGNORE;
                }
@@ -276,7 +276,7 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED,
                return onerr;
        }
     }
-#ifdef DEBUG
+#ifdef PAM_DEBUG
     pam_syslog(pamh,LOG_INFO,
 
             "Got file = %s, item = %d, value = %s, sense = %d",
@@ -312,7 +312,7 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED,
     retval=PAM_AUTH_ERR;
     /* This loop assumes that PAM_SUCCESS == 0
        and PAM_AUTH_ERR != 0 */
-#ifdef DEBUG
+#ifdef PAM_DEBUG
     assert(PAM_SUCCESS == 0);
     assert(PAM_AUTH_ERR != 0);
 #endif
@@ -343,7 +343,7 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED,
     fclose(inf);
     free(ifname);
     if ((sense && retval) || (!sense && !retval)) {
-#ifdef DEBUG
+#ifdef PAM_DEBUG
        pam_syslog(pamh,LOG_INFO,
                 "Returning PAM_SUCCESS, retval = %d", retval);
 #endif
@@ -352,7 +352,7 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED,
     else {
        const void *service;
        const char *user_name;
-#ifdef DEBUG
+#ifdef PAM_DEBUG
        pam_syslog(pamh,LOG_INFO,
                 "Returning PAM_AUTH_ERR, retval = %d", retval);
 #endif

diff --git a/modules/pam_unix/pam_unix_auth.c b/modules/pam_unix/pam_unix_auth.c
index 05b5ec6c55062aa4e52ca6e70271489a2def5f4c..c2f79b10028ac876587cd5357fb29a6f1cef0c2a 100644 (file)
--- a/modules/pam_unix/pam_unix_auth.c
+++ b/modules/pam_unix/pam_unix_auth.c
@@ -35,8 +35,6 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* #define DEBUG */
-
 #include "config.h"
 
 #include <stdio.h>

diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c
index 2792a4d5f11d096bd9e971e78a44dd2b316d4772..1d70a7c241782e94837987716ddc87553e8c17db 100644 (file)
--- a/modules/pam_unix/pam_unix_passwd.c
+++ b/modules/pam_unix/pam_unix_passwd.c
@@ -385,7 +385,7 @@ static int _do_setpass(pam_handle_t* pamh, const char *forwho,
                                _("NIS password could not be changed."));
                        retval = PAM_TRY_AGAIN;
                }
-#ifdef DEBUG
+#ifdef PAM_DEBUG
                sleep(5);
 #endif
            } else {