License change: Apache License, Version 2.0.

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

diff --git a/scheduler/conf.h b/scheduler/conf.h
index 3cc8acb5e5d656ad17860b30766c935f636d5368..3a5fe105db73f2136aed50dd738581895e0172ae 100644 (file)
--- a/scheduler/conf.h
+++ b/scheduler/conf.h
@@ -1,16 +1,10 @@
 /*
- * "$Id$"
- *
  * Configuration file definitions for the CUPS scheduler.
  *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2016 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
  */
 
 
@@ -39,6 +33,7 @@ typedef enum
 
 typedef enum
 {
+  CUPSD_ACCESSLOG_NONE,                        /* Log no requests */
   CUPSD_ACCESSLOG_CONFIG,              /* Log config requests */
   CUPSD_ACCESSLOG_ACTIONS,             /* Log config, print, and job management requests */
   CUPSD_ACCESSLOG_ALL                  /* Log everything */
@@ -77,7 +72,7 @@ typedef enum
 
 #define PRINTCAP_BSD           0       /* Berkeley LPD format */
 #define PRINTCAP_SOLARIS       1       /* Solaris lpsched format */
-#define PRINTCAP_PLIST         2       /* OS X plist format */
+#define PRINTCAP_PLIST         2       /* macOS plist format */
 
 
 /*
@@ -181,6 +176,8 @@ VAR cupsd_loglevel_t        LogLevel                VALUE(CUPSD_LOG_WARN);
                                        /* Error log level */
 VAR cupsd_time_t       LogTimeFormat           VALUE(CUPSD_TIME_STANDARD);
                                        /* Log file time format */
+VAR cups_file_t                *LogStderr              VALUE(NULL);
+                                       /* Stderr file, if any */
 VAR cupsd_sandboxing_t Sandboxing              VALUE(CUPSD_SANDBOXING_STRICT);
                                        /* Sandboxing level */
 VAR int                        UseSandboxing   VALUE(1);
@@ -239,14 +236,16 @@ VAR const char            **MimeTypes             VALUE(NULL);
                                        /* Array of MIME types */
 
 #ifdef HAVE_SSL
+VAR int                        CreateSelfSignedCerts   VALUE(TRUE);
+                                       /* Automatically create self-signed certs? */
 VAR char               *ServerKeychain         VALUE(NULL);
                                        /* Keychain holding cert + key */
 #endif /* HAVE_SSL */
 
-#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
+#ifdef HAVE_ONDEMAND
 VAR int                        IdleExitTimeout         VALUE(60);
                                        /* Time after which an idle cupsd will exit */
-#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
+#endif /* HAVE_ONDEMAND */
 
 #ifdef HAVE_AUTHORIZATION_H
 VAR char               *SystemGroupAuthKey     VALUE(NULL);
@@ -256,9 +255,9 @@ VAR char            *SystemGroupAuthKey     VALUE(NULL);
 #ifdef HAVE_GSSAPI
 VAR char               *GSSServiceName         VALUE(NULL);
                                        /* GSS service name */
-int                    HaveServerCreds         VALUE(0);
+VAR int                        HaveServerCreds         VALUE(0);
                                        /* Do we have server credentials? */
-gss_cred_id_t          ServerCreds;    /* Server's GSS credentials */
+VAR gss_cred_id_t      ServerCreds;    /* Server's GSS credentials */
 #endif /* HAVE_GSSAPI */
 
 
@@ -294,8 +293,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);
 extern int     cupsdWriteErrorLog(int level, const char *message);
-
-
-/*
- * End of "$Id$".
- */