summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2016-05-17 22:16:37 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2016-05-17 22:27:54 +0100
commitb4b3528b6ffe0a1bd405893052f9ce0788e8d46b (patch)
tree91a7594ed3c5ecb38d201c84bfe3824c80b26db0
parent20b9a2dc027844f7288508d0f81df815110e4e69 (diff)
Tidying: coverity issues
-rw-r--r--src/src/transports/smtp.c10
1 files changed, 5 insertions, 5 deletions
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*/