Merge changes from CUPS 1.4svn-r8628.

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

diff --git a/scheduler/conf.h b/scheduler/conf.h
index 8139c8b4801d886de75019bf1b5099aa7c313036..c30f97a5eac2ce785a82f771fec2f5443a5f1259 100644 (file)
--- a/scheduler/conf.h
+++ b/scheduler/conf.h
@@ -81,6 +81,17 @@ typedef enum
 #define CUPSD_SSL_NOEMPTY      1       /* Do not insert empty fragments */
 
 
+/*
+ * ServerAlias data...
+ */
+
+typedef struct
+{
+  size_t       namelen;                /* Length of alias name */
+  char         name[1];                /* Alias name */
+} cupsd_alias_t;
+
+
 /*
  * Globals...
  */
@@ -101,9 +112,9 @@ VAR char            *ConfigurationFile      VALUE(NULL),
                                        /* Directory for request files */
                        *DocumentRoot           VALUE(NULL);
                                        /* Root directory for documents */
-VAR int                        RemoteAccessEnabled     VALUE(0),
-                                       /* Are we listening on non-local addresses? */
-                       ServerNameIsIP          VALUE(0);
+VAR cups_array_t       *ServerAlias            VALUE(NULL);
+                                       /* Alias names for server */
+VAR int                        ServerNameIsIP          VALUE(0);
                                        /* Is the ServerName an IP address? */
 VAR int                        NumSystemGroups         VALUE(0);
                                        /* Number of system group names */
@@ -147,12 +158,6 @@ VAR char           *AccessLog              VALUE(NULL),
                                        /* Remote root user */
                        *Classification         VALUE(NULL);
                                        /* Classification of system */
-#ifdef HAVE_GSSAPI
-VAR char               *GSSServiceName         VALUE(NULL);
-                                       /* GSS service name */
-VAR char               *Krb5Keytab             VALUE(NULL);
-                                       /* Kerberos Keytab */
-#endif /* HAVE_GSSAPI */
 VAR uid_t              User                    VALUE(1);
                                        /* User ID for server */
 VAR gid_t              Group                   VALUE(0);
@@ -163,6 +168,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);
@@ -265,10 +272,12 @@ VAR char          *SystemGroupAuthKey     VALUE(NULL);
  * Prototypes...
  */
 
+extern void    cupsdAddAlias(cups_array_t *aliases, const char *name);
 extern int     cupsdCheckPermissions(const char *filename,
                                      const char *suffix, int mode,
                                      int user, int group, int is_dir,
                                      int create_dir);
+extern void    cupsdFreeAliases(cups_array_t *aliases);
 extern char    *cupsdGetDateTime(struct timeval *t, cupsd_time_t format);
 #ifdef HAVE_GSSAPI
 extern int     cupsdLogGSSMessage(int level, int major_status,