Add PAM support for Darwin, cleanup overall PAM support build/config stuff.

Update copyrights on autoconf files.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@4100 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES.txt b/CHANGES.txt
index f3472677dfc27bbdbd6d788930d43f36280013be..2f711dfca7940e77a66a93818b6364a4b6baae34 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,7 @@ CHANGES.txt - 02/26/2004
 
 CHANGES IN CUPS V1.1.21rc1
 
+       - Added PAM support for Darwin/MacOS X (STR #550)
        - The web interface now provides a "Set As Default"
          button to set the default printer or class on a server
          (STR #577)

diff --git a/Makedefs.in b/Makedefs.in
index f8668fc0467efe435ac089e21a85fc9240bb8902..66de93241e3af5cc7ec3bab3abf952f172b9c15e 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,5 +1,5 @@
 #
-# "$Id: Makedefs.in,v 1.63 2004/02/25 20:14:50 mike Exp $"
+# "$Id: Makedefs.in,v 1.64 2004/02/26 16:51:59 mike Exp $"
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
@@ -145,7 +145,6 @@ LIBDIR              =       $(BUILDROOT)$(libdir)
 LOCALEDIR      =       $(BUILDROOT)@CUPS_LOCALEDIR@
 LOGDIR         =       $(BUILDROOT)@CUPS_LOGDIR@
 MANDIR         =       $(BUILDROOT)@mandir@
-PAMDIR         =       $(BUILDROOT)@PAMDIR@
 PMANDIR                =       $(BUILDROOT)@PMANDIR@
 REQUESTS       =       $(BUILDROOT)@CUPS_REQUESTS@
 SBINDIR                =       $(BUILDROOT)@sbindir@
@@ -159,6 +158,10 @@ CAT8EXT            =       @CAT8EXT@
 MAN8EXT                =       @MAN8EXT@
 MAN8DIR                =       @MAN8DIR@
 
+PAMDIR         =       $(BUILDROOT)@PAMDIR@
+PAMFILE                =       @PAMFILE@
+
+
 #
 # Rules...
 #
@@ -184,5 +187,5 @@ MAN8DIR             =       @MAN8DIR@
 
 
 #
-# End of "$Id: Makedefs.in,v 1.63 2004/02/25 20:14:50 mike Exp $"
+# End of "$Id: Makedefs.in,v 1.64 2004/02/26 16:51:59 mike Exp $"
 #

diff --git a/conf/Makefile b/conf/Makefile
index 05e1e0f292d7910cc18fbf431a438c254ef75ce0..0b933b8562cd5b42c3d1ae2978e9af8af99f225b 100644 (file)
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.15 2004/02/25 20:14:51 mike Exp $"
+# "$Id: Makefile,v 1.16 2004/02/26 16:51:59 mike Exp $"
 #
 #   Configuration file makefile for the Common UNIX Printing System (CUPS).
 #
@@ -67,10 +67,10 @@ install:
        done
        -if test x$(PAMDIR) != x$(BUILDROOT); then \
                $(INSTALL_DIR) $(PAMDIR); \
-               $(INSTALL_DATA) pam.conf $(PAMDIR)/cups; \
+               $(INSTALL_DATA) $(PAMFILE) $(PAMDIR)/cups; \
        fi
 
 
 #
-# End of "$Id: Makefile,v 1.15 2004/02/25 20:14:51 mike Exp $".
+# End of "$Id: Makefile,v 1.16 2004/02/26 16:51:59 mike Exp $".
 #

diff --git a/conf/pam.darwin b/conf/pam.darwin
new file mode 100644 (file)
index 0000000..ff724da
--- /dev/null
+++ b/conf/pam.darwin
@@ -0,0 +1,7 @@
+# cups: auth account password session
+auth       sufficient     pam_securityserver.so
+auth       sufficient     pam_unix.so
+auth       required       pam_deny.so
+account    required       pam_permit.so
+password   required       pam_deny.so
+session    required       pam_permit.so

diff --git a/conf/pam.conf.in b/conf/pam.std.in
similarity index 100%
rename from conf/pam.conf.in
rename to conf/pam.std.in

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index f0435a61acc308de3b1b27402f74747ca81da913..af1b7c1205b122de8965c739069cc706973fae54 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-common.m4,v 1.41 2004/02/04 19:29:50 mike Exp $"
+dnl "$Id: cups-common.m4,v 1.42 2004/02/26 16:52:00 mike Exp $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Easy Software Products and are protected by Federal
@@ -202,5 +202,5 @@ AC_SUBST(BACKLIBS)
 AC_SUBST(COMMONLIBS)
 
 dnl
-dnl End of "$Id: cups-common.m4,v 1.41 2004/02/04 19:29:50 mike Exp $".
+dnl End of "$Id: cups-common.m4,v 1.42 2004/02/26 16:52:00 mike Exp $".
 dnl

diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
index 105a6005eefcb06afabfea06dfa3c51fdbf2e0b1..60ead8f9f16d60c4f44f7cac0c966719f9250551 100644 (file)
--- a/config-scripts/cups-compiler.m4
+++ b/config-scripts/cups-compiler.m4
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-compiler.m4,v 1.25 2003/08/20 18:27:48 mike Exp $"
+dnl "$Id: cups-compiler.m4,v 1.26 2004/02/26 16:52:00 mike Exp $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Easy Software Products and are protected by Federal
@@ -202,5 +202,5 @@ if test $uname = HP-UX; then
 fi
 
 dnl
-dnl End of "$Id: cups-compiler.m4,v 1.25 2003/08/20 18:27:48 mike Exp $".
+dnl End of "$Id: cups-compiler.m4,v 1.26 2004/02/26 16:52:00 mike Exp $".
 dnl

diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
index b6e972e9f9db93bfc376de47f0746bd5e9aed4b2..b8f137670f78ebea812b3cc872cd552e15553cb6 100644 (file)
--- a/config-scripts/cups-directories.m4
+++ b/config-scripts/cups-directories.m4
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-directories.m4,v 1.10 2002/12/17 18:56:39 swdev Exp $"
+dnl "$Id: cups-directories.m4,v 1.11 2004/02/26 16:52:00 mike Exp $"
 dnl
 dnl   Directory stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Easy Software Products and are protected by Federal
@@ -238,5 +238,5 @@ AC_SUBST(CUPS_FONTPATH)
 AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")
 
 dnl
-dnl End of "$Id: cups-directories.m4,v 1.10 2002/12/17 18:56:39 swdev Exp $".
+dnl End of "$Id: cups-directories.m4,v 1.11 2004/02/26 16:52:00 mike Exp $".
 dnl

diff --git a/config-scripts/cups-image.m4 b/config-scripts/cups-image.m4
index ccc3639c6e36443235237c14e97c305e2673ee48..404732472455aec69e9844d4b00a98f67e2a0a29 100644 (file)
--- a/config-scripts/cups-image.m4
+++ b/config-scripts/cups-image.m4
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-image.m4,v 1.5 2002/12/17 18:56:39 swdev Exp $"
+dnl "$Id: cups-image.m4,v 1.6 2004/02/26 16:52:00 mike Exp $"
 dnl
 dnl   Image library stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Easy Software Products and are protected by Federal
@@ -78,5 +78,5 @@ AC_SUBST(EXPORT_LIBZ)
 AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H))
 
 dnl
