* configure.in, src/login.c: Do not use HAVE_PAM_FAIL_DELAY, but

	HAS_PAM_FAIL_DELAY, to avoid a redefinition with Linux PAM.

diff --git a/ChangeLog b/ChangeLog
index 6d26bc0cf10b867e7e7c19f91a081eae94504dbe..32fa5498abfe30d8bc9a1da8c99c1ba1380ec1c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2008-08-28  Nicolas François  <nicolas.francois@centraliens.net>
 
        * configure.in: Indentation fix.
+       * configure.in, src/login.c: Do not use HAVE_PAM_FAIL_DELAY, but
+       HAS_PAM_FAIL_DELAY, to avoid a redefinition with Linux PAM.
 
 2008-08-27  Nicolas François  <nicolas.francois@centraliens.net>
 

diff --git a/configure.in b/configure.in
index 3626c722b71cb24c36fba83dbf8a6550a7f2972f..5e6151be6386b1385d682a82320aa4da26bbc273 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -389,8 +389,10 @@ if test "$with_libpam" = "yes"; then
 
 
        save_libs=$LIBS
-        LIBS="$LIBS $LIBPAM"
-       AC_CHECK_FUNCS([pam_fail_delay])
+       LIBS="$LIBS $LIBPAM"
+       # We do not use AC_CHECK_FUNCS to avoid duplicated definition with
+       # Linux PAM.
+       AC_CHECK_FUNC(pam_fail_delay, [AC_DEFINE(HAS_PAM_FAIL_DELAY, 1, [Define to 1 if you have the declaration of 'pam_fail_delay'])])
        LIBS=$save_libs
 
        AC_DEFINE(USE_PAM, 1, [Define to support Pluggable Authentication Modules])

diff --git a/src/login.c b/src/login.c
index 3ed3feb674c8f06b465d42ce34f4f89b64479409..f2f6346e08fade166582f542e65c63c938d246bc 100644 (file)
--- a/src/login.c
+++ b/src/login.c
@@ -645,7 +645,7 @@ int main (int argc, char **argv)
                PAM_FAIL_CHECK;
                retcode = pam_set_item (pamh, PAM_TTY, tty);
                PAM_FAIL_CHECK;
-#ifdef HAVE_PAM_FAIL_DELAY
+#ifdef HAS_PAM_FAIL_DELAY
                retcode = pam_fail_delay (pamh, 1000000 * delay);
                PAM_FAIL_CHECK;
 #endif
@@ -691,7 +691,7 @@ int main (int argc, char **argv)
                          failed = false;
 
                          failcount++;
-#ifdef HAVE_PAM_FAIL_DELAY
+#ifdef HAS_PAM_FAIL_DELAY
                          if (delay > 0) {
                            retcode = pam_fail_delay(pamh, 1000000*delay);
                          }