Merge changes from CUPS 1.4svn-r7961.

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

diff --git a/scheduler/conf.h b/scheduler/conf.h
index d5c483cc44120f11385b7030255b00e9048ab7b9..e53f13f44aeb6e7f2a2bc3d2388271445786550f 100644 (file)
--- a/scheduler/conf.h
+++ b/scheduler/conf.h
@@ -1,10 +1,10 @@
 /*
- * "$Id: conf.h 7674 2008-06-18 23:18:32Z mike $"
+ * "$Id: conf.h 7935 2008-09-11 01:54:11Z mike $"
  *
  *   Configuration file definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2008 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -37,6 +37,26 @@ typedef enum
   CUPSD_LOG_DEBUG2                     /* Detailed debugging */
 } cupsd_loglevel_t;
 
+typedef enum
+{
+  CUPSD_ACCESSLOG_CONFIG,              /* Log config requests */
+  CUPSD_ACCESSLOG_ACTIONS,             /* Log config, print, and job management requests */
+  CUPSD_ACCESSLOG_ALL                  /* Log everything */
+} cupsd_accesslog_t;
+
+
+/*
+ * FatalErrors flags...
+ */
+
+#define CUPSD_FATAL_NONE       0       /* No errors are fatal */
+#define CUPSD_FATAL_BROWSE     1       /* Browse bind errors are fatal */
+#define CUPSD_FATAL_CONFIG     2       /* Config file syntax errors are fatal */
+#define CUPSD_FATAL_LISTEN     4       /* Listen/Port bind errors are fatal */
+#define CUPSD_FATAL_LOG                8       /* Log file errors are fatal */
+#define CUPSD_FATAL_PERMISSIONS        16      /* File permission errors are fatal */
+#define CUPSD_FATAL_ALL                ~0      /* All errors are fatal */
+
 
 /*
  * Printcap formats...
@@ -46,6 +66,14 @@ typedef enum
 #define PRINTCAP_SOLARIS       1       /* Solaris lpsched format */
 
 
+/*
+ * SSL options (bits)...
+ */
+
+#define CUPSD_SSL_NONE         0       /* No special options */
+#define CUPSD_SSL_NOEMPTY      1       /* Do not insert empty fragments */
+
+
 /*
  * Globals...
  */
@@ -91,6 +119,8 @@ VAR char             *AccessLog              VALUE(NULL),
                                        /* Default charset */
                        *DefaultLocale          VALUE(NULL),
                                        /* Default locale */
+                       *DefaultPaperSize       VALUE(NULL),
+                                       /* Default paper size */
                        *ErrorPolicy            VALUE(NULL),
                                        /* Default printer-error-policy */
                        *RIPCache               VALUE(NULL),
@@ -117,14 +147,18 @@ VAR uid_t         User                    VALUE(1);
                                        /* User ID for server */
 VAR gid_t              Group                   VALUE(0);
                                        /* Group ID for server */
-VAR int                        ClassifyOverride        VALUE(0),
+VAR int                        AccessLogLevel          VALUE(CUPSD_ACCESSLOG_ACTIONS),
+                                       /* Access log level */
+                       ClassifyOverride        VALUE(0),
                                        /* Allow overrides? */
                        ConfigFilePerm          VALUE(0640),
                                        /* Permissions for config files */
+                       FatalErrors             VALUE(CUPSD_FATAL_CONFIG),
+                                       /* Which errors are fatal? */
                        LogFilePerm             VALUE(0644),
                                        /* Permissions for log files */
-                       LogLevel                VALUE(CUPSD_LOG_ERROR),
-                                       /* Log level */
+                       LogLevel                VALUE(CUPSD_LOG_WARN),
+                                       /* Error log level */
                        MaxClients              VALUE(0),
                                        /* Maximum number of clients */
                        MaxClientsPerHost       VALUE(0),
@@ -159,7 +193,7 @@ VAR int                     ClassifyOverride        VALUE(0),
                                        /* Current filter level */
                        FilterNice              VALUE(0),
                                        /* Nice value for filters */
-                       ReloadTimeout           VALUE(0),
+                       ReloadTimeout           VALUE(DEFAULT_KEEPALIVE),
                                        /* Timeout before reload from SIGHUP */
                        RootCertDuration        VALUE(300),
                                        /* Root certificate update interval */
@@ -191,10 +225,12 @@ VAR char          *ServerCertificate      VALUE(NULL);
 VAR char               *ServerKey              VALUE(NULL);
                                        /* Server key file */
 #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
+VAR int                        SSLOptions              VALUE(CUPSD_SSL_NONE);
+                                       /* SSL/TLS options */
 #endif /* HAVE_SSL */
 
 #ifdef HAVE_LAUNCHD
-VAR int                        LaunchdTimeout          VALUE(DEFAULT_TIMEOUT);
+VAR int                        LaunchdTimeout          VALUE(DEFAULT_KEEPALIVE);
                                        /* Time after which an idle cupsd will exit */
 VAR char               *LaunchdConf            VALUE(NULL);
                                        /* launchd(8) configuration file */
@@ -242,5 +278,5 @@ extern int  cupsdWriteErrorLog(int level, const char *message);
 
 
 /*
- * End of "$Id: conf.h 7674 2008-06-18 23:18:32Z mike $".
+ * End of "$Id: conf.h 7935 2008-09-11 01:54:11Z mike $".
  */