|
 |
ea9550 |
diff -up cups-1.5b1/conf/cups.password-auth.system-auth cups-1.5b1/conf/cups.password-auth
|
|
|
ea9550 |
--- cups-1.5b1/conf/cups.password-auth.system-auth 2011-05-23 17:27:27.000000000 +0200
|
|
|
ea9550 |
+++ cups-1.5b1/conf/cups.password-auth 2011-05-23 17:27:27.000000000 +0200
|
|
|
ea9550 |
@@ -0,0 +1,4 @@
|
|
|
ea9550 |
+#%PAM-1.0
|
|
|
ea9550 |
+# Use password-auth common PAM configuration for the daemon
|
|
|
ea9550 |
+auth include password-auth
|
|
|
ea9550 |
+account include password-auth
|
|
|
ea9550 |
diff -up cups-1.5b1/conf/cups.system-auth.system-auth cups-1.5b1/conf/cups.system-auth
|
|
|
ea9550 |
--- cups-1.5b1/conf/cups.system-auth.system-auth 2011-05-23 17:27:27.000000000 +0200
|
|
|
ea9550 |
+++ cups-1.5b1/conf/cups.system-auth 2011-05-23 17:27:27.000000000 +0200
|
|
|
ea9550 |
@@ -0,0 +1,3 @@
|
|
|
ea9550 |
+#%PAM-1.0
|
|
|
ea9550 |
+auth include system-auth
|
|
|
ea9550 |
+account include system-auth
|
|
|
ea9550 |
diff -up cups-1.5b1/conf/Makefile.system-auth cups-1.5b1/conf/Makefile
|
|
|
ea9550 |
--- cups-1.5b1/conf/Makefile.system-auth 2011-05-12 07:21:56.000000000 +0200
|
|
|
ea9550 |
+++ cups-1.5b1/conf/Makefile 2011-05-23 17:27:27.000000000 +0200
|
|
|
ea9550 |
@@ -90,10 +90,16 @@ install-data:
|
|
|
ea9550 |
done
|
|
|
ea9550 |
-if test x$(PAMDIR) != x; then \
|
|
|
ea9550 |
$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
|
|
|
ea9550 |
- if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \
|
|
|
ea9550 |
- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
|
|
|
ea9550 |
+ if test -f /etc/pam.d/password-auth; then \
|
|
|
ea9550 |
+ $(INSTALL_DATA) cups.password-auth $(BUILDROOT)$(PAMDIR)/cups; \
|
|
|
ea9550 |
+ elif test -f /etc/pam.d/system-auth; then \
|
|
|
ea9550 |
+ $(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups; \
|
|
|
ea9550 |
else \
|
|
|
ea9550 |
- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
|
|
|
ea9550 |
+ if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \
|
|
|
ea9550 |
+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
|
|
|
ea9550 |
+ else \
|
|
|
ea9550 |
+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
|
|
|
ea9550 |
+ fi ; \
|
|
|
ea9550 |
fi ; \
|
|
|
ea9550 |
fi
|
|
|
ea9550 |
|