From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Wed, 28 Mar 2001 16:55:56 +0000 (+0000)
Subject: Add missing include files.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a91f14b45992453df915a81a731f9262060aafe;p=thirdparty%2Fcups.git

Add missing include files.

Add ESC/P2 secret decoder ring.

Updates for Stylus Pro 5500 driver, and fixes for other Stylus Pro
drivers.

Add DSC comments to calibrate output.

Add more debug stuff to IPP code to track down delayed job bug.

Don't set CLASSIFICATION environment variable unless the classification
is set on the server.


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

diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index 966b019a0e..3128682727 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dirsvc.c,v 1.72 2001/02/21 17:01:17 mike Exp $"
+ * "$Id: dirsvc.c,v 1.73 2001/03/28 16:55:54 mike Exp $"
  *
  *   Directory services routines for the Common UNIX Printing System (CUPS).
  *
@@ -36,6 +36,7 @@
  */
 
 #include "cupsd.h"
+#include <grp.h>
 
 
 /*
@@ -947,5 +948,5 @@ StopPolling(void)
 
 
 /*
- * End of "$Id: dirsvc.c,v 1.72 2001/02/21 17:01:17 mike Exp $".
+ * End of "$Id: dirsvc.c,v 1.73 2001/03/28 16:55:54 mike Exp $".
  */
diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index ffdbf3a94a..6e073f10af 100644
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c,v 1.124 2001/03/27 14:26:26 mike Exp $"
+ * "$Id: ipp.c,v 1.125 2001/03/28 16:55:54 mike Exp $"
  *
  *   IPP routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -3880,6 +3880,7 @@ print_job(client_t        *con,		/* I - Client connection */
 
   LogMessage(L_INFO, "Job %d queued on \'%s\' by \'%s\'.", job->id,
              job->dest, job->username);
+  LogMessage(L_DEBUG, "Job %d hold_until = %d", job->id, job->hold_until);
 
   SaveJob(job->id);
 
@@ -5338,5 +5339,5 @@ validate_user(client_t   *con,		/* I - Client connection */
 
 
 /*
- * End of "$Id: ipp.c,v 1.124 2001/03/27 14:26:26 mike Exp $".
+ * End of "$Id: ipp.c,v 1.125 2001/03/28 16:55:54 mike Exp $".
  */
diff --git a/scheduler/job.c b/scheduler/job.c
index b95b5268d2..69d6c553d9 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: job.c,v 1.120 2001/03/15 17:48:08 mike Exp $"
+ * "$Id: job.c,v 1.121 2001/03/28 16:55:55 mike Exp $"
  *
  *   Job management routines for the Common UNIX Printing System (CUPS).
  *
@@ -1303,8 +1303,11 @@ StartJob(int       id,		/* I - Job ID */
   snprintf(tmpdir, sizeof(tmpdir), "TMPDIR=%s", TempDir);
   snprintf(datadir, sizeof(datadir), "CUPS_DATADIR=%s", DataDir);
   snprintf(fontpath, sizeof(fontpath), "CUPS_FONTPATH=%s", FontPath);
-  snprintf(classification, sizeof(classification), "CLASSIFICATION=%s",
-           Classification);
+  if (Classification[0])
+    snprintf(classification, sizeof(classification), "CLASSIFICATION=%s",
+             Classification);
+  else
+    classification[0] = '\0';
   if (getenv("LD_LIBRARY_PATH") != NULL)
     snprintf(ldpath, sizeof(ldpath), "LD_LIBRARY_PATH=%s", getenv("LD_LIBRARY_PATH"));
   else
@@ -2791,5 +2794,5 @@ start_process(const char *command,	/* I - Full path to command */
 
 
 /*
- * End of "$Id: job.c,v 1.120 2001/03/15 17:48:08 mike Exp $".
+ * End of "$Id: job.c,v 1.121 2001/03/28 16:55:55 mike Exp $".
  */
diff --git a/scheduler/server.c b/scheduler/server.c
index 2f943307fb..49beebd51a 100644
--- a/scheduler/server.c
+++ b/scheduler/server.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: server.c,v 1.1 2001/02/21 17:01:18 mike Exp $"
+ * "$Id: server.c,v 1.2 2001/03/28 16:55:56 mike Exp $"
  *
  *   Server start/stop routines for the Common UNIX Printing System (CUPS).
  *
@@ -33,6 +33,8 @@
 
 #include "cupsd.h"
 
+#include <grp.h>
+
 #ifdef HAVE_LIBSSL
 #  include <openssl/ssl.h>
 #  include <openssl/rand.h>
@@ -156,5 +158,5 @@ StopServer(void)
 
 
 /*
- * End of "$Id: server.c,v 1.1 2001/02/21 17:01:18 mike Exp $".
+ * End of "$Id: server.c,v 1.2 2001/03/28 16:55:56 mike Exp $".
  */