-dnl End of "$Id: cups-image.m4,v 1.5 2002/12/17 18:56:39 swdev Exp $".
+dnl End of "$Id: cups-image.m4,v 1.6 2004/02/26 16:52:00 mike Exp $".
 dnl

diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4
index c547d30957da2042832e3291012f8aff734fac5c..e7f6d4daa14cdb1cd07df50f46b32e34f3f7de2a 100644 (file)
--- a/config-scripts/cups-libtool.m4
+++ b/config-scripts/cups-libtool.m4
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-libtool.m4,v 1.5 2002/12/17 18:56:39 swdev Exp $"
+dnl "$Id: cups-libtool.m4,v 1.6 2004/02/26 16:52:00 mike Exp $"
 dnl
 dnl   Libtool stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Easy Software Products and are protected by Federal
@@ -45,5 +45,5 @@ if test x$LIBTOOL != x; then
 fi
 
 dnl
-dnl End of "$Id: cups-libtool.m4,v 1.5 2002/12/17 18:56:39 swdev Exp $".
+dnl End of "$Id: cups-libtool.m4,v 1.6 2004/02/26 16:52:00 mike Exp $".
 dnl

diff --git a/config-scripts/cups-manpages.m4 b/config-scripts/cups-manpages.m4
index 287910c6e39d819d20db521502a134301ab9894b..390c3c8e4409ac304452e861ca492ac6a8836cf6 100644 (file)
--- a/config-scripts/cups-manpages.m4
+++ b/config-scripts/cups-manpages.m4
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-manpages.m4,v 1.7 2002/12/17 18:56:39 swdev Exp $"
+dnl "$Id: cups-manpages.m4,v 1.8 2004/02/26 16:52:00 mike Exp $"
 dnl
 dnl   Manpage stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Easy Software Products and are protected by Federal
