Merge changes from CUPS 1.4svn-r7932.

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

diff --git a/scheduler/conf.h b/scheduler/conf.h
index 1b3765bd44a3b621f0d279b5507e5768f7a87b2d..e80a24ea996d0984b7fe8686a0792227542a95ab 100644 (file)
--- a/scheduler/conf.h
+++ b/scheduler/conf.h
@@ -45,6 +45,19 @@ typedef enum
 } 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...
  */
@@ -132,6 +145,8 @@ VAR int                     AccessLogLevel          VALUE(CUPSD_ACCESSLOG_ACTIONS),
                                        /* 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_WARN),
@@ -170,7 +185,7 @@ VAR int                     AccessLogLevel          VALUE(CUPSD_ACCESSLOG_ACTIONS),
                                        /* 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 */
@@ -205,7 +220,7 @@ VAR char            *ServerKey              VALUE(NULL);
 #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 */