diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-09-24 23:50:39 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-09-24 23:50:39 +0000 |
| commit | 18ecb4282108afe096df4958d992c80bb5f2b570 (patch) | |
| tree | d41d1b895293498ec62aa785616eb291919db0cf /conf | |
| parent | 7a0cbd5e5715d715c3fddfaace2f800ef820d328 (diff) | |
| download | cups-18ecb4282108afe096df4958d992c80bb5f2b570.tar.gz | |
Merge changes from CUPS 1.5svn-r8829.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1695 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/Makefile | 2 | ||||
| -rw-r--r-- | conf/cupsd.conf.in | 5 | ||||
| -rw-r--r-- | conf/pam.irix | 3 | ||||
| -rw-r--r-- | conf/pam.std.in | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/conf/Makefile b/conf/Makefile index e8cdbfc10..4e3963e21 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -90,7 +90,7 @@ install-data: done -if test x$(PAMDIR) != x; then \ $(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \ - if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \ + if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ else \ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in index adc0752cf..f02a74133 100644 --- a/conf/cupsd.conf.in +++ b/conf/cupsd.conf.in @@ -1,9 +1,8 @@ # # "$Id: cupsd.conf.in 7888 2008-08-29 21:16:56Z mike $" # -# Sample configuration file for the Common UNIX Printing System (CUPS) -# scheduler. See "man cupsd.conf" for a complete description of this -# file. +# Sample configuration file for the CUPS scheduler. See "man cupsd.conf" for a +# complete description of this file. # # Log general information in error_log - change "@CUPS_LOG_LEVEL@" to "debug" diff --git a/conf/pam.irix b/conf/pam.irix deleted file mode 100644 index 476383acb..000000000 --- a/conf/pam.irix +++ /dev/null @@ -1,3 +0,0 @@ -#%PAM-1.0 -auth required pam_unix.so shadow nodelay nullok -account required pam_unix.so diff --git a/conf/pam.std.in b/conf/pam.std.in index 3ddcdd0d3..68fb50af3 100644 --- a/conf/pam.std.in +++ b/conf/pam.std.in @@ -1,2 +1,2 @@ -auth required @PAMMOD@ nullok shadow +auth required @PAMMODAUTH@ account required @PAMMOD@ |