@@ -100,5 +100,5 @@ AC_SUBST(MAN8EXT)
 AC_SUBST(MAN8DIR)
 
 dnl
-dnl End of "$Id: cups-manpages.m4,v 1.7 2002/12/17 18:56:39 swdev Exp $".
+dnl End of "$Id: cups-manpages.m4,v 1.8 2004/02/26 16:52:00 mike Exp $".
 dnl

diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4
index 1cfa7140dd0378a281ed183ce554b45cbb78744c..dec34c56e2b676480567ff74f68519460fe644e8 100644 (file)
--- a/config-scripts/cups-network.m4
+++ b/config-scripts/cups-network.m4
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-network.m4,v 1.10 2003/08/28 15:16:07 mike Exp $"
+dnl "$Id: cups-network.m4,v 1.11 2004/02/26 16:52:00 mike Exp $"
 dnl
 dnl   Networking stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Easy Software Products and are protected by Federal
@@ -55,5 +55,5 @@ AC_ARG_WITH(maxfiles, [  --with-maxfiles=N       set maximum number of file desc
 AC_DEFINE_UNQUOTED(CUPS_MAX_FDS, $maxfiles)
 
 dnl
-dnl End of "$Id: cups-network.m4,v 1.10 2003/08/28 15:16:07 mike Exp $".
+dnl End of "$Id: cups-network.m4,v 1.11 2004/02/26 16:52:00 mike Exp $".
 dnl

diff --git a/config-scripts/cups-openslp.m4 b/config-scripts/cups-openslp.m4
index 656180d090530b049468f18e53a5a07f3a92e9f9..91a03556f6e158c1eb3e539e18011d9f534fb9e3 100644 (file)
--- a/config-scripts/cups-openslp.m4
+++ b/config-scripts/cups-openslp.m4
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-openslp.m4,v 1.7 2002/12/17 18:56:39 swdev Exp $"
+dnl "$Id: cups-openslp.m4,v 1.8 2004/02/26 16:52:00 mike Exp $"
 dnl
 dnl   OpenSLP configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Easy Software Products and are protected by Federal
@@ -44,5 +44,5 @@ AC_SUBST(LIBSLP)
 
 
 dnl
-dnl End of "$Id: cups-openslp.m4,v 1.7 2002/12/17 18:56:39 swdev Exp $".
+dnl End of "$Id: cups-openslp.m4,v 1.8 2004/02/26 16:52:00 mike Exp $".
 dnl

diff --git a/config-scripts/cups-openssl.m4 b/config-scripts/cups-openssl.m4
index 308e04bdae3b7efa162a79816b09de7183becf75..a65fe7f06abe4efe1092f8f4a162f3db0c4aa1df 100644 (file)
--- a/config-scripts/cups-openssl.m4
+++ b/config-scripts/cups-openssl.m4
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-openssl.m4,v 1.14 2003/09/17 19:35:22 mike Exp $"
+dnl "$Id: cups-openssl.m4,v 1.15 2004/02/26 16:52:00 mike Exp $"
 dnl
 dnl   OpenSSL/GNUTLS stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Easy Software Products and are protected by Federal
@@ -108,5 +108,5 @@ AC_SUBST(EXPORT_SSLLIBS)
 
 
 dnl
-dnl End of "$Id: cups-openssl.m4,v 1.14 2003/09/17 19:35:22 mike Exp $".
+dnl End of "$Id: cups-openssl.m4,v 1.15 2004/02/26 16:52:00 mike Exp $".
 dnl

diff --git a/config-scripts/cups-opsys.m4 b/config-scripts/cups-opsys.m4
index c1ed42bfcde0c22907aeb626f46eca455c3aa255..7177771d06ccd9a8f61a84f87b5bfedbc89b6db1 100644 (file)
--- a/config-scripts/cups-opsys.m4
+++ b/config-scripts/cups-opsys.m4
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-opsys.m4,v 1.10 2003/09/15 20:32:12 mike Exp $"
+dnl "$Id: cups-opsys.m4,v 1.11 2004/02/26 16:52:00 mike Exp $"
 dnl
 dnl   Operating system stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Easy Software Products and are protected by Federal
@@ -87,5 +87,5 @@ AC_DEFINE_UNQUOTED(CUPS_DEFAULT_USER, "$CUPS_USER")
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GROUP, "$CUPS_GROUP")
 
 dnl
-dnl "$Id: cups-opsys.m4,v 1.10 2003/09/15 20:32:12 mike Exp $"
+dnl "$Id: cups-opsys.m4,v 1.11 2004/02/26 16:52:00 mike Exp $"
 dnl

diff --git a/config-scripts/cups-pam.m4 b/config-scripts/cups-pam.m4
index f3f43c9ff62df4fcf015c1115977ed7825dc1ef9..99bb88f37ae4c466ec4f13afaec7ad1294f133f1 100644 (file)
--- a/config-scripts/cups-pam.m4
+++ b/config-scripts/cups-pam.m4
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-pam.m4,v 1.7 2002/12/17 18:56:39 swdev Exp $"
+dnl "$Id: cups-pam.m4,v 1.8 2004/02/26 16:52:00 mike Exp $"
 dnl
 dnl   PAM stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Easy Software Products and are protected by Federal
@@ -30,6 +30,7 @@ if test $uname = AIX; then
 fi
 
 PAMDIR=""
+PAMFILE=""
 PAMLIBS=""
 PAMMOD="pam_unknown.so"
 
@@ -41,31 +42,51 @@ if test x$enable_pam != xno; then
        AC_CHECK_HEADER(pam/pam_appl.h,AC_DEFINE(HAVE_PAM_PAM_APPL_H))
 
        if test x$ac_cv_lib_pam_pam_start != xno; then
+               # Set the necessary libraries for PAM...
                if test x$ac_cv_lib_dl_dlopen != xno; then
                        PAMLIBS="-lpam -ldl"
                else
                        PAMLIBS="-lpam"
                fi
-               if test -d /etc/pam.d; then
-                       PAMDIR="/etc/pam.d"
-               fi
+
+               # Find the PAM configuration directory, if any...
+               for dir in /private/etc/pam.d /etc/pam.d; do
+                       if test -d $dir; then
+                               PAMDIR=$dir
+                       fi
+               done
        fi
 
        LIBS="$SAVELIBS"
 
-       # 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"
-               fi
-       done
+       case "$uname" in
+               Darwin*)
+                       # Darwin, MacOS X
+                       PAMFILE="pam.darwin"
+                       ;;
+               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"
+                               fi
+                       done
+
+                       PAMFILE="pam.std"
+                       ;;
+       esac
 fi
 
 AC_SUBST(PAMDIR)
