diff options
| -rw-r--r-- | CHANGES-2.0.txt | 2 | ||||
| -rw-r--r-- | conf/cups-files.conf.in | 7 | ||||
| -rw-r--r-- | config-scripts/cups-ssl.m4 | 11 |
3 files changed, 8 insertions, 12 deletions
diff --git a/CHANGES-2.0.txt b/CHANGES-2.0.txt index dc8d9491c..bd44c4e77 100644 --- a/CHANGES-2.0.txt +++ b/CHANGES-2.0.txt @@ -13,6 +13,8 @@ CHANGES IN CUPS V2.0.2 values. - The scheduler incorrectly aborted jobs after a job was restarted (<rdar://problem/19129387>) + - The cups-files.conf file contained the old ServerCertificate/Key + directives instead of ServerKeychain. CHANGES IN CUPS V2.0.1 diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in index 71683a654..4a78ba615 100644 --- a/conf/cups-files.conf.in +++ b/conf/cups-files.conf.in @@ -75,11 +75,8 @@ PageLog @CUPS_LOGDIR@/page_log # Location of helper programs... #ServerBin @CUPS_SERVERBIN@ -# SSL/TLS certificate for the scheduler... -#ServerCertificate @CUPS_SERVERCERT@ - -# SSL/TLS private key for the scheduler... -#ServerKey @CUPS_SERVERKEY@ +# SSL/TLS keychain for the scheduler... +#ServerKeychain @CUPS_SERVERKEYCHAIN@ # Location of other configuration files... #ServerRoot @CUPS_SERVERROOT@ diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4 index b27880bf5..f5f8d6405 100644 --- a/config-scripts/cups-ssl.m4 +++ b/config-scripts/cups-ssl.m4 @@ -20,8 +20,7 @@ AC_ARG_ENABLE(gnutls, [ --enable-gnutls use GNU TLS for SSL/TLS support SSLFLAGS="" SSLLIBS="" have_ssl=0 -CUPS_SERVERCERT="" -CUPS_SERVERKEY="" +CUPS_SERVERKEYCHAIN="" if test x$enable_ssl != xno; then dnl Look for CDSA... @@ -31,7 +30,7 @@ if test x$enable_ssl != xno; then have_ssl=1 AC_DEFINE(HAVE_SSL) AC_DEFINE(HAVE_CDSASSL) - CUPS_SERVERCERT="/Library/Keychains/System.keychain" + CUPS_SERVERKEYCHAIN="/Library/Keychains/System.keychain" dnl Check for the various security headers... AC_CHECK_HEADER(Security/SecureTransportPriv.h, @@ -76,8 +75,7 @@ if test x$enable_ssl != xno; then fi if test $have_ssl = 1; then - CUPS_SERVERCERT="ssl/server.crt" - CUPS_SERVERKEY="ssl/server.key" + CUPS_SERVERKEYCHAIN="ssl" SAVELIBS="$LIBS" LIBS="$LIBS $SSLLIBS" @@ -97,8 +95,7 @@ elif test x$enable_cdsa = xyes -o x$enable_gnutls = xyes; then AC_MSG_ERROR([Unable to enable SSL support.]) fi -AC_SUBST(CUPS_SERVERCERT) -AC_SUBST(CUPS_SERVERKEY) +AC_SUBST(CUPS_SERVERKEYCHAIN) AC_SUBST(IPPALIASES) AC_SUBST(SSLFLAGS) AC_SUBST(SSLLIBS) |