Merge changes from CUPS 1.4svn-r7874.

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

diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h
index a6340be4c10d03266d5e97de68545ea6334afd86..b4304ce830ab4d79a4d8ed877ace89507d978806 100644 (file)
--- a/scheduler/cupsd.h
+++ b/scheduler/cupsd.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupsd.h 6875 2007-08-27 23:25:06Z mike $"
+ * "$Id: cupsd.h 7317 2008-02-15 22:29:27Z mike $"
  *
  *   Main header file for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -154,15 +154,19 @@ typedef void (*cupsd_selfunc_t)(void *data);
 
 VAR int                        TestConfigFile  VALUE(0);
                                        /* Test the cupsd.conf file? */
-VAR int                        MaxFDs;         /* Maximum number of files */
+VAR int                        MaxFDs          VALUE(0);
+                                       /* Maximum number of files */
 
 VAR time_t             ReloadTime      VALUE(0);
                                        /* Time of reload request... */
 VAR int                        NeedReload      VALUE(RELOAD_ALL);
                                        /* Need to load configuration? */
+VAR void               *DefaultProfile VALUE(0);
+                                       /* Default security profile */
 
 #ifdef HAVE_GSSAPI
-VAR krb5_context       KerberosContext;/* Kerberos context for credentials */
+VAR krb5_context       KerberosContext VALUE(NULL);
+                                       /* Kerberos context for credentials */
 #endif /* HAVE_GSSAPI */
 
 #ifdef HAVE_LAUNCH_H
@@ -208,12 +212,14 @@ __attribute__ ((__format__ (__printf__, 2, 3)))
 #endif /* __GNUC__ */
 ;
 
+extern void    *cupsdCreateProfile(int job_id);
+extern void    cupsdDestroyProfile(void *profile);
 extern int     cupsdEndProcess(int pid, int force);
 extern const char *cupsdFinishProcess(int pid, char *name, int namelen);
 extern int     cupsdStartProcess(const char *command, char *argv[],
                                  char *envp[], int infd, int outfd,
                                  int errfd, int backfd, int sidefd,
-                                 int root, int *pid);
+                                 int root, void *profile, int *pid);
 
 extern int     cupsdAddSelect(int fd, cupsd_selfunc_t read_cb,
                               cupsd_selfunc_t write_cb, void *data);
@@ -228,5 +234,5 @@ extern void cupsdStopSelect(void);
 extern int     cupsdRemoveFile(const char *filename);
 
 /*
- * End of "$Id: cupsd.h 6875 2007-08-27 23:25:06Z mike $".
+ * End of "$Id: cupsd.h 7317 2008-02-15 22:29:27Z mike $".
  */