/*
- * "$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-2008 by Apple Inc.
+ * Copyright 2007-2009 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
CUPSD_ACCESSLOG_ALL /* Log everything */
} cupsd_accesslog_t;
+typedef enum
+{
+ CUPSD_TIME_STANDARD, /* "Standard" Apache/CLF format */
+ CUPSD_TIME_USECS /* Standard format with microseconds */
+} cupsd_time_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...
#define PRINTCAP_BSD 0 /* Berkeley LPD format */
#define PRINTCAP_SOLARIS 1 /* Solaris lpsched format */
+#define PRINTCAP_PLIST 2 /* Mac OS X plist format */
+
+
+/*
+ * SSL options (bits)...
+ */
+
+#define CUPSD_SSL_NONE 0 /* No special options */
+#define CUPSD_SSL_NOEMPTY 1 /* Do not insert empty fragments */
/*
/* Directory for request files */
*DocumentRoot VALUE(NULL);
/* Root directory for documents */
-VAR int ServerNameIsIP VALUE(0);
+VAR int RemoteAccessEnabled VALUE(0),
+ /* Are we listening on non-local addresses? */
+ ServerNameIsIP VALUE(0);
+ /* Is the ServerName an IP address? */
VAR int NumSystemGroups VALUE(0);
/* Number of system group names */
VAR char *SystemGroups[MAX_SYSTEM_GROUPS]
/* Default charset */
*DefaultLocale VALUE(NULL),
/* Default locale */
+ *DefaultPaperSize VALUE(NULL),
+ /* Default paper size */
*ErrorPolicy VALUE(NULL),
/* Default printer-error-policy */
*RIPCache VALUE(NULL),
/* User ID for server */
VAR gid_t Group VALUE(0);
/* Group ID for server */
-VAR int AccessLogLevel VALUE(CUPSD_ACCESSLOG_ACTIONS),
+VAR cupsd_accesslog_t AccessLogLevel VALUE(CUPSD_ACCESSLOG_ACTIONS);
/* Access log level */
- ClassifyOverride VALUE(0),
+VAR int ClassifyOverride VALUE(0),
/* Allow overrides? */
ConfigFilePerm VALUE(0640),
/* Permissions for config files */
- LogFilePerm VALUE(0644),
+ FatalErrors VALUE(CUPSD_FATAL_CONFIG),
+ /* Which errors are fatal? */
+ LogFilePerm VALUE(0644);
/* Permissions for log files */
- LogLevel VALUE(CUPSD_LOG_WARN),
+VAR cupsd_loglevel_t LogLevel VALUE(CUPSD_LOG_WARN);
/* Error log level */
- MaxClients VALUE(0),
+VAR cupsd_time_t LogTimeFormat VALUE(CUPSD_TIME_STANDARD);
+ /* Log file time format */
+VAR int MaxClients VALUE(100),
/* Maximum number of clients */
MaxClientsPerHost VALUE(0),
/* Maximum number of clients per host */
/* 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 */
/* User to run as, used for files */
PrintcapFormat VALUE(PRINTCAP_BSD),
/* Format of printcap file? */
- DefaultShared VALUE(TRUE);
+ DefaultShared VALUE(TRUE),
/* Share printers by default? */
+ MultipleOperationTimeout VALUE(DEFAULT_TIMEOUT);
+ /* multiple-operation-time-out value */
VAR cups_file_t *AccessFile VALUE(NULL),
/* Access log file */
*ErrorFile 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 */
const char *suffix, int mode,
int user, int group, int is_dir,
int create_dir);
-extern char *cupsdGetDateTime(time_t t);
+extern char *cupsdGetDateTime(struct timeval *t, cupsd_time_t format);
#ifdef HAVE_GSSAPI
extern int cupsdLogGSSMessage(int level, int major_status,
int minor_status,
/*
- * 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 $".
*/