1a6a784faSopenharmony_cidiff -up cups-1.5b1/conf/cups.password-auth.system-auth cups-1.5b1/conf/cups.password-auth 2a6a784faSopenharmony_ci--- cups-1.5b1/conf/cups.password-auth.system-auth 2011-05-23 17:27:27.000000000 +0200 3a6a784faSopenharmony_ci+++ cups-1.5b1/conf/cups.password-auth 2011-05-23 17:27:27.000000000 +0200 4a6a784faSopenharmony_ci@@ -0,0 +1,4 @@ 5a6a784faSopenharmony_ci+#%PAM-1.0 6a6a784faSopenharmony_ci+# Use password-auth common PAM configuration for the daemon 7a6a784faSopenharmony_ci+auth include password-auth 8a6a784faSopenharmony_ci+account include password-auth 9a6a784faSopenharmony_cidiff -up cups-1.5b1/conf/cups.system-auth.system-auth cups-1.5b1/conf/cups.system-auth 10a6a784faSopenharmony_ci--- cups-1.5b1/conf/cups.system-auth.system-auth 2011-05-23 17:27:27.000000000 +0200 11a6a784faSopenharmony_ci+++ cups-1.5b1/conf/cups.system-auth 2011-05-23 17:27:27.000000000 +0200 12a6a784faSopenharmony_ci@@ -0,0 +1,3 @@ 13a6a784faSopenharmony_ci+#%PAM-1.0 14a6a784faSopenharmony_ci+auth include system-auth 15a6a784faSopenharmony_ci+account include system-auth 16a6a784faSopenharmony_cidiff -up cups-1.5b1/conf/Makefile.system-auth cups-1.5b1/conf/Makefile 17a6a784faSopenharmony_ci--- cups-1.5b1/conf/Makefile.system-auth 2011-05-12 07:21:56.000000000 +0200 18a6a784faSopenharmony_ci+++ cups-1.5b1/conf/Makefile 2011-05-23 17:27:27.000000000 +0200 19a6a784faSopenharmony_ci@@ -90,10 +90,16 @@ install-data: 20a6a784faSopenharmony_ci done 21a6a784faSopenharmony_ci -if test x$(PAMDIR) != x; then \ 22a6a784faSopenharmony_ci $(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \ 23a6a784faSopenharmony_ci- if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \ 24a6a784faSopenharmony_ci- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ 25a6a784faSopenharmony_ci+ if test -f /etc/pam.d/password-auth; then \ 26a6a784faSopenharmony_ci+ $(INSTALL_DATA) cups.password-auth $(BUILDROOT)$(PAMDIR)/cups; \ 27a6a784faSopenharmony_ci+ elif test -f /etc/pam.d/system-auth; then \ 28a6a784faSopenharmony_ci+ $(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups; \ 29a6a784faSopenharmony_ci else \ 30a6a784faSopenharmony_ci- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ 31a6a784faSopenharmony_ci+ if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \ 32a6a784faSopenharmony_ci+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ 33a6a784faSopenharmony_ci+ else \ 34a6a784faSopenharmony_ci+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ 35a6a784faSopenharmony_ci+ fi ; \ 36a6a784faSopenharmony_ci fi ; \ 37a6a784faSopenharmony_ci fi 38a6a784faSopenharmony_ci 39