Load cups into easysw/current.

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

diff --git a/scheduler/conf.h b/scheduler/conf.h
index 00e98bc63f04523dfce48df29c7cc6f95622d3b2..7b6eea95c057405a78de393bc5719bb2c53d9374 100644 (file)
--- a/scheduler/conf.h
+++ b/scheduler/conf.h
@@ -1,10 +1,10 @@
 /*
- * "$Id: conf.h 5020 2006-01-28 13:36:15Z mike $"
+ * "$Id: conf.h 5216 2006-03-02 17:47:53Z 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 */
@@ -160,8 +160,6 @@ VAR int                     ClassifyOverride        VALUE(0),
                                        /* Timeout before reload from SIGHUP */
                        RootCertDuration        VALUE(300),
                                        /* Root certificate update interval */
-                       RunAsUser               VALUE(FALSE),
-                                       /* Run as unpriviledged user? */
                        RunUser,        /* User to run as, used for files */
                        PrintcapFormat          VALUE(PRINTCAP_BSD),
                                        /* Format of printcap file? */
@@ -186,9 +184,6 @@ 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 */
 
@@ -215,5 +210,5 @@ extern int  cupsdLogPage(cupsd_job_t *job, const char *page);
 
 
 /*
- * End of "$Id: conf.h 5020 2006-01-28 13:36:15Z mike $".
+ * End of "$Id: conf.h 5216 2006-03-02 17:47:53Z mike $".
  */