On Sun, Dec 08, 2013 at 03:13:27PM +0100, Gilles Chehade wrote:
> reproduced, I'll have a fix shortly
> 

The following diff should fix your issue, can you confirm ?

diff --git a/smtpd/to.c b/smtpd/to.c
index 2ae2272..5ec44c3 100644
--- a/smtpd/to.c
+++ b/smtpd/to.c
@@ -414,9 +414,10 @@ relayhost_to_text(const struct relayhost *relay)
 {
        static char     buf[4096];
        char            port[4096];
+       uint16_t        mask = F_SMTPS|F_STARTTLS|F_AUTH|F_TLS_OPTIONAL|F_LMTP;
 
        bzero(buf, sizeof buf);
-       switch (relay->flags) {
+       switch (relay->flags & mask) {
        case F_SMTPS|F_STARTTLS|F_AUTH:
                strlcat(buf, "secure+auth://", sizeof buf);
                break;
@@ -429,18 +430,12 @@ relayhost_to_text(const struct relayhost *relay)
        case F_SMTPS|F_AUTH:
                strlcat(buf, "smtps+auth://", sizeof buf);
                break;
-       case F_STARTTLS|F_TLS_VERIFY:
-               strlcat(buf, "tls://", sizeof buf);
-               break;
        case F_STARTTLS:
                strlcat(buf, "tls://", sizeof buf);
                break;
        case F_SMTPS:
                strlcat(buf, "smtps://", sizeof buf);
                break;
-       case F_SMTPS|F_TLS_VERIFY:
-               strlcat(buf, "smtps://", sizeof buf);
-               break;
        case F_BACKUP:
                strlcat(buf, "backup://", sizeof buf);
                break;




-- 
Gilles Chehade

https://www.poolp.org                                          @poolpOrg

-- 
You received this mail because you are subscribed to misc@opensmtpd.org
To unsubscribe, send a mail to: misc+unsubscr...@opensmtpd.org

Reply via email to