From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 12 Oct 2019 11:41:37 +0000 (+0100)
Subject: iaddr_to_string: Do not falsely claim bad addrs are scoped IPv6
X-Git-Tag: v0.5.0~112
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=commitdiff_plain;h=24333a4b2ec70bb1bdaa0ce0390b666092def4c1

iaddr_to_string: Do not falsely claim bad addrs are scoped IPv6

In particular, if the AF is neither INET nor INET6, adns_addr2text
quite rightly fails with EAFNOSUPPORT.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/util.c b/util.c
index 4982c93..2ce3ade 100644
--- a/util.c
+++ b/util.c
@@ -590,7 +590,7 @@ const char *iaddr_to_string(const union iaddr *ia)
 
     int r = adns_addr2text(&ia->sa, 0, addrbuf, &addrbuflen, &port);
     if (r) {
-	const char fmt[]= "scoped IPv6 addr, error: %.*s";
+	const char fmt[]= "bad addr, error: %.*s";
 	sprintf(addrbuf, fmt,
 		(int)(ADNS_ADDR2TEXT_BUFLEN - sizeof(fmt)) /* underestimate */,
 		strerror(r));