2006-03-17 12:10:57 +00:00
|
|
|
--- cups-1.2svn-r5238/conf/Makefile.system-auth 2006-03-07 09:34:20.000000000 +0000
|
|
|
|
|
+++ cups-1.2svn-r5238/conf/Makefile 2006-03-07 09:45:41.000000000 +0000
|
2009-09-16 10:25:32 +00:00
|
|
|
@@ -79,10 +79,16 @@
|
2004-09-09 04:02:40 +00:00
|
|
|
done
|
2006-03-17 12:10:57 +00:00
|
|
|
-if test x$(PAMDIR) != x; then \
|
|
|
|
|
$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
|
|
|
|
|
- if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \
|
|
|
|
|
- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
|
2009-09-16 10:25:32 +00:00
|
|
|
+ if test -f /etc/pam.d/password-auth; then \
|
|
|
|
|
+ $(INSTALL_DATA) cups.password-auth $(BUILDROOT)$(PAMDIR)/cups ; \
|
|
|
|
|
+ elif test -f /etc/pam.d/system-auth; then \
|
2006-03-17 12:10:57 +00:00
|
|
|
+ $(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups ; \
|
|
|
|
|
else \
|
|
|
|
|
- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
|
|
|
|
|
+ if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \
|
|
|
|
|
+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
|
|
|
|
|
+ else \
|
|
|
|
|
+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
|
|
|
|
|
+ fi ; \
|
|
|
|
|
fi ; \
|
2004-09-09 04:02:40 +00:00
|
|
|
fi
|
|
|
|
|
|
2006-03-17 12:10:57 +00:00
|
|
|
--- /dev/null 2006-03-07 09:12:30.964372750 +0000
|
|
|
|
|
+++ cups-1.2svn-r5238/conf/cups.system-auth 2006-03-07 09:43:12.000000000 +0000
|
|
|
|
|
@@ -0,0 +1,3 @@
|
|
|
|
|
+#%PAM-1.0
|
|
|
|
|
+auth include system-auth
|
|
|
|
|
+account include system-auth
|
2009-09-16 10:25:32 +00:00
|
|
|
--- /dev/null 2006-03-07 09:12:30.964372750 +0000
|
|
|
|
|
+++ cups-1.2svn-r5238/conf/cups.password-auth 2006-03-07 09:43:12.000000000 +0000
|
|
|
|
|
@@ -0,0 +1,4 @@
|
|
|
|
|
+#%PAM-1.0
|
|
|
|
|
+# Use password-auth common PAM configuration for the daemon
|
|
|
|
|
+auth include password-auth
|
|
|
|
|
+account include password-auth
|
