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