Added install target commands.

Fixed lots of "LOG_INFO" messages that should have been "LOG_DEBUG".

Got rid of stray debug puts()...

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@310 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/scheduler/Makefile b/scheduler/Makefile
index a7637a007f82a9db98287b58678aa716d915060b..7e63b0b1e28be71902471eedbfcd9f1f54e16a7c 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.6 1999/04/16 20:47:46 mike Exp $"
+# "$Id: Makefile,v 1.7 1999/05/10 21:35:40 mike Exp $"
 #
 #   Scheduler Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -24,20 +24,14 @@
 
 include ../Makedefs
 
-#OPTIONS       =       -DDEBUG
 OBJS   =       auth.o classes.o client.o conf.o dirsvc.o main.o ipp.o job.o \
                printers.o
 
 #
-# Make the scheduler executable, "cupsd".
+# Make everything...
 #
 
-cupsd: $(OBJS) ../cups/libcups.a
-       $(CC) $(LDFLAGS) -o cupsd $(OBJS) $(LIBS)
-
-$(OBJS):       auth.h classes.h client.h conf.h cupsd.h dirsvc.h job.h \
-               printers.h ../cups/cups.h ../cups/http.h ../cups/ipp.h \
-               ../cups/mime.h ../cups/string.h ../Makedefs
+all:   cupsd
 
 #
 # Clean all object files...
@@ -51,7 +45,23 @@ clean:
 #
 
 install:
+       -$(MKDIR) $(SBINDIR)
+       $(CP) cupsd $(SBINDIR)
+       -$(MKDIR) $(SERVERROOT)/logs
+       -$(MKDIR) $(SERVERROOT)/ppd
+       -$(MKDIR) $(SERVERROOT)/requests
+
+#
+# Make the scheduler executable, "cupsd".
+#
+
+cupsd: $(OBJS) ../cups/libcups.a
+       $(CC) $(LDFLAGS) -o cupsd $(OBJS) $(LIBS)
+
+$(OBJS):       auth.h classes.h client.h conf.h cupsd.h dirsvc.h job.h \
+               printers.h ../cups/cups.h ../cups/http.h ../cups/ipp.h \
+               ../cups/mime.h ../cups/string.h ../Makedefs
 
 #
-# End of "$Id: Makefile,v 1.6 1999/04/16 20:47:46 mike Exp $".
+# End of "$Id: Makefile,v 1.7 1999/05/10 21:35:40 mike Exp $".
 #

diff --git a/scheduler/auth.c b/scheduler/auth.c
index 48408d4000132acde8a64814fb97070094c04306..82ed7d2ff44fab1d726b3e06c36695c60319917d 100644 (file)
--- a/scheduler/auth.c
+++ b/scheduler/auth.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: auth.c,v 1.9 1999/04/23 14:06:14 mike Exp $"
+ * "$Id: auth.c,v 1.10 1999/05/10 21:35:40 mike Exp $"
  *
  *   Authorization routines for the Common UNIX Printing System (CUPS).
  *
@@ -95,7 +95,7 @@ AddLocation(char *location)   /* I - Location path */
   strncpy(temp->location, location, sizeof(temp->location) - 1);
   temp->length = strlen(temp->location);
 
