Import CUPS v1.7.1

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

diff --git a/scheduler/conf.h b/scheduler/conf.h
index 41232d9075dc957b8fad5b1fdaf9c0b616ed422d..485383e4c36476a7e99c2f98eb48fa508691b859 100644 (file)
--- a/scheduler/conf.h
+++ b/scheduler/conf.h
@@ -1,9 +1,9 @@
 /*
- * "$Id: conf.h 7935 2008-09-11 01:54:11Z mike $"
+ * "$Id: conf.h 11202 2013-07-26 21:31:54Z msweet $"
  *
  *   Configuration file definitions for the CUPS scheduler.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -20,9 +20,10 @@
 
 typedef enum
 {
-  CUPSD_LOG_PPD = -4,                  /* Used internally for PPD keywords */
+  CUPSD_LOG_PPD = -5,                  /* Used internally for PPD keywords */
   CUPSD_LOG_ATTR,                      /* Used internally for attributes */
-  CUPSD_LOG_STATE,                     /* Used internally for state-reasons */
+  CUPSD_LOG_STATE,                     /* Used internally for printer-state-reasons */
+  CUPSD_LOG_JOBSTATE,                  /* Used internally for job-state-reasons */
   CUPSD_LOG_PAGE,                      /* Used internally for page logging */
   CUPSD_LOG_NONE,
   CUPSD_LOG_EMERG,                     /* Emergency issues */
@@ -69,7 +70,7 @@ typedef enum
 
 #define PRINTCAP_BSD           0       /* Berkeley LPD format */
 #define PRINTCAP_SOLARIS       1       /* Solaris lpsched format */
-#define PRINTCAP_PLIST         2       /* Mac OS X plist format */
+#define PRINTCAP_PLIST         2       /* OS X plist format */
 
 
 /*
@@ -96,7 +97,9 @@ typedef struct
  */
 
 VAR char               *ConfigurationFile      VALUE(NULL),
-                                       /* Configuration file to use */
+                                       /* cupsd.conf file to use */
+                       *CupsFilesFile          VALUE(NULL),
+                                       /* cups-files.conf file to use */
                        *ServerName             VALUE(NULL),
                                        /* FQDN for server */
                        *ServerAdmin            VALUE(NULL),
@@ -147,8 +150,6 @@ VAR char            *AccessLog              VALUE(NULL),
                                        /* Temporary directory */
                        *Printcap               VALUE(NULL),
                                        /* Printcap file */
-                       *PrintcapGUI            VALUE(NULL),
-                                       /* GUI program to use for IRIX */
                        *FontPath               VALUE(NULL),
                                        /* Font search path */
                        *RemoteRoot             VALUE(NULL),
@@ -169,6 +170,10 @@ VAR int                    ClassifyOverride        VALUE(0),
                                        /* Amount of automatic debug history */
                        FatalErrors             VALUE(CUPSD_FATAL_CONFIG),
                                        /* Which errors are fatal? */
+                       StrictConformance       VALUE(FALSE),
+                                       /* Require strict IPP conformance? */
+                       SyncOnClose             VALUE(FALSE),
+                                       /* Call fsync() when closing files? */
                        LogFilePerm             VALUE(0644);
                                        /* Permissions for log files */
 VAR cupsd_loglevel_t   LogLevel                VALUE(CUPSD_LOG_WARN);
@@ -292,5 +297,5 @@ extern int  cupsdWriteErrorLog(int level, const char *message);
 
 
 /*
- * End of "$Id: conf.h 7935 2008-09-11 01:54:11Z mike $".
+ * End of "$Id: conf.h 11202 2013-07-26 21:31:54Z msweet $".
  */