Merge changes from CUPS 1.6svn-r9968.

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

diff --git a/scheduler/conf.h b/scheduler/conf.h
index d91bca359c7f2b259cade45e460ae26ea66e07dd..a68c31d3bc98d819de1f378825f838e65e6cfab8 100644 (file)
--- a/scheduler/conf.h
+++ b/scheduler/conf.h
@@ -1,10 +1,9 @@
 /*
  * "$Id: conf.h 7935 2008-09-11 01:54:11Z mike $"
  *
- *   Configuration file definitions for the Common UNIX Printing System (CUPS)
- *   scheduler.
+ *   Configuration file definitions for the CUPS scheduler.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -114,9 +113,7 @@ VAR char            *ConfigurationFile      VALUE(NULL),
                                        /* Root directory for documents */
 VAR cups_array_t       *ServerAlias            VALUE(NULL);
                                        /* Alias names for server */
-VAR int                        RemoteAccessEnabled     VALUE(0),
-                                       /* Are we listening on non-local addresses? */
-                       ServerNameIsIP          VALUE(0);
+VAR int                        ServerNameIsIP          VALUE(0);
                                        /* Is the ServerName an IP address? */
 VAR int                        NumSystemGroups         VALUE(0);
                                        /* Number of system group names */
@@ -138,8 +135,6 @@ VAR char            *AccessLog              VALUE(NULL),
                                        /* Data file directory */
                        *DefaultLanguage        VALUE(NULL),
                                        /* Default language encoding */
-                       *DefaultCharset         VALUE(NULL),
-                                       /* Default charset */
                        *DefaultLocale          VALUE(NULL),
                                        /* Default locale */
                        *DefaultPaperSize       VALUE(NULL),
@@ -170,6 +165,8 @@ VAR int                     ClassifyOverride        VALUE(0),
                                        /* Allow overrides? */
                        ConfigFilePerm          VALUE(0640),
                                        /* Permissions for config files */
+                       LogDebugHistory         VALUE(200),
+                                       /* Amount of automatic debug history */
                        FatalErrors             VALUE(CUPSD_FATAL_CONFIG),
                                        /* Which errors are fatal? */
                        LogFilePerm             VALUE(0644);
@@ -186,8 +183,6 @@ VAR int                     MaxClients              VALUE(100),
                                        /* Maximum number of copies per job */
                        MaxLogSize              VALUE(1024 * 1024),
                                        /* Maximum size of log files */
-                       MaxPrinterHistory       VALUE(10),
-                                       /* Maximum printer state history */
                        MaxRequestSize          VALUE(0),
                                        /* Maximum size of IPP requests */
                        HostNameLookups         VALUE(FALSE),
@@ -222,8 +217,10 @@ VAR int                    MaxClients              VALUE(100),
                                        /* Format of printcap file? */
                        DefaultShared           VALUE(TRUE),
                                        /* Share printers by default? */
-                       MultipleOperationTimeout VALUE(DEFAULT_TIMEOUT);
+                       MultipleOperationTimeout VALUE(DEFAULT_TIMEOUT),
                                        /* multiple-operation-time-out value */
+                       WebInterface            VALUE(CUPS_DEFAULT_WEBIF);
+                                       /* Enable the web interface? */
 VAR cups_file_t                *AccessFile             VALUE(NULL),
                                        /* Access log file */
                        *ErrorFile              VALUE(NULL),
@@ -253,15 +250,8 @@ VAR int                    SSLOptions              VALUE(CUPSD_SSL_NONE);
 #ifdef HAVE_LAUNCHD
 VAR int                        LaunchdTimeout          VALUE(DEFAULT_KEEPALIVE);
                                        /* Time after which an idle cupsd will exit */
-VAR char               *LaunchdConf            VALUE(NULL);
-                                       /* launchd(8) configuration file */
 #endif /* HAVE_LAUNCHD */
 
-#ifdef __APPLE__
-VAR int                        AppleQuotas             VALUE(TRUE);
-                                       /* Use Apple PrintService Quotas instead of CUPS quotas */
-#endif  /* __APPLE__ */
-
 #ifdef HAVE_AUTHORIZATION_H
 VAR char               *SystemGroupAuthKey     VALUE(NULL);
                                        /* System group auth key */
@@ -273,27 +263,25 @@ VAR char          *SystemGroupAuthKey     VALUE(NULL);
  */
 
 extern void    cupsdAddAlias(cups_array_t *aliases, const char *name);
+extern int     cupsdCheckLogFile(cups_file_t **lf, const char *logname);
 extern int     cupsdCheckPermissions(const char *filename,
                                      const char *suffix, int mode,
                                      int user, int group, int is_dir,
                                      int create_dir);
+extern int     cupsdCheckProgram(const char *filename, cupsd_printer_t *p);
 extern void    cupsdFreeAliases(cups_array_t *aliases);
 extern char    *cupsdGetDateTime(struct timeval *t, cupsd_time_t format);
+extern void    cupsdLogFCMessage(void *context, _cups_fc_result_t result,
+                                 const char *message);
 #ifdef HAVE_GSSAPI
 extern int     cupsdLogGSSMessage(int level, int major_status,
                                   int minor_status,
                                   const char *message, ...);
 #endif /* HAVE_GSSAPI */
-extern int     cupsdLogJob(cupsd_job_t *job, int level, const char *message, ...)
-#ifdef __GNUC__
-__attribute__ ((__format__ (__printf__, 3, 4)))
-#endif /* __GNUC__ */
-;
+extern int     cupsdLogJob(cupsd_job_t *job, int level, const char *message,
+                           ...) __attribute__((__format__(__printf__, 3, 4)));
 extern int     cupsdLogMessage(int level, const char *message, ...)
-#ifdef __GNUC__
-__attribute__ ((__format__ (__printf__, 2, 3)))
-#endif /* __GNUC__ */
-;
+               __attribute__ ((__format__ (__printf__, 2, 3)));
 extern int     cupsdLogPage(cupsd_job_t *job, const char *page);
 extern int     cupsdLogRequest(cupsd_client_t *con, http_status_t code);
 extern int     cupsdReadConfiguration(void);