6a7d7a
diff -up /dev/null cups-1.4.2/conf/cups.password-auth
6a7d7a
--- /dev/null	2009-11-10 09:17:06.284031490 +0000
6a7d7a
+++ cups-1.4.2/conf/cups.password-auth	2009-11-10 11:15:42.750666738 +0000
6a7d7a
@@ -0,0 +1,4 @@
6a7d7a
+#%PAM-1.0
6a7d7a
+# Use password-auth common PAM configuration for the daemon
6a7d7a
+auth        include     password-auth
6a7d7a
+account     include     password-auth
6a7d7a
diff -up cups-1.4.2/conf/cups.system-auth cups-1.4.2/conf/cups
6a7d7a
diff -up /dev/null cups-1.4.2/conf/cups.system-auth
6a7d7a
--- /dev/null	2009-11-10 09:17:06.284031490 +0000
6a7d7a
+++ cups-1.4.2/conf/cups.system-auth	2009-11-10 11:15:42.750666738 +0000
6a7d7a
@@ -0,0 +1,3 @@
6a7d7a
+#%PAM-1.0
6a7d7a
+auth	include		system-auth
6a7d7a
+account	include		system-auth
6a7d7a
diff -up cups-1.4.2/conf/Makefile.system-auth cups-1.4.2/conf/Makefile
6a7d7a
--- cups-1.4.2/conf/Makefile.system-auth	2009-09-22 22:53:31.000000000 +0100
6a7d7a
+++ cups-1.4.2/conf/Makefile	2009-11-10 11:18:44.188791989 +0000
6a7d7a
@@ -90,10 +90,16 @@ install-data:
cvsdist 051973
 	done
0edf4c
 	-if test x$(PAMDIR) != x; then \
0edf4c
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
6a7d7a
-		if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \
0edf4c
-			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
7aabe5
+		if test -f /etc/pam.d/password-auth; then \
6a7d7a
+			$(INSTALL_DATA) cups.password-auth $(BUILDROOT)$(PAMDIR)/cups; \
7aabe5
+		elif test -f /etc/pam.d/system-auth; then \
6a7d7a
+			$(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups; \
0edf4c
 		else \
0edf4c
-			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
6a7d7a
+			if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \
0edf4c
+				$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
0edf4c
+			else \
0edf4c
+				$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
0edf4c
+			fi ; \
0edf4c
 		fi ; \
cvsdist 051973
 	fi
cvsdist 051973