when resolving [ANY] printserver, only pick from among printservers

with enabled serverhost entries. Fixes [1278] in moira reported by
zacheiss.

diff --git a/server/qsetup.pc b/server/qsetup.pc
index 7f6a3a4f85729c81127370fa7e3d64c4afd66ec5..b157c4ce8a6da3bd1c3116b1d3338fcacdabf1b1 100644 (file)
--- a/server/qsetup.pc
+++ b/server/qsetup.pc
@@ -1174,7 +1174,10 @@ int setup_aprn(struct query *q, char **argv, client *cl)
     {
       EXEC SQL DECLARE csr_rm CURSOR FOR
        SELECT ps.mach_id, s.string FROM printservers ps, strings s
-       WHERE ps.printer_types = s.string_id;
+       WHERE ps.mach_id IN
+       ( SELECT mach_id FROM serverhosts WHERE service = 'PRINT'
+         AND enable = 1 )
+       AND ps.printer_types = s.string_id;
       if (dbms_errno)
        return mr_errcode;
       EXEC SQL OPEN csr_rm;