Fix options.

[moira.git] / gen / cups-print.pc

diff --git a/gen/cups-print.pc b/gen/cups-print.pc
index 633c623cc197a2e337a670acd5a13fe32a451942..9fa4e78e67bed53304b467f9f7114c1348e23b38 100644 (file)
--- a/gen/cups-print.pc
+++ b/gen/cups-print.pc
@@ -35,11 +35,12 @@ char *db = "moira/moira";
 
 /* OMG, I hate this, but it's cleaner, I guess? */
 
-const char *alterjob = "<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\
+const char *alterjob = "<Limit Hold-Job Release-Job\
+ Restart-Job Purge-Jobs Reprocess-Job Set-Job-Attributes\
  Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>";
-const char *submitjob = "<Limit Create-Job Print-Job Print-URI>";
+const char *submitjob = "<Limit Create-Job Print-Job Print-URI Send-Document\
+ Set-Job-Attributes Send-URI Create-Job-Subscription Renew-Subscription\
+ Cancel-Subscription Get-Notifications CUPS-Move-Job>";
 const char *alterpntr = "<Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer\
  CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default>";
 const char *lpcpntr = "<Limit Pause-Printer Resume-Printer Enable-Printer\
@@ -70,7 +71,7 @@ int main(int argc, char **argv)
 
   EXEC SQL DECLARE csr_hosts CURSOR FOR
     SELECT m.name FROM machine m, serverhosts sh
-    WHERE m.mach_id = sh.mach_id AND sh.service = 'CUPS' AND sh.enable = 1;
+    WHERE m.mach_id = sh.mach_id AND sh.service = 'CUPS-PRINT' AND sh.enable = 1;
   EXEC SQL OPEN csr_hosts;
   while (1)
     {
@@ -128,7 +129,7 @@ void do_host(char *host)
   EXEC SQL SELECT mach_id INTO :rm FROM machine
     WHERE name = :spoolhost;
 
-  sprintf(filename, "%s/print/%s", DCM_DIR, host);
+  sprintf(filename, "%s/cups-print/%s", DCM_DIR, host);
   tf = tarfile_open(filename);
 
   /* printers.conf */
@@ -384,8 +385,9 @@ void do_host(char *host)
       fprintf (out, "Order deny,allow\n");
       fprintf (out, "</Limit>\n");
       fprintf (out, "%s\n", submitjob);
-      fprintf (out, "AuthType Default\n");
+      fprintf (out, "AuthType None\n");
       fprintf (out, "Order deny,allow\n");
+      fprintf (out, "Allow from all\n");
       fprintf (out, "</Limit>\n");
       fprintf (out, "%s\n", alterpntr);
       fprintf (out, "AuthType Default\n");
@@ -403,9 +405,13 @@ void do_host(char *host)
       fprintf (out, "Require user @OWNER @SYSTEM\n");
       printer_user_list(out, "LIST", top_lpc_acl, "Require user");
       fprintf (out, "Order deny,allow\n");
+      fprintf (out, "Allow from all\n");
+      fprintf (out, "AuthType None\n");
       fprintf (out, "</Limit>\n");
       fprintf (out, "%s\n", catchall);
+      fprintf (out, "AuthType None\n");
       fprintf (out, "Order deny,allow\n");
+      fprintf (out, "Allow from all\n");
       fprintf (out, "</Limit>\n");
       fprintf (out, "</Policy>\n");
     }
@@ -432,6 +438,7 @@ void do_host(char *host)
       fprintf (out, "Require user @OWNER @SYSTEM\n");
       printer_user_list(out, "LIST", lpc_acl, "Require user");
       fprintf (out, "Order deny,allow\n");
+      fprintf (out, "Allow from all\n");
       fprintf (out, "</Limit>\n");
       fprintf (out, "%s\n", submitjob);
       /* If the printer is Kerberized? */
@@ -445,6 +452,7 @@ void do_host(char *host)
       else if (ka)
         fprintf (out, "Require valid-user\n");
       fprintf (out, "Order deny,allow\n");
+      fprintf (out, "Allow from all\n");
       fprintf (out, "</Limit>\n");
       fprintf (out, "%s\n", alterpntr);
       fprintf (out, "AuthType Default\n");
@@ -466,9 +474,12 @@ void do_host(char *host)
       printer_user_list(out, "LIST", lpc_acl, "Require user");
       printer_user_list(out, "LIST", top_lpc_acl, "Require user");
       fprintf (out, "Order deny,allow\n");
+      fprintf (out, "Allow from all\n");
       fprintf (out, "</Limit>\n");
       fprintf (out, "%s\n", catchall);
+      fprintf (out, "AuthType None\n");
       fprintf (out, "Order deny,allow\n");
+      fprintf (out, "Allow from all\n");
       fprintf (out, "</Limit>\n");
       fprintf (out, "</Policy>\n");
     }