[linux-pam] Make --disable-cracklib compatible with --enable-static-modules mode

Dmitry V. Levin ldv at fedoraproject.org
Mon Feb 13 21:33:26 UTC 2012


commit fa1cf8afa8d482753900a1ac8a171b977bf40e15
Author: Dmitry V. Levin <ldv at altlinux.org>
Date:   Thu Jan 26 22:22:59 2012 +0000

    Make --disable-cracklib compatible with --enable-static-modules mode
    
    * configure.in: Define HAVE_LIBCRACK when cracklib is enabled.
    * libpam/pam_static_modules.h (static_modules): Guard the use of
    _pam_cracklib_modstruct by HAVE_LIBCRACK macro.

 configure.in                |    5 ++++-
 libpam/pam_static_modules.h |    2 ++
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/configure.in b/configure.in
index 15ff6dc..cba05ee 100644
--- a/configure.in
+++ b/configure.in
@@ -363,8 +363,11 @@ if test x"$WITH_CRACKLIB" != xno ; then
 else
 	LIBCRACK=""
 fi
+if test -n "$LIBCRACK"; then
+	AC_DEFINE([HAVE_LIBCRACK], [1], [Define to 1 if you have cracklib.])
+fi
 AC_SUBST(LIBCRACK)
-AM_CONDITIONAL([HAVE_LIBCRACK], [test ! -z "$LIBCRACK"])
+AM_CONDITIONAL([HAVE_LIBCRACK], [test -n "$LIBCRACK"])
 
 dnl Look for Linux Auditing library - see documentation
 AC_ARG_ENABLE([audit],
diff --git a/libpam/pam_static_modules.h b/libpam/pam_static_modules.h
index 67d8135..b1739ed 100644
--- a/libpam/pam_static_modules.h
+++ b/libpam/pam_static_modules.h
@@ -94,7 +94,9 @@ extern struct pam_module _pam_xauth_modstruct;
 
 static struct pam_module *static_modules[] = {
   &_pam_access_modstruct,
+#ifdef HAVE_LIBCRACK
   &_pam_cracklib_modstruct,
+#endif
   &_pam_debug_modstruct,
   &_pam_deny_modstruct,
   &_pam_echo_modstruct,


More information about the linux-pam-commits mailing list