diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2007-07-26 22:45:43 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2007-07-26 22:45:43 +0000 |
| commit | 355e94dc85c9adaf0ad76a1dc8f5ff960181059c (patch) | |
| tree | 8acddd9c84526d8611c71ee89d299cf5c978084d /conf/cupsd.conf.in | |
| parent | cc0d019f5e08f870f94b8fee5f264b287fcecc3c (diff) | |
Merge changes from CUPS trunk, r6739.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@361 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf/cupsd.conf.in')
| -rw-r--r-- | conf/cupsd.conf.in | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in index c2cda0675..1660ed44e 100644 --- a/conf/cupsd.conf.in +++ b/conf/cupsd.conf.in @@ -1,5 +1,5 @@ # -# "$Id: cupsd.conf.in 6690 2007-07-18 23:58:37Z mike $" +# "$Id: cupsd.conf.in 6720 2007-07-25 00:40:03Z mike $" # # Sample configuration file for the Common UNIX Printing System (CUPS) # scheduler. See "man cupsd.conf" for a complete description of this @@ -56,15 +56,22 @@ DefaultAuthType Basic </Limit> # All administration operations require an administrator to authenticate... - <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default> + <Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default> AuthType Default Require user @SYSTEM Order deny,allow </Limit> + # All printer operations require a printer operator to authenticate... + <Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Accept-Jobs CUPS-Reject-Jobs> + AuthType Default + Require user @CUPS_DEFAULT_PRINTADMIN_AUTH@ + Order deny,allow + </Limit> + # Only the owner or an administrator can cancel or authenticate a job... <Limit Cancel-Job CUPS-Authenticate-Job> - Require user @OWNER @SYSTEM + Require user @OWNER @CUPS_DEFAULT_PRINTADMIN_AUTH@ Order deny,allow </Limit> @@ -74,5 +81,5 @@ DefaultAuthType Basic </Policy> # -# End of "$Id: cupsd.conf.in 6690 2007-07-18 23:58:37Z mike $". +# End of "$Id: cupsd.conf.in 6720 2007-07-25 00:40:03Z mike $". # |