X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/ea998f5e95432b8fba567f64f0889853009e67c6..646eea805f8862d2dc350b66c0ef4f97a5eb7f47:/gen/boot.pc diff --git a/gen/boot.pc b/gen/boot.pc index f7f12757..79f12be6 100644 --- 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++) {