Apply changes from 1.7 branch; still need to migrate the SSPI code to the new

TLS infrastructure.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11762 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/cups/tls-sspi.c b/cups/tls-sspi.c
index 0e5431f55c182b98d993aa3fa9f4211080a6fbd7..00242f9e997b9763c0f10b117013dd890b3e6b58 100644 (file)
--- a/cups/tls-sspi.c
+++ b/cups/tls-sspi.c
@@ -545,11 +545,11 @@ http_setup_ssl(http_t *http)              /* I - Connection to server */
   _sntprintf_s(commonName, sizeof(commonName) / sizeof(TCHAR),
                sizeof(commonName) / sizeof(TCHAR), TEXT("CN=%s"), username);
 
-  if (!_sspiGetCredentials(http->tls_credentials, L"ClientContainer",
+  if (!_sspiGetCredentials(http->tls, L"ClientContainer",
                            commonName, FALSE))
   {
-    _sspiFree(http->tls_credentials);
-    http->tls_credentials = NULL;
+    _sspiFree(http->tls);
+    http->tls = NULL;
 
     http->error  = EIO;
     http->status = HTTP_STATUS_ERROR;
@@ -560,13 +560,13 @@ http_setup_ssl(http_t *http)              /* I - Connection to server */
     return (-1);
   }
 
-  _sspiSetAllowsAnyRoot(http->tls_credentials, TRUE);
-  _sspiSetAllowsExpiredCerts(http->tls_credentials, TRUE);
+  _sspiSetAllowsAnyRoot(http->tls, TRUE);
+  _sspiSetAllowsExpiredCerts(http->tls, TRUE);
 
-  if (!_sspiConnect(http->tls_credentials, hostname))
+  if (!_sspiConnect(http->tls, hostname))
   {
-    _sspiFree(http->tls_credentials);
-    http->tls_credentials = NULL;
+    _sspiFree(http->tls);
+    http->tls = NULL;
 
     http->error  = EIO;
     http->status = HTTP_STATUS_ERROR;
@@ -619,7 +619,7 @@ http_shutdown_ssl(http_t *http)             /* I - Connection to server */
     CFRelease(http->tls_credentials);
 
 #  elif defined(HAVE_SSPISSL)
-  _sspiFree(http->tls_credentials);
+  _sspiFree(http->tls);
 #  endif /* HAVE_LIBSSL */
 
   http->tls             = NULL;