diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-06-27 20:26:20 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-06-27 20:26:20 +0000 |
| commit | 75bd9771f6e44fdd887ee90faac46f403aefc0fc (patch) | |
| tree | 354e3067522df9490e905772f73b72bfed8733ae /conf | |
| parent | dd1abb6b5f145c5e5f279d8848b5f3ec161fd227 (diff) | |
| download | cups-75bd9771f6e44fdd887ee90faac46f403aefc0fc.tar.gz | |
Merge changes from CUPS 1.4svn-r7696.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@818 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/Makefile | 4 | ||||
| -rw-r--r-- | conf/cupsd.conf.in | 13 | ||||
| -rw-r--r-- | conf/mime.types | 4 |
3 files changed, 9 insertions, 12 deletions
diff --git a/conf/Makefile b/conf/Makefile index 4bb31c9ed..8d4ffbf2f 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $" +# "$Id: Makefile 7670 2008-06-17 22:42:08Z mike $" # # Configuration file makefile for the Common UNIX Printing System (CUPS). # @@ -136,5 +136,5 @@ uninstall: # -# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $". +# End of "$Id: Makefile 7670 2008-06-17 22:42:08Z mike $". # diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in index 8939b8a4b..c48b70626 100644 --- a/conf/cupsd.conf.in +++ b/conf/cupsd.conf.in @@ -1,5 +1,5 @@ # -# "$Id: cupsd.conf.in 6720 2007-07-25 00:40:03Z mike $" +# "$Id: cupsd.conf.in 7680 2008-06-20 17:37:43Z mike $" # # Sample configuration file for the Common UNIX Printing System (CUPS) # scheduler. See "man cupsd.conf" for a complete description of this @@ -82,10 +82,9 @@ DefaultAuthType Basic <Policy authenticated> # Job-related operations must be done by the owner or an administrator... <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job CUPS-Get-Document> + AuthType Default Require user @OWNER @SYSTEM Order deny,allow - AuthType Default - Satisfy any </Limit> # All administration operations require an administrator to authenticate... @@ -104,19 +103,17 @@ DefaultAuthType Basic # Only the owner or an administrator can cancel or authenticate a job... <Limit Cancel-Job CUPS-Authenticate-Job> + AuthType Default Require user @OWNER @CUPS_DEFAULT_PRINTADMIN_AUTH@ Order deny,allow - AuthType Default - Satisfy any </Limit> <Limit All> - Order deny,allow AuthType Default - Satisfy any + Order deny,allow </Limit> </Policy> # -# End of "$Id: cupsd.conf.in 6720 2007-07-25 00:40:03Z mike $". +# End of "$Id: cupsd.conf.in 7680 2008-06-20 17:37:43Z mike $". # diff --git a/conf/mime.types b/conf/mime.types index 1852d460c..83a079a77 100644 --- a/conf/mime.types +++ b/conf/mime.types @@ -1,5 +1,5 @@ # -# "$Id: mime.types 6649 2007-07-11 21:46:42Z mike $" +# "$Id: mime.types 7670 2008-06-17 22:42:08Z mike $" # # MIME types file for the Common UNIX Printing System (CUPS). # @@ -173,5 +173,5 @@ application/vnd.cups-raw (string(0,<1B>E) + !string(2,<1B>%0B)) \ application/octet-stream # -# End of "$Id: mime.types 6649 2007-07-11 21:46:42Z mike $". +# End of "$Id: mime.types 7670 2008-06-17 22:42:08Z mike $". # |