Tim Waugh 0edf4c
--- cups-1.2svn-r5238/conf/Makefile.system-auth	2006-03-07 09:34:20.000000000 +0000
Tim Waugh 0edf4c
+++ cups-1.2svn-r5238/conf/Makefile	2006-03-07 09:45:41.000000000 +0000
Tim Waugh 0edf4c
@@ -79,10 +79,14 @@
cvsdist 051973
 	done
Tim Waugh 0edf4c
 	-if test x$(PAMDIR) != x; then \
Tim Waugh 0edf4c
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
Tim Waugh 0edf4c
-		if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \
Tim Waugh 0edf4c
-			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
cvsdist 051973
+		if test -f /etc/pam.d/system-auth; then \
Tim Waugh 0edf4c
+			$(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups ; \
Tim Waugh 0edf4c
 		else \
Tim Waugh 0edf4c
-			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
Tim Waugh 0edf4c
+			if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \
Tim Waugh 0edf4c
+				$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
Tim Waugh 0edf4c
+			else \
Tim Waugh 0edf4c
+				$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
Tim Waugh 0edf4c
+			fi ; \
Tim Waugh 0edf4c
 		fi ; \
cvsdist 051973
 	fi
cvsdist 051973
 
Tim Waugh 0edf4c
--- /dev/null	2006-03-07 09:12:30.964372750 +0000
Tim Waugh 0edf4c
+++ cups-1.2svn-r5238/conf/cups.system-auth	2006-03-07 09:43:12.000000000 +0000
Tim Waugh 0edf4c
@@ -0,0 +1,3 @@
Tim Waugh 0edf4c
+#%PAM-1.0
Tim Waugh 0edf4c
+auth	include		system-auth
Tim Waugh 0edf4c
+account	include		system-auth