Merge changes from CUPS 1.4svn-r7961.

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

diff --git a/scheduler/conf.h b/scheduler/conf.h
index e80a24ea996d0984b7fe8686a0792227542a95ab..e53f13f44aeb6e7f2a2bc3d2388271445786550f 100644 (file)
--- a/scheduler/conf.h
+++ b/scheduler/conf.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: conf.h 7674 2008-06-18 23:18:32Z mike $"
+ * "$Id: conf.h 7935 2008-09-11 01:54:11Z mike $"
  *
  *   Configuration file definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
@@ -66,6 +66,14 @@ typedef enum
 #define PRINTCAP_SOLARIS       1       /* Solaris lpsched format */
 
 
+/*
+ * SSL options (bits)...
+ */
+
+#define CUPSD_SSL_NONE         0       /* No special options */
+#define CUPSD_SSL_NOEMPTY      1       /* Do not insert empty fragments */
+
+
 /*
  * Globals...
  */
@@ -217,6 +225,8 @@ VAR char            *ServerCertificate      VALUE(NULL);
 VAR char               *ServerKey              VALUE(NULL);
                                        /* Server key file */
 #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
+VAR int                        SSLOptions              VALUE(CUPSD_SSL_NONE);
+                                       /* SSL/TLS options */
 #endif /* HAVE_SSL */
 
 #ifdef HAVE_LAUNCHD
@@ -268,5 +278,5 @@ extern int  cupsdWriteErrorLog(int level, const char *message);
 
 
 /*
- * End of "$Id: conf.h 7674 2008-06-18 23:18:32Z mike $".
+ * End of "$Id: conf.h 7935 2008-09-11 01:54:11Z mike $".
  */