Merge changes from CUPS 1.5svn-r9525

[thirdparty/cups.git] / scheduler / client.c

diff --git a/scheduler/client.c b/scheduler/client.c
index 7239bdb837bb538d52ac2de25383be6fd2d9ea65..65ce4f25babffd975653a5478d13e839e92769f6 100644 (file)
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -3319,13 +3319,13 @@ encrypt_client(cupsd_client_t *con)     /* I - Client to encrypt */
   return (1);
 
 #  elif defined(HAVE_CDSASSL)
-  OSStatus     error;                  /* Error code */
+  OSStatus     error = 0;              /* Error code */
+  CFArrayRef   peerCerts;              /* Peer certificates */
 
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2, "encrypt_client(con=%p(%d))", con,
                   con->http.fd);
 
-  error                     = 0;
   con->http.tls_credentials = get_cdsa_certificate(con);
 
   if (!con->http.tls_credentials)
@@ -3404,9 +3404,7 @@ encrypt_client(cupsd_client_t *con)       /* I - Client to encrypt */
   cupsdLogMessage(CUPSD_LOG_DEBUG, "Connection from %s now encrypted.",
                   con->http.hostname);
 
-  CFArrayRef           peerCerts;      /* Peer certificates */
-
-  if (!(error = SSLCopyPeerCertificates(con->http.tls, &peerCerts)) && peerCerts)
+  if (!SSLCopyPeerCertificates(con->http.tls, &peerCerts) && peerCerts)
   {
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Received %d peer certificates!",
                    (int)CFArrayGetCount(peerCerts));
@@ -3468,15 +3466,17 @@ get_cdsa_certificate(
   servername = CFStringCreateWithCString(kCFAllocatorDefault, con->servername,
                                         kCFStringEncodingUTF8);
 
-  if ((policy = SecPolicyCreateSSL(1, servername)) == NULL)
+  policy = SecPolicyCreateSSL(1, servername);
+
+  if (servername)
+    CFRelease(servername);
+
+  if (!policy)
   {
     cupsdLogMessage(CUPSD_LOG_ERROR, "Cannot create ssl policy reference");
     goto cleanup;
   }
 
-  if (servername)
-    CFRelease(servername);
-
   if (!(query = CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
                                          &kCFTypeDictionaryKeyCallBacks,
                                          &kCFTypeDictionaryValueCallBacks)))
@@ -3510,15 +3510,17 @@ get_cdsa_certificate(
   
     CFRelease(policy);
 
-    if ((policy = SecPolicyCreateSSL(1, servername)) == NULL)
+    policy = SecPolicyCreateSSL(1, servername);
+
+    if (servername)
+      CFRelease(servername);
+
+    if (!policy)
     {
       cupsdLogMessage(CUPSD_LOG_ERROR, "Cannot create ssl policy reference");
       goto cleanup;
     }
 
-    if (servername)
-      CFRelease(servername);
-
     CFDictionarySetValue(query, kSecMatchPolicy, policy);
 
     err = SecItemCopyMatching(query, (CFTypeRef *)&identity);