X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/736ea7721c1f97ef25572e5d84add7c7927dd752..200545fb5b96f63266e1b27195edd02217592671:/gen/cups-print.pc

diff --git a/gen/cups-print.pc b/gen/cups-print.pc
index 0bad9ecd..b9355ecc 100644
--- a/gen/cups-print.pc
+++ b/gen/cups-print.pc
@@ -50,6 +50,7 @@ const char *lpcpntr = "<Limit Pause-Printer Resume-Printer Enable-Printer\
  CUPS-Accept-Jobs CUPS-Reject-Jobs>";
 const char *canceljob = "<Limit Cancel-Job CUPS-Authenticate-Job>";
 const char *catchall = "<Limit All>";
+const char *phost = "printers.MIT.EDU";
 
 void do_host(char *host);
 void sqlerr(void);
@@ -134,7 +135,7 @@ void do_host(char *host)
 
   /* printers.conf */
   out = tarfile_start(tf, "/etc/cups/printers.conf", 0644, 0, 0,
-		      "root", "lp", now);
+		      "lp", "lp", now);
 
   EXEC SQL DECLARE csr_printers CURSOR FOR
     SELECT pr.rp, pr.name, pr.duplexname, pr.hwtype,
@@ -211,7 +212,7 @@ void do_host(char *host)
 
   /* aliases are in classes.conf */
   out = tarfile_start(tf, "/etc/cups/classes.conf", 0644, 0, 0,
-		      "root", "root", now);
+	          "lp", "lp", now);
   EXEC SQL DECLARE csr_duplexqs CURSOR FOR
     SELECT pr.rp, pr.name, pr.duplexname, pr.hwtype,
     m.name, pr.banner, pr.location, pr.contact, pr.ka, 
@@ -338,14 +339,12 @@ void do_host(char *host)
   fprintf(out, "ServerCertificate /etc/cups/ssl/%s-ipp-crt.pem\n", lhost);
   fprintf(out, "ServerKey /etc/cups/ssl/%s-ipp-key.pem\n", lhost);
   fprintf(out, "ServerName %s\n", lhost);
+  fprintf(out, "ServerAlias %s\n", phost);
   fprintf(out, "Krb5Keytab /etc/krb5-ipp.keytab\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);