From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 17 May 2016 21:16:37 +0000 (+0100)
Subject: Tidying: coverity issues
X-Git-Tag: exim-4_88_RC1~101
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b4b3528b6ffe0a1bd405893052f9ce0788e8d46b;p=exim.git

Tidying: coverity issues
---

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 3a887c151..3d12988e8 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -1889,17 +1889,17 @@ if (tls_out.active >= 0)
 /* If the host is required to use a secure channel, ensure that we
 have one. */
 
-else if (
+else if (  smtps
 # ifdef EXPERIMENTAL_DANE
-	dane ||
+	|| dane
 # endif
-        verify_check_given_host(&ob->hosts_require_tls, host) == OK
+        || verify_check_given_host(&ob->hosts_require_tls, host) == OK
 	)
   {
   save_errno = ERRNO_TLSREQUIRED;
   message = string_sprintf("a TLS session is required, but %s",
-    tls_offered? "an attempt to start TLS failed" :
-                 "the server did not offer TLS support");
+    tls_offered ? "an attempt to start TLS failed"
+		: "the server did not offer TLS support");
   goto TLS_FAILED;
   }
 #endif	/*SUPPORT_TLS*/