rpms/cups
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Use password-auth common PAM configuration instead of system-auth when

Browse Source 
available.
This commit is contained in:
Tomáš Mráz 2009-09-16 10:25:32 +00:00
parent 3827b7dbbb
commit 7aabe54edc
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cups-1.1.16-system-auth.patch
View File

@ -1,12 +1,14 @@
--- 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
@@ -79,10 +79,14 @@
@@ -79,10 +79,16 @@
done
-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 ; \
+ if test -f /etc/pam.d/system-auth; then \
+ 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 \
+ $(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups ; \
else \
- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
@ -24,3 +26,10 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
--- /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

6
cups.spec
View File

@ -9,7 +9,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.4.1
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@ -505,6 +505,10 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so
%changelog
* Wed Sep 16 2009 Tomas Mraz <tmraz@redhat.com> 1:1.4.1-3
- Use password-auth common PAM configuration instead of system-auth
when available.
* Tue Sep 15 2009 Tim Waugh <twaugh@redhat.com> 1:1.4.1-2
- Fixed 'service cups status' to check for correct subsys name
(bug #521641).