License change: Apache License, Version 2.0.

[thirdparty/cups.git] / vcnet / config.h

diff --git a/vcnet/config.h b/vcnet/config.h
index 2ded18ba21d8d7663782575631b4de3dd65045c2..bf7a4cd725e313eb89834c3f87c933559771e06f 100644 (file)
--- a/vcnet/config.h
+++ b/vcnet/config.h
@@ -1,14 +1,10 @@
 /*
  * Configuration file for CUPS on Windows.
  *
- * Copyright 2007-2016 by Apple Inc.
+ * Copyright 2007-2017 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products.
  *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
  */
 
 #ifndef _CUPS_CONFIG_H_
@@ -94,8 +90,8 @@ typedef unsigned long useconds_t;
  * Version of software...
  */
 
-#define CUPS_SVERSION "CUPS v2.2"
-#define CUPS_MINIMAL "CUPS/2.2"
+#define CUPS_SVERSION "CUPS v2.3.0"
+#define CUPS_MINIMAL "CUPS/2.3.0"
 
 
 /*
@@ -106,13 +102,14 @@ typedef unsigned long useconds_t;
 #define CUPS_DEFAULT_GROUP     ""
 #define CUPS_DEFAULT_SYSTEM_GROUPS ""
 #define CUPS_DEFAULT_PRINTOPERATOR_AUTH ""
+#define CUPS_DEFAULT_SYSTEM_AUTHKEY ""
 
 
 /*
  * Default file permissions...
  */
 
-#define CUPS_DEFAULT_CONFIG_FILE_PERM 0640
+#define CUPS_DEFAULT_CONFIG_FILE_PERM 0644
 #define CUPS_DEFAULT_LOG_FILE_PERM 0644
 
 
@@ -121,7 +118,7 @@ typedef unsigned long useconds_t;
  */
 
 #define CUPS_DEFAULT_LOG_LEVEL "warn"
-#define CUPS_DEFAULT_ACCESS_LOG_LEVEL "actions"
+#define CUPS_DEFAULT_ACCESS_LOG_LEVEL "none"
 
 
 /*
@@ -136,7 +133,7 @@ typedef unsigned long useconds_t;
  */
 
 #define CUPS_DEFAULT_BROWSING 1
-#define CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS ""
+#define CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS "dnssd"
 #define CUPS_DEFAULT_DEFAULT_SHARED 1
 
 
@@ -180,7 +177,7 @@ typedef unsigned long useconds_t;
  * Default WebInterface value...
  */
 
-#undef CUPS_DEFAULT_WEBIF
+#define CUPS_DEFAULT_WEBIF 0
 
 
 /*
@@ -315,6 +312,13 @@ typedef unsigned long useconds_t;
 /* #undef HAVE_VSYSLOG */
 
 
+/*
+ * Do we have the systemd journal functions?
+ */
+
+/* #undef HAVE_SYSTEMD_SD_JOURNAL_H */
+
+
 /*
  * Do we have the (v)snprintf() functions?
  */
@@ -367,8 +371,8 @@ typedef unsigned long useconds_t;
 
 /* #undef HAVE_CDSASSL */
 /* #undef HAVE_GNUTLS */
-#define HAVE_SSPISSL
-#define HAVE_SSL
+#define HAVE_SSPISSL 1
+#define HAVE_SSL 1
 
 
 /*
@@ -421,6 +425,13 @@ typedef unsigned long useconds_t;
 /* #undef HAVE_SECKEYCHAINOPEN */
 
 
+/*
+ * Do we have (a working) SSLSetEnabledCiphers function?
+ */
+
+#define HAVE_SSLSETENABLEDCIPHERS 1
+
+
 /*
  * Do we have libpaper?
  */
@@ -533,6 +544,13 @@ typedef unsigned long useconds_t;
 /* #undef HAVE_PTHREAD_H */
 
 
+/*
+ * Do we have on-demand support (launchd/systemd/upstart)?
+ */
+
+/* #undef HAVE_ONDEMAND */
+
+
 /*
  * Do we have launchd support?
  */
@@ -549,17 +567,10 @@ typedef unsigned long useconds_t;
 
 
 /*
- * Various scripting languages...
+ * Do we have upstart support?
  */
 
-/* #undef HAVE_JAVA */
-#define CUPS_JAVA      ""
-/* #undef HAVE_PERL */
-#define CUPS_PERL      ""
-/* #undef HAVE_PHP */
-#define CUPS_PHP       ""
-/* #undef HAVE_PYTHON */
-#define CUPS_PYTHON    ""
+/* #undef HAVE_UPSTART */
 
 
 /*
@@ -692,7 +703,7 @@ typedef unsigned long useconds_t;
 
 #ifdef HAVE_ARC4RANDOM
 #  define CUPS_RAND() arc4random()
-#  define CUPS_SRAND(v) arc4random_stir()
+#  define CUPS_SRAND(v)
 #elif defined(HAVE_RANDOM)
 #  define CUPS_RAND() random()
 #  define CUPS_SRAND(v) srandom(v)
@@ -705,13 +716,6 @@ typedef unsigned long useconds_t;
 #endif /* HAVE_ARC4RANDOM */
 
 
-/*
- * Do we have vproc_transaction_begin/end?
- */
-
-/* #undef HAVE_VPROC_TRANSACTION_BEGIN */
-
-
 /*
  * Do we have libusb?
  */
@@ -784,10 +788,4 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
 #  endif /* __GNUC__ || __STDC_VERSION__ */
 #endif /* !HAVE_ABS && !abs */
 
-#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD) || defined(HAVE_UPSTART)
-#  define HAVE_ONDEMAND
-#else
-#  undef HAVE_ONDEMAND
-#endif
-
 #endif /* !_CUPS_CONFIG_H_ */