diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-09-17 19:54:07 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-09-17 19:54:07 +0000 |
| commit | b19ccc9e271691cc71a08e9968c58f464ebeade5 (patch) | |
| tree | 222499e15a781dcecfe0681b23825003d78caa8b /config-scripts/cups-pam.m4 | |
| parent | 49d8745278805ede5c41bae3c299e14ba40457bf (diff) | |
Merge changes from CUPS 1.4svn-r7961.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@969 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'config-scripts/cups-pam.m4')
| -rw-r--r-- | config-scripts/cups-pam.m4 | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/config-scripts/cups-pam.m4 b/config-scripts/cups-pam.m4 index fec896533..865f97f7b 100644 --- a/config-scripts/cups-pam.m4 +++ b/config-scripts/cups-pam.m4 @@ -1,9 +1,9 @@ dnl -dnl "$Id: cups-pam.m4 7149 2007-12-19 19:38:37Z mike $" +dnl "$Id: cups-pam.m4 7960 2008-09-17 19:42:02Z mike $" dnl dnl PAM stuff for the Common UNIX Printing System (CUPS). dnl -dnl Copyright 2007 by Apple Inc. +dnl Copyright 2007-2008 by Apple Inc. dnl Copyright 1997-2005 by Easy Software Products, all rights reserved. dnl dnl These coded instructions, statements, and computer programs are the @@ -14,6 +14,7 @@ dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl AC_ARG_ENABLE(pam, [ --enable-pam turn on PAM support, default=yes]) +AC_ARG_WITH(pam_module, [ --with-pam-module specify the PAM module to use, default=auto]) dnl Don't use PAM with AIX... if test $uname = AIX; then @@ -60,21 +61,33 @@ if test x$enable_pam != xno; then case "$uname" in Darwin*) # Darwin, MacOS X - PAMFILE="pam.darwin" + if test "x$with_pam_module" != x; then + PAMFILE="pam.$with_pam_module" + elif test -f /usr/lib/pam/pam_opendirectory.so; then + PAMFILE="pam.opendirectory" + else + PAMFILE="pam.securityserver" + fi ;; + IRIX) # SGI IRIX PAMFILE="pam.irix" ;; + *) # All others; this test might need to be updated # as Linux distributors move things around... - for mod in pam_unix2.so pam_unix.so pam_pwdb.so; do - if test -f /lib/security/$mod; then - PAMMOD="$mod" - break; - fi - done + if test "x$with_pam_module" != x; then + PAMMOD="pam_${with_pam_module}.so" + else + for mod in pam_unix2.so pam_unix.so pam_pwdb.so; do + if test -f /lib/security/$mod; then + PAMMOD="$mod" + break; + fi + done + fi PAMFILE="pam.std" ;; @@ -87,5 +100,5 @@ AC_SUBST(PAMLIBS) AC_SUBST(PAMMOD) dnl -dnl End of "$Id: cups-pam.m4 7149 2007-12-19 19:38:37Z mike $". +dnl End of "$Id: cups-pam.m4 7960 2008-09-17 19:42:02Z mike $". dnl |