revert the inet6 format diff, regression observed by florian@

3 files changed, 9 insertions, 33 deletions

diff --git a/usr.sbin/smtpd/envelope.c b/usr.sbin/smtpd/envelope.c
index df9021624cc..77c5bf1e847 100644
--- a/usr.sbin/smtpd/envelope.c
+++ b/usr.sbin/smtpd/envelope.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: envelope.c,v 1.44 2019/08/13 16:02:33 gilles Exp $	*/
+/*	$OpenBSD: envelope.c,v 1.45 2019/08/14 21:11:25 gilles Exp $	*/
 
 /*
  * Copyright (c) 2013 Eric Faurot <eric@openbsd.org>
@@ -297,21 +297,12 @@ ascii_load_sockaddr(struct sockaddr_storage *ss, char *buf)
 		ss->ss_family = AF_LOCAL;
 	}
 	else if (strncasecmp("IPv6:", buf, 5) == 0) {
-	  	/* XXX - remove this after 6.6 release */
 		if (inet_pton(AF_INET6, buf + 5, &ssin6.sin6_addr) != 1)
 			return 0;
 		ssin6.sin6_family = AF_INET6;
 		memcpy(ss, &ssin6, sizeof(ssin6));
 		ss->ss_len = sizeof(struct sockaddr_in6);
 	}
-	else if (buf[0] == '[' && buf[strlen(buf)-1] == ']') {
-		buf[strlen(buf)-1] = '\0';
-		if (inet_pton(AF_INET6, buf+1, &ssin6.sin6_addr) != 1)
-			return 0;
-		ssin6.sin6_family = AF_INET6;
-		memcpy(ss, &ssin6, sizeof(ssin6));
-		ss->ss_len = sizeof(struct sockaddr_in6);
-	}
 	else {
 		if (inet_pton(AF_INET, buf, &ssin.sin_addr) != 1)
 			return 0;
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index a92b11adaa6..a26bb0f7464 100644
--- a/usr.sbin/smtpd/smtp_session.c
+++ b/usr.sbin/smtpd/smtp_session.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtp_session.c,v 1.406 2019/08/13 16:02:33 gilles Exp $	*/
+/*	$OpenBSD: smtp_session.c,v 1.407 2019/08/14 21:11:25 gilles Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -283,22 +283,6 @@ static struct tree wait_ssl_verify;
 static struct tree wait_filters;
 static struct tree wait_filter_fd;
 
-static const char *
-ss_to_helo_text(const struct sockaddr_storage *ss)
-{
-  	static char	 buf[NI_MAXHOST + 5];
-	static char	 helobuf[NI_MAXHOST + 5];
-
-	(void)strlcpy(buf, ss_to_text(ss), sizeof buf);
-
-	if (buf[0] != '[')
-		return buf;
-	buf[strlen(buf)-1] = '\0';
-
-	(void)snprintf(helobuf, sizeof helobuf, "IPv6:%s", buf+1);
-	return helobuf;
-}
-
 static void
 header_append_domain_buffer(char *buffer, char *domain, size_t len)
 {
@@ -1748,7 +1732,7 @@ smtp_proceed_helo(struct smtp_session *s, const char *args)
 	smtp_reply(s, "250 %s Hello %s [%s], pleased to meet you",
 	    s->smtpname,
 	    s->helo,
-	    ss_to_helo_text(&s->ss));
+	    ss_to_text(&s->ss));
 }
 
 static void
@@ -1765,7 +1749,7 @@ smtp_proceed_ehlo(struct smtp_session *s, const char *args)
 	smtp_reply(s, "250-%s Hello %s [%s], pleased to meet you",
 	    s->smtpname,
 	    s->helo,
-	    ss_to_helo_text(&s->ss));
+	    ss_to_text(&s->ss));
 
 	smtp_reply(s, "250-8BITMIME");
 	smtp_reply(s, "250-ENHANCEDSTATUSCODES");
@@ -2835,7 +2819,7 @@ smtp_message_begin(struct smtp_tx *tx)
 		m_printf(tx, "from %s (%s [%s])",
 		    s->helo,
 		    s->rdns,
-		    ss_to_helo_text(&s->ss));
+		    ss_to_text(&s->ss));
 	}
 	m_printf(tx, "\n\tby %s (%s) with %sSMTP%s%s id %08x",
 	    s->smtpname,
diff --git a/usr.sbin/smtpd/to.c b/usr.sbin/smtpd/to.c
index dae61d1cc79..af08c603a42 100644
--- a/usr.sbin/smtpd/to.c
+++ b/usr.sbin/smtpd/to.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: to.c,v 1.40 2019/08/13 16:02:33 gilles Exp $	*/
+/*	$OpenBSD: to.c,v 1.41 2019/08/14 21:11:25 gilles Exp $	*/
 
 /*
  * Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -169,9 +169,10 @@ sa_to_text(const struct sockaddr *sa)
 		const struct in6_addr	*in6_addr;
 
 		in6 = (const struct sockaddr_in6 *)sa;
-		p = buf;
+		(void)strlcpy(buf, "IPv6:", sizeof(buf));
+		p = buf + 5;
 		in6_addr = &in6->sin6_addr;
-		(void)bsnprintf(p, NI_MAXHOST, "[%s]", in6addr_to_text(in6_addr));
+		(void)bsnprintf(p, NI_MAXHOST, "%s", in6addr_to_text(in6_addr));
 	}
 
 	return (buf);