Samba queues, browsing changes.

diff --git a/gen/cups-print.pc b/gen/cups-print.pc
index 9f974604408d372937ca3bd0232c43abffa54099..0bad9ecdd73e1537da691927e86da54d0dc9793b 100644 (file)
--- a/gen/cups-print.pc
+++ b/gen/cups-print.pc
@@ -339,12 +339,20 @@ void do_host(char *host)
   fprintf(out, "ServerKey /etc/cups/ssl/%s-ipp-key.pem\n", lhost);
   fprintf(out, "ServerName %s\n", lhost);
   fprintf(out, "Krb5Keytab /etc/krb5-ipp.keytab\n");
-  fprintf(out, "Browsing On\n");
-  fprintf(out, "BrowseProtocols cups\n");
+  /* fprintf(out, "Browsing On\n"); */
+  /* fprintf(out, "BrowseProtocols cups\n"); */
 
   /* The other CUPS servers should be aware of the other hosts'
      queues, so we'll let them browse each other. */
+  fprintf(out, "Include cups.local.conf\n");
+  fprintf(out, "Include cups.hosts.conf\n");
+  fprintf(out, "Include cups.locations.conf\n");
+  fprintf(out, "Include cups.policies.conf\n");
+  tarfile_end(tf);
 
+  /* cups.hosts.conf */
+  out = tarfile_start(tf, "/etc/cups/cups.hosts.conf", 0755, 1, 1,
+                     "root", "lp", now);
   EXEC SQL DECLARE csr_cupshosts CURSOR FOR
     SELECT m.name AS cupshosts FROM machine m, printservers ps
     WHERE m.mach_id = ps.mach_id AND ps.kind = 'CUPS';
@@ -362,8 +370,6 @@ void do_host(char *host)
          fprintf(out, "BrowsePoll %s\n", cupshosts);
     }
   EXEC SQL CLOSE csr_cupshosts;
-  fprintf(out, "Include cups.locations.conf\n");
-  fprintf(out, "Include cups.policies.conf\n");
 
   tarfile_end(tf);
 

diff --git a/gen/cups-print.sh b/gen/cups-print.sh
index dab9ad68dcca0762557949f484431b23f119da6d..c60a2a8c1ea664c6593a19748b82ea753abe1d9c 100755 (executable)
--- a/gen/cups-print.sh
+++ b/gen/cups-print.sh
@@ -30,10 +30,17 @@ tar xf $TARFILE || exit $MR_TARERR
 /etc/cups/bin/gen-ppd.pl
 
 /etc/init.d/cups restart
+
 if [ $? != 0 ]; then
     exit $MR_MKCRED
 fi
 
+# if Samba-enabled, then restart it too to have it pick up
+# new definitions
+if [ -x /etc/init.d/smb ]; then
+       /etc/init.d/smb restart
+fi
+
 # cleanup
 test -f $TARFILE && rm -f $TARFILE
 test -f $0 && rm -f $0