-  LogMessage(LOG_INFO, "AddLocation: added location \'%s\'", location);
+  LogMessage(LOG_DEBUG, "AddLocation: added location \'%s\'", location);
 
  /*
   * Return the new record...
@@ -343,7 +343,7 @@ IsAuthorized(client_t *con) /* I - Connection */
 
   if (pw == NULL)                      /* No such user... */
   {
-    LogMessage(LOG_INFO, "IsAuthorized: Unknown username \"%s\".",
+    LogMessage(LOG_WARN, "IsAuthorized: Unknown username \"%s\"; access denied.",
                con->username);
     return (HTTP_UNAUTHORIZED);
   }
@@ -566,5 +566,5 @@ check_auth(unsigned   ip,   /* I - Client address */
 
 
 /*
- * End of "$Id: auth.c,v 1.9 1999/04/23 14:06:14 mike Exp $".
+ * End of "$Id: auth.c,v 1.10 1999/05/10 21:35:40 mike Exp $".
  */

diff --git a/scheduler/client.c b/scheduler/client.c
index b9bfb950324939ef138fe53c7ac12037fb1cbce1..e280242ca07dbab5557637002e65bde8c7278ce5 100644 (file)
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: client.c,v 1.18 1999/05/10 16:38:40 mike Exp $"
+ * "$Id: client.c,v 1.19 1999/05/10 21:35:40 mike Exp $"
  *
  *   Client routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -119,7 +119,7 @@ AcceptClient(listener_t *lis)       /* I - Listener socket */
   else
     strncpy(con->http.hostname, host->h_name, sizeof(con->http.hostname) - 1);
 
-  LogMessage(LOG_INFO, "accept() %d from %s:%d.", con->http.fd,
+  LogMessage(LOG_DEBUG, "accept() %d from %s:%d.", con->http.fd,
              con->http.hostname, ntohs(con->http.hostaddr.sin_port));
 
  /*
@@ -169,7 +169,7 @@ CloseClient(client_t *con)  /* I - Client to close */
   int  status;                 /* Exit status of pipe command */
 
 
-  LogMessage(LOG_INFO, "CloseClient() %d", con->http.fd);
+  LogMessage(LOG_DEBUG, "CloseClient() %d", con->http.fd);
 
  /*
   * Close the socket and clear the file from the input set for select()...
@@ -368,7 +368,7 @@ ReadClient(client_t *con)   /* I - Client to read from */
         con->start     = time(NULL);
         con->operation = con->http.state;
 
-        LogMessage(LOG_INFO, "ReadClient() %d %s %s HTTP/%d.%d", con->http.fd,
+        LogMessage(LOG_DEBUG, "ReadClient() %d %s %s HTTP/%d.%d", con->http.fd,
                   operation, con->uri,
                   con->http.version / 100, con->http.version % 100);
 
@@ -753,7 +753,7 @@ ReadClient(client_t *con)   /* I - Client to read from */
            con->file = mkstemp(con->filename);
            fchmod(con->file, 0644);
 
-            LogMessage(LOG_INFO, "ReadClient() %d REQUEST %s", con->http.fd,
+            LogMessage(LOG_DEBUG, "ReadClient() %d REQUEST %s", con->http.fd,
                       con->filename);
 
            if (con->file < 0)
@@ -1053,7 +1053,7 @@ StartListening(void)
 
   for (i = NumListeners, lis = Listeners; i > 0; i --, lis ++)
   {
-    LogMessage(LOG_INFO, "StartListening() address=%08x port=%d",
+    LogMessage(LOG_DEBUG, "StartListening() address=%08x port=%d",
                ntohl(lis->address.sin_addr.s_addr),
               ntohs(lis->address.sin_port));
 
@@ -1106,7 +1106,7 @@ StartListening(void)
     FD_SET(lis->fd, &InputSet);
   }
 
-  LogMessage(LOG_INFO, "StartListening() NumListeners=%d", NumListeners);
+  LogMessage(LOG_DEBUG, "StartListening() NumListeners=%d", NumListeners);
 }
 
 
@@ -1133,7 +1133,7 @@ StopListening(void)
     FD_CLR(lis->fd, &InputSet);
   }
 
-  LogMessage(LOG_INFO, "StopListening()");
+  LogMessage(LOG_DEBUG, "StopListening()");
 }
 
 
@@ -1565,5 +1565,5 @@ pipe_command(client_t *con,       /* I - Client connection */
 
 
 /*
- * End of "$Id: client.c,v 1.18 1999/05/10 16:38:40 mike Exp $".
+ * End of "$Id: client.c,v 1.19 1999/05/10 21:35:40 mike Exp $".
  */

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 65e6a543b8b12fec42c5ce2d3804c29ae5c67588..f0bff59f2b7bf1c04a92590640e5c920c0af0a64 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: conf.c,v 1.16 1999/05/10 16:38:41 mike Exp $"
+ * "$Id: conf.c,v 1.17 1999/05/10 21:35:41 mike Exp $"
  *
  *   Configuration routines for the Common UNIX Printing System (CUPS).
  *
@@ -127,7 +127,7 @@ ReadConfiguration(void)
   StopListening();
   StopBrowsing();
 
-  LogMessage(LOG_INFO, "ReadConfiguration() ConfigurationFile=\"%s\"",
+  LogMessage(LOG_DEBUG, "ReadConfiguration() ConfigurationFile=\"%s\"",
              ConfigurationFile);
 
   if (AccessFile != NULL)
@@ -1060,5 +1060,5 @@ get_address(char               *value,            /* I - Value string */
 
 
 /*
- * End of "$Id: conf.c,v 1.16 1999/05/10 16:38:41 mike Exp $".
+ * End of "$Id: conf.c,v 1.17 1999/05/10 21:35:41 mike Exp $".
  */

diff --git a/scheduler/job.c b/scheduler/job.c
index 67665c80dabeb4551f8d5adb11a7a7f97ca1a88f..cd426d4bf59ba5673d39929d3bf512763eb4cbf2 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: job.c,v 1.17 1999/05/10 16:38:42 mike Exp $"
+ * "$Id: job.c,v 1.18 1999/05/10 21:35:41 mike Exp $"
  *
  *   Job management routines for the Common UNIX Printing System (CUPS).
  *
@@ -706,7 +706,6 @@ UpdateJob(job_t *job)               /* I - Job to check */
       */
 
       *lineptr++ = '\0';
-      puts(buffer);
 
      /*
       * Figure out the logging level...
@@ -848,5 +847,5 @@ start_process(char *command,        /* I - Full path to command */
 
 
 /*
- * End of "$Id: job.c,v 1.17 1999/05/10 16:38:42 mike Exp $".
+ * End of "$Id: job.c,v 1.18 1999/05/10 21:35:41 mike Exp $".
  */