STR #3461: Don't allow GNU TLS to be used when threading is enabled.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@9145 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.4.txt b/CHANGES-1.4.txt
index b58c52908ae82e1f8ece30b5aa79de10388b3297..66d5812db4467aeae55e09bea78b75f6a61e7743 100644 (file)
--- a/CHANGES-1.4.txt
+++ b/CHANGES-1.4.txt
@@ -11,7 +11,8 @@ CHANGES IN CUPS V1.4.4
        - Fixed some IPP conformance issues with the scheduler's
          ippget-event-life, operations-supported, output-bin, and sides
          attributes (STR #3554)
-       - The GNU TLS and OpenSSL interfaces have been made thread-safe
+       - The OpenSSL interfaces have been made thread-safe and the GNU TLS
+         interface is explicitly forbidden when threading is enabled
          (STR #3461)
        - Fixed an IPP conformance issue with the scheduler's Send-Document
          implementation (STR #3514)

diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4
index 417c44eac08e955a8e54066a0060f13ba28d5541..c7382563aa861811a9980745cdb7ca61f68746f8 100644 (file)
--- a/config-scripts/cups-ssl.m4
+++ b/config-scripts/cups-ssl.m4
@@ -84,6 +84,10 @@ if test x$enable_ssl != xno; then
                SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`"
                SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`"
            fi
+
+           if test "x$have_pthread" = xyes; then
+                   AC_MSG_ERROR([The current version of GNU TLS cannot be made thread-safe.])
+           fi
        fi
     fi
 

diff --git a/configure.in b/configure.in
index 57be21356bdc348c7259ceb2c046cfd16b4b88be..09b044eb793dcfc08670083f18fce730417494d8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -31,9 +31,9 @@ sinclude(config-scripts/cups-poll.m4)
 sinclude(config-scripts/cups-slp.m4)
 sinclude(config-scripts/cups-gssapi.m4)
 sinclude(config-scripts/cups-ldap.m4)
+sinclude(config-scripts/cups-threads.m4)
 sinclude(config-scripts/cups-ssl.m4)
 sinclude(config-scripts/cups-pam.m4)
-sinclude(config-scripts/cups-threads.m4)
 sinclude(config-scripts/cups-largefile.m4)
 sinclude(config-scripts/cups-dnssd.m4)
 sinclude(config-scripts/cups-launchd.m4)