dma: defer delivery if STARTTLS fails

diff --git a/crypto.c b/crypto.c
index f96797ca32e74ba39d0e762a3a303d85a8576f4f..009de81190401e19a7fe230d44100d6e885a9ac3 100644 (file)
--- a/crypto.c
+++ b/crypto.c
@@ -120,7 +120,6 @@ smtp_init_crypto(int fd, int feature)
                        if (read_remote(fd, 0, NULL) != 2) {
                                syslog(LOG_ERR, "remote delivery deferred:"
                                  " STARTTLS not available: %s", neterr);
-                               config.features &= ~NOSSL;
                                return (1);
                        }
                }

diff --git a/net.c b/net.c
index f3f2c24c50e6c8d36ca982570856bc920b6c5835..e3c563dfd3c156a304b369eb679805d95e116054 100644 (file)
--- a/net.c
+++ b/net.c
@@ -352,7 +352,7 @@ deliver_to_host(struct qitem *it, struct mx_hostentry *host, void *errmsgc)
 
        if ((config.features & SECURETRANS) != 0) {
                error = smtp_init_crypto(fd, config.features);
-               if (error >= 0)
+               if (error == 0)
                        syslog(LOG_DEBUG, "SSL initialization successful");
                else
                        goto out;