diff options
| author |   sthen <sthen@openbsd.org> | 2018-09-17 09:46:12 +0000 |
|---|---|---|
| committer | sthen <sthen@openbsd.org> | 2018-09-17 09:46:12 +0000 |
| commit | 20237c5596ac37c947fe7dc6b504ad5cf4d698eb (patch) | |
| tree | 658beab9d39c73edf6089912574577fe1e0a9a55 /usr.sbin/unbound/iterator/iter_hints.c | |
| parent | import unbound 1.7.3, testing from benno@ and Brad. (diff) | |
| download | wireguard-openbsd-20237c5596ac37c947fe7dc6b504ad5cf4d698eb.tar.xz wireguard-openbsd-20237c5596ac37c947fe7dc6b504ad5cf4d698eb.zip | |
merge conflicts
Diffstat (limited to 'usr.sbin/unbound/iterator/iter_hints.c')
| -rw-r--r-- | usr.sbin/unbound/iterator/iter_hints.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/unbound/iterator/iter_hints.c b/usr.sbin/unbound/iterator/iter_hints.c index 1d4c228fabc..e8d09338e97 100644 --- a/usr.sbin/unbound/iterator/iter_hints.c +++ b/usr.sbin/unbound/iterator/iter_hints.c @@ -244,14 +244,16 @@ read_stubs_addr(struct config_stub* s, struct delegpt* dp) struct config_strlist* p; struct sockaddr_storage addr; socklen_t addrlen; + char* auth_name; for(p = s->addrs; p; p = p->next) { log_assert(p->str); - if(!extstrtoaddr(p->str, &addr, &addrlen)) { + if(!authextstrtoaddr(p->str, &addr, &addrlen, &auth_name)) { log_err("cannot parse stub %s ip address: '%s'", s->name, p->str); return 0; } - if(!delegpt_add_addr_mlc(dp, &addr, addrlen, 0, 0)) { + if(!delegpt_add_addr_mlc(dp, &addr, addrlen, 0, 0, + auth_name)) { log_err("out of memory"); return 0; } |