Move PAM_CONST macro definition from config.h to pam.c where it belongs.

We can't have this in config.h since that gets included too early.

diff --git a/auth/pam.c b/auth/pam.c
index 1561a8642cf87de3f997152de6ba2ec68d22aeb1..377f04bc217606e9413d5f5afdd2ca3fede31b06 100644 (file)
--- a/auth/pam.c
+++ b/auth/pam.c
@@ -73,6 +73,13 @@
 #include "sudo.h"
 #include "sudo_auth.h"
 
+/* Only OpenPAM and Linux PAM use const qualifiers. */
+#if defined(_OPENPAM) || defined(__LIBPAM_VERSION)
+# define PAM_CONST     const
+#else
+# define PAM_CONST
+#endif
+
 #ifndef lint
 static const char rcsid[] = "$Sudo$";
 #endif /* lint */

diff --git a/config.h.in b/config.h.in
index 8dfbaa692a181eee341442d0f4c34522674fb461..9943f4baf6faed122562047af1cbb9c059c3b84d 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -534,13 +534,6 @@
 # define stat_sudoers  lstat
 #endif
 
-/* Only OpenPAM and Linux PAM use const qualifiers. */
-#if defined(_OPENPAM) || defined(__LIBPAM_VERSION)
-# define PAM_CONST     const
-#else
-# define PAM_CONST
-#endif
-
 #ifdef USE_EXECV
 # define EXECV execv
 #else

diff --git a/configure.in b/configure.in
index e12399ab3f22f10c042600dea0a4e3507f978a9d..6d83eab621afc1cc80a6987fbd2807588eb6cec5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2184,13 +2184,6 @@ AH_BOTTOM([/*
 # define stat_sudoers  lstat
 #endif
 
-/* Only OpenPAM and Linux PAM use const qualifiers. */
-#if defined(_OPENPAM) || defined(__LIBPAM_VERSION)
-# define PAM_CONST     const
-#else
-# define PAM_CONST
-#endif
-
 #ifdef USE_EXECV
 # define EXECV execv
 #else