From: zacheiss <zacheiss>
Date: Mon, 16 Nov 2009 22:54:36 +0000 (+0000)
Subject: Care about CUPS-CLUSTER entries in serverhosts table as well.
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/662cdab2bc7f521b699f9f578827d07a6379662a

Care about CUPS-CLUSTER entries in serverhosts table as well.
---

diff --git a/gen/cups-cluster.pc b/gen/cups-cluster.pc
index 2b87dd79..b0d1c030 100644
--- a/gen/cups-cluster.pc
+++ b/gen/cups-cluster.pc
@@ -235,7 +235,7 @@ void do_host(char *host)
     FROM printers pr, machine m, serverhosts sh
     WHERE pr.rm = m.mach_id 
     AND (pr.type = 'CLUSTER' or pr.type = 'DORM') AND m.name <> :spoolhost AND
-    m.mach_id = sh.mach_id AND sh.service = 'CUPS-PRINT' AND 
+    m.mach_id = sh.mach_id AND (sh.service = 'CUPS-PRINT' OR sh.service = 'CUPS-CLUSTER') AND 
     sh.enable = 1 AND m.mach_id = sh.mach_id;
 
   EXEC SQL OPEN csr_remote_printers;
@@ -375,7 +375,7 @@ void do_host(char *host)
     WHERE pr.rm = m.mach_id 
     AND m.mach_id = sh.mach_id AND sh.enable = 1 
     AND (pr.type = 'DORM' or pr.type = 'CLUSTER')
-    AND (sh.service = 'CUPS-PRINT' OR sh.service = 'PRINT');
+    AND (sh.service = 'CUPS-PRINT' OR sh.service = 'PRINT' OR sh.service = 'CUPS-CLUSTER');
   EXEC SQL OPEN csr_duplexqs;
   while (1)
     {
@@ -584,7 +584,7 @@ void do_host(char *host)
     SELECT UNIQUE rp, ka, ac, lpc_acl
     FROM printers
     WHERE (ac != 0 OR lpc_acl != 0) AND rm in (SELECT m.mach_id FROM machine m, serverhosts sh
-    WHERE m.mach_id = sh.mach_id AND sh.service = 'CUPS-PRINT' AND sh.enable = 1);
+    WHERE m.mach_id = sh.mach_id AND (sh.service = 'CUPS-PRINT' OR sh.service = 'CUPS-CLUSTER') AND sh.enable = 1);
   EXEC SQL OPEN csr_lpc;
   while (1)
     {
diff --git a/gen/cups-print.pc b/gen/cups-print.pc
index 48c153e8..a768a8f8 100644
--- a/gen/cups-print.pc
+++ b/gen/cups-print.pc
@@ -74,7 +74,8 @@ 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-PRINT' AND sh.enable = 1;
+    WHERE m.mach_id = sh.mach_id AND (sh.service = 'CUPS-PRINT' OR sh.service = 'CUPS-CLUSTER')
+    AND sh.enable = 1;
   EXEC SQL OPEN csr_hosts;
   while (1)
     {
@@ -235,8 +236,8 @@ void do_host(char *host)
     FROM printers pr, machine m, serverhosts sh
     WHERE pr.rm = m.mach_id 
     AND pr.type != 'ALIAS' AND m.name <> :spoolhost AND
-    m.mach_id = sh.mach_id AND sh.service = 'CUPS-PRINT' AND 
-    sh.enable = 1 AND m.mach_id = sh.mach_id;
+    m.mach_id = sh.mach_id AND (sh.service = 'CUPS-PRINT' OR sh.service = 'CUPS-CLUSTER')
+    AND sh.enable = 1 AND m.mach_id = sh.mach_id;
 
   EXEC SQL OPEN csr_remote_printers;
   while (1)
@@ -374,7 +375,7 @@ void do_host(char *host)
     FROM printers pr, machine m, serverhosts sh
     WHERE pr.rm = m.mach_id 
     AND m.mach_id = sh.mach_id AND sh.enable = 1 
-    AND (sh.service = 'CUPS-PRINT' OR sh.service = 'PRINT');
+    AND (sh.service = 'CUPS-PRINT' OR sh.service = 'PRINT' OR sh.service = 'CUPS-CLUSTER');
   EXEC SQL OPEN csr_duplexqs;
   while (1)
     {
@@ -583,7 +584,8 @@ void do_host(char *host)
     SELECT UNIQUE rp, ka, ac, lpc_acl
     FROM printers
     WHERE (ac != 0 OR lpc_acl != 0) AND rm in (SELECT m.mach_id FROM machine m, serverhosts sh
-    WHERE m.mach_id = sh.mach_id AND sh.service = 'CUPS-PRINT' AND sh.enable = 1);
+    WHERE m.mach_id = sh.mach_id AND (sh.service = 'CUPS-PRINT' OR sh.service = 'CUPS-CLUSTER')
+    AND sh.enable = 1);
   EXEC SQL OPEN csr_lpc;
   while (1)
     {