diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-11-06 05:13:04 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-11-06 05:13:04 +0000 |
| commit | 10d09e334a4892cd5ed4e2a2a0f5bbe3c8c171ed (patch) | |
| tree | cb980415b72e93a966ea00d60a18ace75533dcfd /conf | |
| parent | 6c48a6cafc078a698d97c82c1dd69ac9f850c0ce (diff) | |
| download | cups-10d09e334a4892cd5ed4e2a2a0f5bbe3c8c171ed.tar.gz | |
Merge changes from CUPS 1.5svn-r9352.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2848 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/cupsd.conf.in | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in index a7143b7dc..1a2037cfa 100644 --- a/conf/cupsd.conf.in +++ b/conf/cupsd.conf.in @@ -45,6 +45,12 @@ DefaultAuthType Basic # Set the default printer/job policies... <Policy default> + # Job/subscription privacy... + JobPrivateAccess default + JobPrivateValues default + SubscriptionPrivateAccess default + SubscriptionPrivateAccess default + # Job-related operations must be done by the owner or an administrator... <Limit Create-Job Print-Job Print-URI Validate-Job> Order deny,allow @@ -63,14 +69,14 @@ DefaultAuthType Basic </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> + <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 Cancel-Jobs CUPS-Accept-Jobs CUPS-Reject-Jobs> AuthType Default 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 Cancel-Jobs CUPS-Authenticate-Job> + <Limit Cancel-Job CUPS-Authenticate-Job> Require user @OWNER @CUPS_DEFAULT_PRINTOPERATOR_AUTH@ Order deny,allow </Limit> @@ -82,6 +88,12 @@ DefaultAuthType Basic # Set the authenticated printer/job policies... <Policy authenticated> + # Job/subscription privacy... + JobPrivateAccess default + JobPrivateValues default + SubscriptionPrivateAccess default + SubscriptionPrivateAccess default + # Job-related operations must be done by the owner or an administrator... <Limit Create-Job Print-Job Print-URI Validate-Job> AuthType Default @@ -102,14 +114,14 @@ DefaultAuthType Basic </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> + <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 Cancel-Jobs CUPS-Accept-Jobs CUPS-Reject-Jobs> AuthType Default 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 Cancel-Jobs CUPS-Authenticate-Job> + <Limit Cancel-Job CUPS-Authenticate-Job> AuthType Default Require user @OWNER @CUPS_DEFAULT_PRINTOPERATOR_AUTH@ Order deny,allow |