Import CUPS 1.4svn r7023 into easysw/current.

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

diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h
index 9337f86bd67c19a2c7627c678d052c0868d89010..a6340be4c10d03266d5e97de68545ea6334afd86 100644 (file)
--- a/scheduler/cupsd.h
+++ b/scheduler/cupsd.h
@@ -1,25 +1,16 @@
 /*
- * "$Id: cupsd.h 6376 2007-03-21 06:39:10Z mike $"
+ * "$Id: cupsd.h 6875 2007-08-27 23:25:06Z mike $"
  *
  *   Main header file for the Common UNIX Printing System (CUPS) scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 
@@ -161,12 +152,19 @@ typedef void (*cupsd_selfunc_t)(void *data);
  * Globals...
  */
 
+VAR int                        TestConfigFile  VALUE(0);
+                                       /* Test the cupsd.conf file? */
 VAR int                        MaxFDs;         /* Maximum number of files */
 
 VAR time_t             ReloadTime      VALUE(0);
                                        /* Time of reload request... */
 VAR int                        NeedReload      VALUE(RELOAD_ALL);
                                        /* Need to load configuration? */
+
+#ifdef HAVE_GSSAPI
+VAR krb5_context       KerberosContext;/* Kerberos context for credentials */
+#endif /* HAVE_GSSAPI */
+
 #ifdef HAVE_LAUNCH_H
 VAR int                        Launchd         VALUE(0);
                                        /* Running from launchd */
@@ -227,7 +225,8 @@ extern void cupsdRemoveSelect(int fd);
 extern void    cupsdStartSelect(void);
 extern void    cupsdStopSelect(void);
 
+extern int     cupsdRemoveFile(const char *filename);
 
 /*
- * End of "$Id: cupsd.h 6376 2007-03-21 06:39:10Z mike $".
+ * End of "$Id: cupsd.h 6875 2007-08-27 23:25:06Z mike $".
  */