Include CUPS-PRINT servers in generated tftp config files, too.

diff --git a/gen/boot.pc b/gen/boot.pc
index f7f127578bbd712d1f96184dec38f3c35a0945ac..79f12be66ada0df4459c992b10ce541aa22ed581 100644 (file)
--- a/gen/boot.pc
+++ b/gen/boot.pc
@@ -58,13 +58,14 @@ int main(int argc, char **argv)
   EXEC SQL WHENEVER SQLERROR DO sqlerr();
 
   /* Get print spoolers for allow lists. */
-  EXEC SQL SELECT COUNT(service) INTO :alcount FROM serverhosts
-    WHERE service = 'PRINT';
+  EXEC SQL SELECT COUNT(service) INTO :alcount FROM serverhosts sh
+    WHERE sh.service = 'PRINT' or sh.service = 'CUPS-PRINT';
   allowlist = malloc(alcount * sizeof(*allowlist));
 
   EXEC SQL DECLARE csr_spool CURSOR FOR
     SELECT m.address, sh.value3 FROM machine m, serverhosts sh
-    WHERE m.mach_id = sh.mach_id AND sh.service = 'PRINT';
+    WHERE m.mach_id = sh.mach_id AND 
+    (sh.service = 'PRINT' OR sh.service = 'CUPS-PRINT');
   EXEC SQL OPEN csr_spool;
   for (i = 0; i < alcount; i++)
     {

diff --git a/gen/dhcp.pc b/gen/dhcp.pc
index 31c49cc1f0875161fb2b9172441fde0cdc098d5a..19de4a3a69fead07ea0d0e107cdaba363d48a09d 100644 (file)
--- a/gen/dhcp.pc
+++ b/gen/dhcp.pc
@@ -70,13 +70,15 @@ int main(int argc, char **argv)
 
   /* Get print spoolers for allow lists. */
   EXEC SQL SELECT COUNT(service) INTO :alcount FROM serverhosts sh, machine m
-    WHERE sh.service = 'PRINT' AND sh.mach_id = m.mach_id 
+    WHERE (sh.service = 'PRINT' OR sh.service = 'CUPS-PRINT') 
+    AND sh.mach_id = m.mach_id 
     AND m.status = 1 AND m.address != 'unassigned';
   allowlist = malloc(alcount * sizeof(*allowlist));
 
   EXEC SQL DECLARE csr_spool CURSOR FOR
     SELECT m.address, sh.value3 FROM machine m, serverhosts sh
-    WHERE m.mach_id = sh.mach_id AND sh.service = 'PRINT'
+    WHERE m.mach_id = sh.mach_id AND 
+    (sh.service = 'PRINT' OR sh.service = 'CUPS-PRINT')
     AND m.status = 1 AND m.address != 'unassigned';
   EXEC SQL OPEN csr_spool;
   for (i = 0; i < alcount; i++)