From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Mon, 23 Aug 2004 18:01:56 +0000 (+0000)
Subject: Mirror 1.1.x changes.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bcd9e0194d378fbefb795048085e874a4507d95b;p=thirdparty%2Fcups.git

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 d960dccf8..2dd6a90e9 100644
--- 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 169b89729..23de06a1f 100644
--- 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 be347a140..2ef28726d 100644
--- 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 8a9de96bb..eb5682390 100644
--- 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 fc84e3ab3..ffd385345 100644
--- 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 cf1636376..71bed8970 100644
--- 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 baa51e77c..a0ad7f461 100644
--- 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 521b9e27c..31df6a1b0 100644
--- 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 bbcfb186a..a74f03018 100644
--- 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 f6f9ff3e1..0bc7e3d39 100644
--- 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 f3277b5af..56367c2f7 100644
--- 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 5490f2cd3..163ffbe9d 100644
--- 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 9b27f2d92..889530a64 100644
--- 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 f87c99a20..029c770fc 100644
--- 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 31302d411..7d10cbedd 100644
--- 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 304dbb36f..948a67373 100644
--- 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 eef0c03ab..1abc6d3b2 100644
--- 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 5dfd5ed90..482cce9b1 100644
--- 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 5a11d5f63..c6c778436 100644
--- 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 $".
  */