Merge changes from CUPS 1.5svn-r9717.

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

diff --git a/scheduler/conf.h b/scheduler/conf.h
index 052725cce11b2b03361c42a64bf7a1d610b08e6d..4d669027a67158b22f000c790062a3cf3430bafc 100644 (file)
--- a/scheduler/conf.h
+++ b/scheduler/conf.h
@@ -3,7 +3,7 @@
  *
  *   Configuration file definitions for the CUPS scheduler.
  *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -263,12 +263,16 @@ VAR char          *SystemGroupAuthKey     VALUE(NULL);
  */
 
 extern void    cupsdAddAlias(cups_array_t *aliases, const char *name);
+extern int     cupsdCheckLogFile(cups_file_t **lf, const char *logname);
 extern int     cupsdCheckPermissions(const char *filename,
                                      const char *suffix, int mode,
                                      int user, int group, int is_dir,
                                      int create_dir);
+extern int     cupsdCheckProgram(const char *filename, cupsd_printer_t *p);
 extern void    cupsdFreeAliases(cups_array_t *aliases);
 extern char    *cupsdGetDateTime(struct timeval *t, cupsd_time_t format);
+extern void    cupsdLogFCMessage(void *context, _cups_fc_result_t result,
+                                 const char *message);
 #ifdef HAVE_GSSAPI
 extern int     cupsdLogGSSMessage(int level, int major_status,
                                   int minor_status,