Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@4383 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index d960dccf86843a99e0e852c6b457115a42495b26..2dd6a90e9550a4efae293a3f20e7928f0ad6ddd4 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,9 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.21rc2
 
+       - The scheduler used a select() timeout of INT_MAX
+         seconds when there was nothing to do, which doesn't
+         work on IRIX (STR #864)
        - Updated the cupsaddsmb program to use the new Windows
          2000 PostScript drivers instead of the Windows NT
          printer drivers (STR #390)

diff --git a/scheduler/auth.h b/scheduler/auth.h
index 169b8972913a1a0ea4e4dd83db1d163f1b873c95..23de06a1f8e9cb04521b0d6758db5e3a990ecc56 100644 (file)
--- a/scheduler/auth.h
+++ b/scheduler/auth.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: auth.h,v 1.16.2.8 2004/06/29 13:15:10 mike Exp $"
+ * "$Id: auth.h,v 1.16.2.9 2004/08/23 18:01:56 mike Exp $"
  *
  *   Authorization definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
@@ -16,7 +16,7 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3142 USA
+ *       Hollywood, Maryland 20636 USA
  *
  *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
@@ -135,5 +135,5 @@ extern http_status_t        IsAuthorized(client_t *con);
 
 
 /*
- * End of "$Id: auth.h,v 1.16.2.8 2004/06/29 13:15:10 mike Exp $".
+ * End of "$Id: auth.h,v 1.16.2.9 2004/08/23 18:01:56 mike Exp $".
  */

diff --git a/scheduler/banners.h b/scheduler/banners.h
index be347a14089bf5b63fa02adda1969bab22604e9d..2ef28726d892d500824d1313b7770351b3b90f63 100644 (file)
--- a/scheduler/banners.h
+++ b/scheduler/banners.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: banners.h,v 1.2.2.4 2004/06/29 13:15:10 mike Exp $"
+ * "$Id: banners.h,v 1.2.2.5 2004/08/23 18:01:56 mike Exp $"
  *
  *   Banner definitions for the Common UNIX Printing System (CUPS).
  *
@@ -15,7 +15,7 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3142 USA
+ *       Hollywood, Maryland 20636 USA
  *
  *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
@@ -53,5 +53,5 @@ extern void   LoadBanners(const char *d);
 
 
 /*
- * End of "$Id: banners.h,v 1.2.2.4 2004/06/29 13:15:10 mike Exp $".
+ * End of "$Id: banners.h,v 1.2.2.5 2004/08/23 18:01:56 mike Exp $".
  */

diff --git a/scheduler/cert.h b/scheduler/cert.h
index 8a9de96bba20e5333c708565357096687f9571c2..eb568239019d298b8394913eb073e3e7a75f4bcc 100644 (file)
--- a/scheduler/cert.h
+++ b/scheduler/cert.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cert.h,v 1.3.2.3 2004/06/29 13:15:10 mike Exp $"
+ * "$Id: cert.h,v 1.3.2.4 2004/08/23 18:01:56 mike Exp $"
  *
  *   Authentication certificate definitions for the Common UNIX
  *   Printing System (CUPS).
@@ -16,7 +16,7 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3142 USA
+ *       Hollywood, Maryland 20636 USA
  *
  *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
@@ -56,5 +56,5 @@ extern void           InitCerts(void);
 
 
 /*
- * End of "$Id: cert.h,v 1.3.2.3 2004/06/29 13:15:10 mike Exp $".
+ * End of "$Id: cert.h,v 1.3.2.4 2004/08/23 18:01:56 mike Exp $".
  */

diff --git a/scheduler/classes.h b/scheduler/classes.h
index fc84e3ab33af40f20ea59629073649ed08684f42..ffd385345d0b8d6cb60eb771613dcfdfd7d237b1 100644 (file)
--- a/scheduler/classes.h
+++ b/scheduler/classes.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: classes.h,v 1.10.2.4 2004/06/29 13:15:10 mike Exp $"
+ * "$Id: classes.h,v 1.10.2.5 2004/08/23 18:01:56 mike Exp $"
  *
  *   Printer class definitions for the Common UNIX Printing System (CUPS).
  *
@@ -15,7 +15,7 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3142 USA
+ *       Hollywood, Maryland 20636 USA
  *
  *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
@@ -40,5 +40,5 @@ extern void           UpdateImplicitClasses(void);
 
 
 /*
- * End of "$Id: classes.h,v 1.10.2.4 2004/06/29 13:15:10 mike Exp $".
+ * End of "$Id: classes.h,v 1.10.2.5 2004/08/23 18:01:56 mike Exp $".
  */

diff --git a/scheduler/client.h b/scheduler/client.h
index cf1636376b2f742e465b4b5498a2ac04f7ff5518..71bed8970725ce439ca4cec1d79a6200eaeea47b 100644 (file)
--- a/scheduler/client.h
+++ b/scheduler/client.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: client.h,v 1.17.2.16 2004/07/02 22:15:51 mike Exp $"
+ * "$Id: client.h,v 1.17.2.17 2004/08/23 18:01:56 mike Exp $"
  *
  *   Client definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -15,7 +15,7 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3142 USA
+ *       Hollywood, Maryland 20636 USA
  *
  *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
@@ -117,5 +117,5 @@ extern int  WriteClient(client_t *con);
 
 
 /*
- * End of "$Id: client.h,v 1.17.2.16 2004/07/02 22:15:51 mike Exp $".
+ * End of "$Id: client.h,v 1.17.2.17 2004/08/23 18:01:56 mike Exp $".
  */

diff --git a/scheduler/conf.c b/scheduler/conf.c
index baa51e77ce3d3297bcb823379cd6b7c5ce24ac26..a0ad7f4614deb008133b13931333710496e9d9ad 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: conf.c,v 1.77.2.60 2004/08/19 12:46:28 mike Exp $"
+ * "$Id: conf.c,v 1.77.2.61 2004/08/23 18:01:56 mike Exp $"
  *
  *   Configuration routines for the Common UNIX Printing System (CUPS).
  *
@@ -15,7 +15,7 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3142 USA
+ *       Hollywood, Maryland 20636 USA
  *
  *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
@@ -2912,5 +2912,5 @@ CDSAGetServerCerts(void)
 
 
 /*
- * End of "$Id: conf.c,v 1.77.2.60 2004/08/19 12:46:28 mike Exp $".
+ * End of "$Id: conf.c,v 1.77.2.61 2004/08/23 18:01:56 mike Exp $".
  */

diff --git a/scheduler/conf.h b/scheduler/conf.h
index 521b9e27cdd17cac659ed0f85879310dd04e3a69..31df6a1b04fd457ce17b6b3ddc1563032039b75c 100644 (file)
--- a/scheduler/conf.h
+++ b/scheduler/conf.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: conf.h,v 1.36.2.24 2004/08/19 12:46:28 mike Exp $"
+ * "$Id: conf.h,v 1.36.2.25 2004/08/23 18:01:56 mike Exp $"
  *
  *   Configuration file definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
@@ -16,7 +16,7 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3142 USA
+ *       Hollywood, Maryland 20636 USA
  *
  *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
@@ -96,8 +96,6 @@ VAR char              *SystemGroups[MAX_SYSTEM_GROUPS],
                                        /* GUI program to use for IRIX */
                        *FontPath               VALUE(NULL),
                                        /* Font search path */
-                       *ReloadTimeout          VALUE(0),
-                                       /* Timeout before reload from SIGHUP */
                        *RemoteRoot             VALUE(NULL),
                                        /* Remote root user */
                        *Classification         VALUE(NULL);
@@ -148,6 +146,8 @@ VAR int                     ClassifyOverride        VALUE(0),
                                        /* Current filter level */
                        FilterNice              VALUE(0),
                                        /* Nice value for filters */
+                       ReloadTimeout           VALUE(0),
+                                       /* Timeout before reload from SIGHUP */
                        RootCertDuration        VALUE(300),
                                        /* Root certificate update interval */
                        RunAsUser               VALUE(FALSE),
@@ -197,5 +197,5 @@ extern int  LogPage(job_t *job, const char *page);
 
 
 /*
- * End of "$Id: conf.h,v 1.36.2.24 2004/08/19 12:46:28 mike Exp $".
+ * End of "$Id: conf.h,v 1.36.2.25 2004/08/23 18:01:56 mike Exp $".
  */

diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h
index bbcfb186a6e860a98376022a327c3870b5196368..a74f03018bd6ea8c9a81f738e58fa53969d1eb6e 100644 (file)
--- a/scheduler/cupsd.h
+++ b/scheduler/cupsd.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupsd.h,v 1.28.2.25 2004/07/02 19:12:48 mike Exp $"
+ * "$Id: cupsd.h,v 1.28.2.26 2004/08/23 18:01:56 mike Exp $"
  *
  *   Main header file for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -15,7 +15,7 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3142 USA
+ *       Hollywood, Maryland 20636 USA
  *
  *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
@@ -211,5 +211,5 @@ extern void StopServer(void);
 
 
 /*
- * End of "$Id: cupsd.h,v 1.28.2.25 2004/07/02 19:12:48 mike Exp $".
+ * End of "$Id: cupsd.h,v 1.28.2.26 2004/08/23 18:01:56 mike Exp $".
  */

diff --git a/scheduler/dirsvc.h b/scheduler/dirsvc.h
index f6f9ff3e12f978a4af18f4bfb2ff669a001ae240..0bc7e3d39e5e17fcf53d9bbe70288a038dc3e5bc 100644 (file)
--- a/scheduler/dirsvc.h
+++ b/scheduler/dirsvc.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: dirsvc.h,v 1.12.2.11 2004/07/02 19:51:24 mike Exp $"
+ * "$Id: dirsvc.h,v 1.12.2.12 2004/08/23 18:01:56 mike Exp $"
  *
  *   Directory services definitions for the Common UNIX Printing System
  *   (CUPS) scheduler.
@@ -16,7 +16,7 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3142 USA
+ *       Hollywood, Maryland 20636 USA
  *
  *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
@@ -148,5 +148,5 @@ extern void UpdateSLPBrowse(void);
 
 
 /*
- * End of "$Id: dirsvc.h,v 1.12.2.11 2004/07/02 19:51:24 mike Exp $".
+ * End of "$Id: dirsvc.h,v 1.12.2.12 2004/08/23 18:01:56 mike Exp $".
  */

diff --git a/scheduler/file.h b/scheduler/file.h
index f3277b5af9d406487e525490684e342535bd329e..56367c2f7a76601e0a97bc52b60ed102034f8efb 100644 (file)
--- a/scheduler/file.h
+++ b/scheduler/file.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: file.h,v 1.1.2.4 2004/06/29 13:15:10 mike Exp $"
+ * "$Id: file.h,v 1.1.2.5 2004/08/23 18:01:56 mike Exp $"
  *
  *   File definitions for the Common UNIX Printing System (CUPS).
  *
@@ -20,7 +20,7 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3142 USA
+ *       Hollywood, Maryland 20636 USA
  *
  *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
@@ -104,5 +104,5 @@ extern int          cupsFileWrite(cups_file_t *fp, const char *buf, int bytes);
 #endif /* !_CUPS_FILE_H_ */
 
 /*
- * End of "$Id: file.h,v 1.1.2.4 2004/06/29 13:15:10 mike Exp $".
+ * End of "$Id: file.h,v 1.1.2.5 2004/08/23 18:01:56 mike Exp $".
  */

diff --git a/scheduler/job.h b/scheduler/job.h
index 5490f2cd33795e4bae22c6e8b35b652c910f6280..163ffbe9db3172da0d4853cb7dcd3d13c7dea135 100644 (file)
--- a/scheduler/job.h
+++ b/scheduler/job.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: job.h,v 1.25.2.14 2004/07/02 19:12:48 mike Exp $"
+ * "$Id: job.h,v 1.25.2.15 2004/08/23 18:01:56 mike Exp $"
  *
  *   Print job definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -15,7 +15,7 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3142 USA
+ *       Hollywood, Maryland 20636 USA
  *
  *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
@@ -111,5 +111,5 @@ extern void UpdateJob(job_t *job);
 
 
 /*
- * End of "$Id: job.h,v 1.25.2.14 2004/07/02 19:12:48 mike Exp $".
+ * End of "$Id: job.h,v 1.25.2.15 2004/08/23 18:01:56 mike Exp $".
  */

diff --git a/scheduler/main.c b/scheduler/main.c
index 9b27f2d9214e77a6f0da05ed102006ca0ce567a9..889530a6440ee616463c453c39c1cd55e0a7bef7 100644 (file)
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: main.c,v 1.57.2.65 2004/08/19 12:46:28 mike Exp $"
+ * "$Id: main.c,v 1.57.2.66 2004/08/23 18:01:56 mike Exp $"
  *
  *   Scheduler main loop for the Common UNIX Printing System (CUPS).
  *
@@ -15,7 +15,7 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3142 USA
+ *       Hollywood, Maryland 20636 USA
  *
  *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
@@ -491,11 +491,11 @@ main(int  argc,                           /* I - Number of command-line arguments */
 
      /*
       * Restart if all clients are closed and all jobs finished, or
-      * if 60 seconds has elapsed...
+      * if the reload timeout has elapsed...
       */
 
       if ((NumClients == 0 && (!job || NeedReload != RELOAD_ALL)) ||
-          (time(NULL) - ReloadTime) >= ReloadTime)
+          (time(NULL) - ReloadTime) >= ReloadTimeout)
       {
         if (!ReadConfiguration())
         {
@@ -1211,7 +1211,7 @@ select_timeout(int fds)                   /* I - Number of ready descriptors select returned */
   */
 
   now     = time(NULL);
-  timeout = 2147483647;
+  timeout = now + 86400;               /* 86400 == 1 day */
   why     = "do nothing";
 
  /*
@@ -1301,23 +1301,16 @@ select_timeout(int fds)                 /* I - Number of ready descriptors select returned */
   }
 
  /*
-  * Adjust the timeout as needed...
+  * Adjust from absolute to relative time.  If p->browse_time above
+  * was 0 then we can end up with a negative value here, so check.
+  * We add 1 second to the timeout since events occur after the
+  * timeout expires...
   */
 
-  if (timeout != 2147483647)
-  {
-   /*
-    * Adjust from absolute to relative time.  If p->browse_time above
-    * was 0 then we can end up with a negative value here, so check.
-    * We add 1 second to the timeout since events occur after the
-    * timeout expires...
-    */
+  timeout = timeout - now + 1;
 
-    timeout = timeout - now + 1;
-
-    if (timeout < 1)
-      timeout = 1;
-  }
+  if (timeout < 1)
+    timeout = 1;
 
  /*
   * Log and return the timeout value...
@@ -1342,5 +1335,5 @@ usage(void)
 
 
 /*
- * End of "$Id: main.c,v 1.57.2.65 2004/08/19 12:46:28 mike Exp $".
+ * End of "$Id: main.c,v 1.57.2.66 2004/08/23 18:01:56 mike Exp $".
  */

diff --git a/scheduler/mime.h b/scheduler/mime.h
index f87c99a20b3775ccb7d9b72806d3fbc7707dac67..029c770fcd3aad35a06205054f8ba6dc6f0f8bff 100644 (file)
--- a/scheduler/mime.h
+++ b/scheduler/mime.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: mime.h,v 1.3.2.9 2004/06/29 13:15:11 mike Exp $"
+ * "$Id: mime.h,v 1.3.2.10 2004/08/23 18:01:56 mike Exp $"
  *
  *   MIME type/conversion database definitions for the Common UNIX Printing System (CUPS).
  *
@@ -15,7 +15,7 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3142 USA
+ *       Hollywood, Maryland 20636 USA
  *
  *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
@@ -143,5 +143,5 @@ extern mime_filter_t        *mimeFilter(mime_t *mime, mime_type_t *src, mime_type_t *ds
 #endif /* !_CUPS_MIME_H_ */
 
 /*
- * End of "$Id: mime.h,v 1.3.2.9 2004/06/29 13:15:11 mike Exp $".
+ * End of "$Id: mime.h,v 1.3.2.10 2004/08/23 18:01:56 mike Exp $".
  */

diff --git a/scheduler/network.h b/scheduler/network.h
index 31302d411f016c25ad3deb2cca7a79e6c24add1b..7d10cbedd34f75e9a5c66b7c3970302a4e122a1d 100644 (file)
--- a/scheduler/network.h
+++ b/scheduler/network.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: network.h,v 1.1.2.4 2004/08/18 17:49:19 mike Exp $"
+ * "$Id: network.h,v 1.1.2.5 2004/08/23 18:01:56 mike Exp $"
  *
  *   Network interface definitions for the Common UNIX Printing System
  *   (CUPS) scheduler.
@@ -16,7 +16,7 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3142 USA
+ *       Hollywood, Maryland 20636 USA
  *
  *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
@@ -60,5 +60,5 @@ extern void           NetIFUpdate(void);
 
 
 /*
- * End of "$Id: network.h,v 1.1.2.4 2004/08/18 17:49:19 mike Exp $".
+ * End of "$Id: network.h,v 1.1.2.5 2004/08/23 18:01:56 mike Exp $".
  */

diff --git a/scheduler/notify.h b/scheduler/notify.h
index 304dbb36fa94104eab5bec89cae9130b59750137..948a6737364f99b7977327ed38bb500735b427cc 100644 (file)
--- a/scheduler/notify.h
+++ b/scheduler/notify.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: notify.h,v 1.1.2.1 2004/07/02 19:12:48 mike Exp $"
+ * "$Id: notify.h,v 1.1.2.2 2004/08/23 18:01:56 mike Exp $"
  *
  *   Notification definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
@@ -16,7 +16,7 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3142 USA
+ *       Hollywood, Maryland 20636 USA
  *
  *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
@@ -133,5 +133,5 @@ VAR cupsd_subscription_t *Subscriptions     VALUE(NULL),
 
 
 /*
- * End of "$Id: notify.h,v 1.1.2.1 2004/07/02 19:12:48 mike Exp $".
+ * End of "$Id: notify.h,v 1.1.2.2 2004/08/23 18:01:56 mike Exp $".
  */

diff --git a/scheduler/policy.h b/scheduler/policy.h
index eef0c03abd6681cc7ede5a3b50e1e0f127ae98ec..1abc6d3b2dacddbe2bf75eacdf8651774a101bfe 100644 (file)
--- a/scheduler/policy.h
+++ b/scheduler/policy.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: policy.h,v 1.1.2.8 2004/06/30 18:24:18 mike Exp $"
+ * "$Id: policy.h,v 1.1.2.9 2004/08/23 18:01:56 mike Exp $"
  *
  *   Policy definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
@@ -16,7 +16,7 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3142 USA
+ *       Hollywood, Maryland 20636 USA
  *
  *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
@@ -92,5 +92,5 @@ extern policyop_t     *FindPolicyOp(policy_t *p, ipp_op_t op);
 
 
 /*
- * End of "$Id: policy.h,v 1.1.2.8 2004/06/30 18:24:18 mike Exp $".
+ * End of "$Id: policy.h,v 1.1.2.9 2004/08/23 18:01:56 mike Exp $".
  */

diff --git a/scheduler/printers.h b/scheduler/printers.h
index 5dfd5ed906008d895b0ce68be73198f2daa10800..482cce9b1c2bdc6d9e9c11ae48823360bb7374ae 100644 (file)
--- a/scheduler/printers.h
+++ b/scheduler/printers.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.h,v 1.22.2.19 2004/06/30 18:24:18 mike Exp $"
+ * "$Id: printers.h,v 1.22.2.20 2004/08/23 18:01:56 mike Exp $"
  *
  *   Printer definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -15,7 +15,7 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3142 USA
+ *       Hollywood, Maryland 20636 USA
  *
  *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
@@ -137,5 +137,5 @@ extern void         WritePrintcap(void);
 
 
 /*
- * End of "$Id: printers.h,v 1.22.2.19 2004/06/30 18:24:18 mike Exp $".
+ * End of "$Id: printers.h,v 1.22.2.20 2004/08/23 18:01:56 mike Exp $".
  */

diff --git a/scheduler/statbuf.h b/scheduler/statbuf.h
index 5a11d5f63f04a68a48242ef0b81a34683d72d469..c6c7784364fac06d285b59cc1bc3be1885e8abe9 100644 (file)
--- a/scheduler/statbuf.h
+++ b/scheduler/statbuf.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: statbuf.h,v 1.1.2.1 2004/07/02 19:12:48 mike Exp $"
+ * "$Id: statbuf.h,v 1.1.2.2 2004/08/23 18:01:56 mike Exp $"
  *
  *   Status buffer definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
@@ -16,7 +16,7 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3142 USA
+ *       Hollywood, Maryland 20636 USA
  *
  *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
@@ -55,5 +55,5 @@ extern char           *cupsdStatBufUpdate(cupsd_statbuf_t *sb, int *loglevel,
 
 
 /*
- * End of "$Id: statbuf.h,v 1.1.2.1 2004/07/02 19:12:48 mike Exp $".
+ * End of "$Id: statbuf.h,v 1.1.2.2 2004/08/23 18:01:56 mike Exp $".
  */