diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-09-10 22:30:50 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-09-10 22:30:50 +0000 |
| commit | 49d8745278805ede5c41bae3c299e14ba40457bf (patch) | |
| tree | 875bed78b8cff9d470bff3bf1feffcd8fdb4e869 /scheduler/conf.h | |
| parent | c5571a1d68de6e20e127c9745aa7a4dbf4e4474d (diff) | |
| download | cups-49d8745278805ede5c41bae3c299e14ba40457bf.tar.gz | |
Merge changes from CUPS 1.4svn-r7932.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@957 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler/conf.h')
| -rw-r--r-- | scheduler/conf.h | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/scheduler/conf.h b/scheduler/conf.h index 1b3765bd4..e80a24ea9 100644 --- a/scheduler/conf.h +++ b/scheduler/conf.h @@ -46,6 +46,19 @@ typedef enum /* + * 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 */ |