[Pkg-shadow-commits] r2310 - in upstream/trunk: . src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-08-31 17:27:16 +0000 (Sun, 31 Aug 2008)
New Revision: 2310

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/configure.in
   upstream/trunk/src/login.c
Log:
	* configure.in, src/login.c: Do not use HAVE_PAM_FAIL_DELAY, but
	HAS_PAM_FAIL_DELAY, to avoid a redefinition with Linux PAM.

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-08-31 17:27:06 UTC (rev 2309)
+++ upstream/trunk/ChangeLog	2008-08-31 17:27:16 UTC (rev 2310)
@@ -1,6 +1,8 @@
 2008-08-28  Nicolas François  <nicolas.francois at 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 at centraliens.net>
 

Modified: upstream/trunk/configure.in
===================================================================
--- upstream/trunk/configure.in	2008-08-31 17:27:06 UTC (rev 2309)
+++ upstream/trunk/configure.in	2008-08-31 17:27:16 UTC (rev 2310)
@@ -389,8 +389,10 @@
 
 
 	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])

Modified: upstream/trunk/src/login.c
===================================================================
--- upstream/trunk/src/login.c	2008-08-31 17:27:06 UTC (rev 2309)
+++ upstream/trunk/src/login.c	2008-08-31 17:27:16 UTC (rev 2310)
@@ -645,7 +645,7 @@
 		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 @@
 			  failed = false;
 
 			  failcount++;
-#ifdef HAVE_PAM_FAIL_DELAY
+#ifdef HAS_PAM_FAIL_DELAY
 			  if (delay > 0) {
 			    retcode = pam_fail_delay(pamh, 1000000*delay);
 			  }