diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-09-17 19:54:07 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-09-17 19:54:07 +0000 |
| commit | b19ccc9e271691cc71a08e9968c58f464ebeade5 (patch) | |
| tree | 222499e15a781dcecfe0681b23825003d78caa8b /conf | |
| parent | 49d8745278805ede5c41bae3c299e14ba40457bf (diff) | |
| download | cups-b19ccc9e271691cc71a08e9968c58f464ebeade5.tar.gz | |
Merge changes from CUPS 1.4svn-r7961.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@969 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/Makefile | 5 | ||||
| -rw-r--r-- | conf/cupsd.conf.in | 4 | ||||
| -rw-r--r-- | conf/pam.opendirectory | 5 | ||||
| -rw-r--r-- | conf/pam.securityserver (renamed from conf/pam.darwin) | 0 |
4 files changed, 9 insertions, 5 deletions
diff --git a/conf/Makefile b/conf/Makefile index acd7eacba..e9ef1f489 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 7670 2008-06-17 22:42:08Z mike $" +# "$Id: Makefile 7938 2008-09-11 23:53:59Z mike $" # # Configuration file makefile for the Common UNIX Printing System (CUPS). # @@ -70,7 +70,6 @@ install: all install-data install-headers install-libs install-exec # install-data: - $(INSTALL_DIR) -m 755 $(SERVERROOT) for file in $(KEEP); do \ if test -r $(SERVERROOT)/$$file ; then \ $(INSTALL_CONFIG) $$file $(SERVERROOT)/$$file.N ; \ @@ -143,5 +142,5 @@ uninstall: # -# End of "$Id: Makefile 7670 2008-06-17 22:42:08Z mike $". +# End of "$Id: Makefile 7938 2008-09-11 23:53:59Z mike $". # diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in index 9eff1e0e7..ff034ccb2 100644 --- a/conf/cupsd.conf.in +++ b/conf/cupsd.conf.in @@ -1,5 +1,5 @@ # -# "$Id: cupsd.conf.in 7680 2008-06-20 17:37:43Z mike $" +# "$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 @@ -120,5 +120,5 @@ DefaultAuthType Basic </Policy> # -# End of "$Id: cupsd.conf.in 7680 2008-06-20 17:37:43Z mike $". +# End of "$Id: cupsd.conf.in 7888 2008-08-29 21:16:56Z mike $". # diff --git a/conf/pam.opendirectory b/conf/pam.opendirectory new file mode 100644 index 000000000..b336306a8 --- /dev/null +++ b/conf/pam.opendirectory @@ -0,0 +1,5 @@ +# cups: auth account password session +auth required pam_opendirectory.so +account required pam_permit.so +password required pam_deny.so +session required pam_permit.so diff --git a/conf/pam.darwin b/conf/pam.securityserver index ff724da4d..ff724da4d 100644 --- a/conf/pam.darwin +++ b/conf/pam.securityserver |