Load cups into easysw/current.

[thirdparty/cups.git] / scheduler / conf.h

diff --git a/scheduler/conf.h b/scheduler/conf.h
index 7f83f80da4dfd44bc58c3eed9c30038dd59a5ae2..ee151148cfe01c049612878a0d5c19ac9656a482 100644 (file)
--- a/scheduler/conf.h
+++ b/scheduler/conf.h
@@ -1,10 +1,10 @@
 /*
- * "$Id: conf.h 4988 2006-01-26 00:53:00Z mike $"
+ * "$Id: conf.h 5200 2006-02-28 00:10:32Z mike $"
  *
  *   Configuration file definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
  *
- *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -78,7 +78,7 @@ VAR int                       NumSystemGroups         VALUE(0);
                                        /* Number of system group names */
 VAR char               *SystemGroups[MAX_SYSTEM_GROUPS];
                                        /* System group names */
-VAR int                        SystemGroupIDs[MAX_SYSTEM_GROUPS];
+VAR gid_t              SystemGroupIDs[MAX_SYSTEM_GROUPS];
                                        /* System group IDs */
 VAR char               *AccessLog              VALUE(NULL),
                                        /* Access log filename */
@@ -186,12 +186,15 @@ VAR char          *ServerCertificate      VALUE(NULL);
 #  if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS)
 VAR char               *ServerKey              VALUE(NULL);
                                        /* Server key file */
-#  else
-VAR CFArrayRef         ServerCertificatesArray VALUE(NULL);
-                                       /* Array containing certificates */
 #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
 #endif /* HAVE_SSL */
 
+#ifdef HAVE_LAUNCHD
+VAR int                        LaunchdTimeout          VALUE(DEFAULT_TIMEOUT);
+                                       /* Time after which an idle cupsd will exit */
+VAR char               *LaunchdConf            VALUE(NULL);
+                                       /* launchd(8) configuration file */
+#endif /* HAVE_LAUNCHD */
 
 /*
  * Prototypes...
@@ -209,5 +212,5 @@ extern int  cupsdLogPage(cupsd_job_t *job, const char *page);
 
 
 /*
- * End of "$Id: conf.h 4988 2006-01-26 00:53:00Z mike $".
+ * End of "$Id: conf.h 5200 2006-02-28 00:10:32Z mike $".
  */