chiark
/
gitweb
/
~ian
/
secnet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
af09048
)
iaddr_to_string: Do not falsely claim bad addrs are scoped IPv6
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 12 Oct 2019 11:41:37 +0000
(12:41 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 12 Oct 2019 22:29:26 +0000
(23:29 +0100)
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>
util.c
patch
|
blob
|
history
diff --git
a/util.c
b/util.c
index 4982c93c58e6ae84fa0d8edc1eefedd59156862a..2ce3ade37e1228b2effe9f84671dd1efdc0eb76d 100644
(file)
--- 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));