diff options
| author | Michael Sweet <michael.r.sweet@gmail.com> | 2016-11-18 09:14:06 -0500 |
|---|---|---|
| committer | Michael Sweet <michael.r.sweet@gmail.com> | 2016-11-18 09:14:06 -0500 |
| commit | 61b7ebde7c55ddb8883713c0a7ae170068f8a8fe (patch) | |
| tree | 40740e6813b63d406336b964411ebe1c01306d45 /vcnet | |
| parent | 5dcbe84df8f1a8d1d306b5f9c867096d5ed48ded (diff) | |
| download | cups-61b7ebde7c55ddb8883713c0a7ae170068f8a8fe.tar.gz | |
Bump version to 2.2.2, sync up IDE config.h files with the autoconf one.
Diffstat (limited to 'vcnet')
| -rw-r--r-- | vcnet/config.h | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/vcnet/config.h b/vcnet/config.h index 30c188e13..88da27f92 100644 --- a/vcnet/config.h +++ b/vcnet/config.h @@ -94,8 +94,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.2.2" +#define CUPS_MINIMAL "CUPS/2.2.2" /* @@ -106,13 +106,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 +122,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 +137,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 +181,7 @@ typedef unsigned long useconds_t; * Default WebInterface value... */ -#undef CUPS_DEFAULT_WEBIF +#define CUPS_DEFAULT_WEBIF 0 /* @@ -316,6 +317,13 @@ typedef unsigned long useconds_t; /* + * Do we have the systemd journal functions? + */ + +/* #undef HAVE_SYSTEMD_SD_JOURNAL_H */ + + +/* * Do we have the (v)snprintf() functions? */ @@ -367,8 +375,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 /* @@ -422,6 +430,13 @@ typedef unsigned long useconds_t; /* + * Do we have (a working) SSLSetEnabledCiphers function? + */ + +#define HAVE_SSLSETENABLEDCIPHERS 1 + + +/* * Do we have libpaper? */ @@ -706,7 +721,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) @@ -720,13 +735,6 @@ typedef unsigned long useconds_t; /* - * Do we have vproc_transaction_begin/end? - */ - -/* #undef HAVE_VPROC_TRANSACTION_BEGIN */ - - -/* * Do we have libusb? */ |