+AC_SUBST(PAMFILE)
 AC_SUBST(PAMLIBS)
 AC_SUBST(PAMMOD)
 
 dnl
-dnl End of "$Id: cups-pam.m4,v 1.7 2002/12/17 18:56:39 swdev Exp $".
+dnl End of "$Id: cups-pam.m4,v 1.8 2004/02/26 16:52:00 mike Exp $".
 dnl

diff --git a/config-scripts/cups-scripting.m4 b/config-scripts/cups-scripting.m4
index 85baf60db22509469b18be64673c0e9b28aed1fc..51d8604dd455a27a3d14543596f939d8ff9e4e8b 100644 (file)
--- a/config-scripts/cups-scripting.m4
+++ b/config-scripts/cups-scripting.m4
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-scripting.m4,v 1.1 2003/03/14 17:04:08 mike Exp $"
+dnl "$Id: cups-scripting.m4,v 1.2 2004/02/26 16:52:00 mike Exp $"
 dnl
 dnl   Scripting configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Easy Software Products and are protected by Federal
@@ -87,5 +87,5 @@ if test "x$CUPS_PYTHON" != x; then
 fi
 
 dnl
-dnl End of "$Id: cups-scripting.m4,v 1.1 2003/03/14 17:04:08 mike Exp $".
+dnl End of "$Id: cups-scripting.m4,v 1.2 2004/02/26 16:52:00 mike Exp $".
 dnl

diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4
index f7b14ec1eb25eb2d90ce3b20bf6062b726150950..87de285521ec7690b4054643e537ff88874ddd7a 100644 (file)
--- a/config-scripts/cups-sharedlibs.m4
+++ b/config-scripts/cups-sharedlibs.m4
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-sharedlibs.m4,v 1.22 2003/07/23 20:07:34 mike Exp $"
+dnl "$Id: cups-sharedlibs.m4,v 1.23 2004/02/26 16:52:00 mike Exp $"
 dnl
 dnl   Shared library support for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Easy Software Products and are protected by Federal
@@ -152,5 +152,5 @@ AC_SUBST(IMGLIBS)
 AC_SUBST(EXPORT_LDFLAGS)
 
 dnl
-dnl End of "$Id: cups-sharedlibs.m4,v 1.22 2003/07/23 20:07:34 mike Exp $".
+dnl End of "$Id: cups-sharedlibs.m4,v 1.23 2004/02/26 16:52:00 mike Exp $".
 dnl

diff --git a/configure.in b/configure.in
index 6ef78c8e2372f16a2f46568244497b4487f28015..6f770a0e1a292b39d59530d793b0ba15decbcb39 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: configure.in,v 1.109 2004/02/25 20:14:50 mike Exp $"
+dnl "$Id: configure.in,v 1.110 2004/02/26 16:51:59 mike Exp $"
 dnl
 dnl   Configuration script for the Common UNIX Printing System (CUPS).
 dnl
@@ -41,10 +41,10 @@ sinclude(config-scripts/cups-pam.m4)
 
 sinclude(config-scripts/cups-scripting.m4)
 
-AC_OUTPUT(Makedefs cups.list cups.sh cups-config conf/cupsd.conf conf/pam.conf)
+AC_OUTPUT(Makedefs cups.list cups.sh cups-config conf/cupsd.conf conf/pam.std)
 
 chmod +x cups-config
 
 dnl
-dnl End of "$Id: configure.in,v 1.109 2004/02/25 20:14:50 mike Exp $".
+dnl End of "$Id: configure.in,v 1.110 2004/02/26 16:51:59 mike Exp $".
 dnl

diff --git a/cups.list.in b/cups.list.in
index 4892a5b42e0c718a2f1a47cba93c36724501deba..2c7503a45f68a6b7de82a3560dc38917fd8934d5 100644 (file)
--- a/cups.list.in
+++ b/cups.list.in
@@ -1,5 +1,5 @@
 #
-# "$Id: cups.list.in,v 1.52 2004/02/26 16:07:02 mike Exp $"
+# "$Id: cups.list.in,v 1.53 2004/02/26 16:51:59 mike Exp $"
 #
 #   ESP Package Manager (EPM) file list for the Common UNIX Printing
 #   System (CUPS).
@@ -300,17 +300,7 @@ c 0600 root sys $SERVERROOT/mime.types conf/mime.types
 
 %if PAMDIR
 d 0555 root sys $PAMDIR -
-
-%system linux
-# Linux almost always supports PAM...
-c 0644 root sys $PAMDIR/cups conf/pam.conf
-
-%system irix
-# IRIX doesn't normally support PAM, but the freeware project
-# includes a version of PAM that can be used...
-c 0644 root sys $PAMDIR/cups conf/pam.irix
-
-%system all
+c 0644 root sys $PAMDIR/cups conf/@PAMFILE@
 %endif
 
 # Developer files
@@ -505,5 +495,5 @@ f 0444 root sys $AMANDIR/fr/man$MAN8DIR/lpmove.$MAN8EXT man/lpmove.man
 i 0555 root sys cups cups.sh
 
 #
-# End of "$Id: cups.list.in,v 1.52 2004/02/26 16:07:02 mike Exp $".
+# End of "$Id: cups.list.in,v 1.53 2004/02/26 16:51:59 mike Exp $".
 #