[1816] in Moira Commits
/svn/moira r3963 - trunk/moira/gen
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Thu Jan 7 02:09:02 2010
Date: Thu, 7 Jan 2010 02:09:01 -0500
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201001070709.o07791je010509@drugstore.mit.edu>
To: moira-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2010-01-07 02:09:01 -0500 (Thu, 07 Jan 2010)
New Revision: 3963
Modified:
trunk/moira/gen/cups-cluster.pc
trunk/moira/gen/cups-print.pc
Log:
Revert previous commit; it escaped before its time.
Modified: trunk/moira/gen/cups-cluster.pc
===================================================================
--- trunk/moira/gen/cups-cluster.pc 2010-01-07 07:06:20 UTC (rev 3962)
+++ trunk/moira/gen/cups-cluster.pc 2010-01-07 07:09:01 UTC (rev 3963)
@@ -53,6 +53,7 @@
const char *canceljob = "<Limit Cancel-Job>";
const char *catchall = "<Limit All>";
const char *phost = "cluster-printers.MIT.EDU";
+const char *svrlist = "cups-hosts";
void do_host(char *host);
void sqlerr(void);
@@ -594,6 +595,7 @@
fprintf (out, "AuthType Default\n");
fprintf (out, "Require user @OWNER @SYSTEM\n");
printer_user_list(out, "LIST", lpc_acl, "Require user", 1);
+ printer_user_list(out, "LIST", svrlist, "Require user", 1);
fprintf (out, "Order deny,allow\n");
fprintf (out, "Allow from all\n");
fprintf (out, "</Limit>\n");
@@ -610,8 +612,10 @@
else
fprintf (out, "AuthType None\n");
/* Access-control list. */
- if (ac)
+ if (ac) {
printer_user_list(out, "LIST", ac, "Require user", 1);
+ printer_user_list(out, "LIST", svrlist, "Require user", 1);
+ }
else if (ka)
fprintf (out, "Require valid-user\n");
fprintf (out, "Order deny,allow\n");
Modified: trunk/moira/gen/cups-print.pc
===================================================================
--- trunk/moira/gen/cups-print.pc 2010-01-07 07:06:20 UTC (rev 3962)
+++ trunk/moira/gen/cups-print.pc 2010-01-07 07:09:01 UTC (rev 3963)
@@ -53,6 +53,7 @@
const char *canceljob = "<Limit Cancel-Job>";
const char *catchall = "<Limit All>";
const char *phost = "printers.MIT.EDU";
+const char *svrlist = "cups-servers";
void do_host(char *host);
void sqlerr(void);
@@ -132,7 +133,7 @@
char service[SERVERHOSTS_SERVICE_SIZE];
char *spoolhost = host, *unixtime_fmt = UNIXTIME_FMT, *p;
char *lhost;
- int ka, pc, ac, lpc_acl, top_lpc_acl, banner, rm;
+ int ka, pc, ac, lpc_acl, top_lpc_acl, banner, rm, svrlist_id;
EXEC SQL END DECLARE SECTION;
TARFILE *tf;
FILE *out;
@@ -530,6 +531,10 @@
FROM printservers ps, machine m
WHERE m.name = :spoolhost AND m.mach_id = ps.mach_id;
+ /* svrlist */
+ EXEC SQL SELECT list_id INTO :svrlist_id
+ FROM list l WHERE l.name = :svrlist;
+
/* first, what's our defaults? */
fprintf (out, "<Policy default>\n");
fprintf (out, "%s\n", alterjob);
@@ -597,6 +602,7 @@
fprintf (out, "AuthType Default\n");
fprintf (out, "Require user @OWNER @SYSTEM\n");
printer_user_list(out, "LIST", lpc_acl, "Require user", 1);
+ printer_user_list(out, "LIST", svrlist_id, "Require user", 1);
fprintf (out, "Order deny,allow\n");
fprintf (out, "Allow from all\n");
fprintf (out, "</Limit>\n");
@@ -613,8 +619,10 @@
else
fprintf (out, "AuthType None\n");
/* Access-control list. */
- if (ac)
+ if (ac) {
printer_user_list(out, "LIST", ac, "Require user", 1);
+ printer_user_list(out, "LIST", svrlist_id, "Require user", 1);
+ }
else if (ka)
fprintf (out, "Require valid-user\n");
fprintf (out, "Order deny,allow\n");
