diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-02-25 23:37:25 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-02-25 23:37:25 +0000 |
commit | b9faaae17cfc7cd8dfd6e82cf607c05b2f4def68 (patch) | |
tree | 11ae14d6d1fc0cd6d834e8c819b74167dbe2a413 /conf | |
parent | ede613e028030f6b2b5871b5e40682806ee1acd0 (diff) | |
download | cups-b9faaae17cfc7cd8dfd6e82cf607c05b2f4def68.tar.gz |
Merge changes from CUPS 1.4svn-r8394.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1253 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf')
-rw-r--r-- | conf/cupsd.conf.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in index 63ea89e76..adc0752cf 100644 --- a/conf/cupsd.conf.in +++ b/conf/cupsd.conf.in @@ -62,13 +62,13 @@ DefaultAuthType Basic # 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@ + Require user @CUPS_DEFAULT_PRINTOPERATOR_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 @CUPS_DEFAULT_PRINTADMIN_AUTH@ + Require user @OWNER @CUPS_DEFAULT_PRINTOPERATOR_AUTH@ Order deny,allow </Limit> @@ -101,14 +101,14 @@ DefaultAuthType Basic # 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@ + Require user @CUPS_DEFAULT_PRINTOPERATOR_AUTH@ Order deny,allow </Limit> # 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@ + Require user @OWNER @CUPS_DEFAULT_PRINTOPERATOR_AUTH@ Order deny,allow </Limit> |