Relevant BUGIDs: 485454

Purpose of commit: cleanup

Commit summary:
---------------
The malloc debugging stuff appears to have had a few residual issues
that I've fixed (trying to resolve another checkin!).

diff --git a/libpam/Makefile b/libpam/Makefile
index 61958527b38f7710585f252789d54ad98e7c3134..cf49f6276ec9d43f9487f92230d7f7b8e8f9c0ca 100644 (file)
--- a/libpam/Makefile
+++ b/libpam/Makefile
@@ -44,7 +44,7 @@ else
 MODULES =
 endif
 
-ifdef WITH_MEMORY_DEBUG
+ifeq ($(WITH_MEMORY_DEBUG),yes)
 EXTRAS += pam_malloc.o
 endif
 

diff --git a/libpam/pam_malloc.c b/libpam/pam_malloc.c
index 540dceefc1e1462b643786f45ddaa95e2a042bc2..75a1045d24f0df5140418d985b41392596432f4a 100644 (file)
--- a/libpam/pam_malloc.c
+++ b/libpam/pam_malloc.c
@@ -23,7 +23,6 @@
 #ifndef DEBUG
 #define DEBUG
 #endif
-
 #include "pam_private.h"
 
 #include <security/pam_malloc.h>
@@ -385,6 +384,8 @@ void *pam_alloca(size_t size
 void pam_exit(int i
              , const char *file, const char *fn, const int line)
 {
+     D(("time to exit"));
+
      _fn("exit");
 
      if (on(0)) err(("passed (%d)", i));

diff --git a/modules/pam_filter/upperLOWER/upperLOWER.c b/modules/pam_filter/upperLOWER/upperLOWER.c
index c5f9366c45b216ed4b20f659773f97412b01ece4..e750e877b61c57d04e50e3111f595cd96c903e34 100644 (file)
--- a/modules/pam_filter/upperLOWER/upperLOWER.c
+++ b/modules/pam_filter/upperLOWER/upperLOWER.c
@@ -9,6 +9,10 @@
 
 #include <security/_pam_aconf.h>
 
+#ifdef MEMORY_DEBUG
+# undef exit
+#endif /* MEMORY_DEBUG */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <syslog.h>

diff --git a/modules/pam_pwdb/pwdb_chkpwd.c b/modules/pam_pwdb/pwdb_chkpwd.c
index 36cf0984868469a778ab6c624cfe232dcbb9e523..e4fe38f8728d9940b390ff81d386ad981a1b8f0d 100644 (file)
--- a/modules/pam_pwdb/pwdb_chkpwd.c
+++ b/modules/pam_pwdb/pwdb_chkpwd.c
@@ -15,6 +15,12 @@
 
 #include <security/_pam_aconf.h>
 
+#ifdef MEMORY_DEBUG
+# undef exit
+# undef strdup
+# undef free
+#endif /* MEMORY_DEBUG */
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/modules/pam_tally/pam_tally.c b/modules/pam_tally/pam_tally.c
index e0b60decb8e19e80380272d32235afdd9bee47b7..3da37f40aa4d183e8bb81e99eb0f50b15816687b 100644 (file)
--- a/modules/pam_tally/pam_tally.c
+++ b/modules/pam_tally/pam_tally.c
@@ -13,6 +13,10 @@
 
 #include <security/_pam_aconf.h>
 
+#if defined(MAIN) && defined(MEMORY_DEBUG)
+# undef exit
+#endif /* defined(MAIN) && defined(MEMORY_DEBUG) */
+
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>

diff --git a/modules/pam_unix/unix_chkpwd.c b/modules/pam_unix/unix_chkpwd.c
index 0a96519066082433d602942be632705fec75b8da..9581d046ba6112c37c92721e6af25b8e68ede54f 100644 (file)
--- a/modules/pam_unix/unix_chkpwd.c
+++ b/modules/pam_unix/unix_chkpwd.c
@@ -15,6 +15,12 @@
 
 #include <security/_pam_aconf.h>
 
+#ifdef MEMORY_DEBUG
+# undef exit
+# undef strdup
+# undef free
+#endif /* MEMORY_DEBUG */
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>