Import CUPS 1.4svn-r7908.

[thirdparty/cups.git] / conf / cupsd.conf.in

diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index 3561a805e5d18e241ff966711b5e7c98fb6c6d3e..9eff1e0e700e7574615c240aa3adfa09edf852f1 100644 (file)
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -1,14 +1,14 @@
 #
-# "$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
 #   file.
 #
 
-# Log general information in error_log - change "info" to "debug" for
-# troubleshooting...
-LogLevel info
+# Log general information in error_log - change "@CUPS_LOG_LEVEL@" to "debug"
+# for troubleshooting...
+LogLevel @CUPS_LOG_LEVEL@
 
 # Administrator user group...
 SystemGroup @CUPS_SYSTEM_GROUPS@
@@ -48,7 +48,7 @@ DefaultAuthType Basic
 # Set the default printer/job policies...
 <Policy default>
   # 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>
+  <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>
     Require user @OWNER @SYSTEM
     Order deny,allow
   </Limit>
@@ -81,11 +81,15 @@ DefaultAuthType Basic
 # Set the authenticated printer/job policies...
 <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>
-    Require user @OWNER @SYSTEM
+  <Limit Create-Job Print-Job Print-URI>
+    AuthType Default
     Order deny,allow
+  </Limit>
+
+  <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
-    Satisfy any
+    Require user @OWNER @SYSTEM
+    Order deny,allow
   </Limit>
 
   # All administration operations require an administrator to authenticate...
@@ -104,19 +108,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 $".
 #