Tidying: coverity issues

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 3a887c1519927d6b64318712b17b09175bed6366..3d12988e8969ce5aa1fd4451e87541e6cdbbeafe 100644 (file)
--- 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. */
 
 /* If the host is required to use a secure channel, ensure that we
 have one. */
 

-else if (
+else if (  smtps

 # ifdef EXPERIMENTAL_DANE
 # ifdef EXPERIMENTAL_DANE

-       dane ||
+       || dane

 # endif
 # 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",
        )
   {
   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*/
   goto TLS_FAILED;
   }
 #endif /*SUPPORT_TLS*/