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