diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2018-06-14 06:10:57 +0200 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2018-06-14 06:10:57 +0200 |
| commit | 3e6ad302eaf3a4a9f3e60379133b3dfdbe0e1b2d (patch) | |
| tree | 05fb6161c5cc3234bf06bd9aee955227952197b6 /dirmngr/dns.c | |
| parent | dirmngr: Fix recursive resolver mode. (diff) | |
| download | gnupg2-3e6ad302eaf3a4a9f3e60379133b3dfdbe0e1b2d.tar.xz gnupg2-3e6ad302eaf3a4a9f3e60379133b3dfdbe0e1b2d.zip | |
libdns: Sync to upstream.
* dirmngr/dns.c (dns_nssconf_loadfile): Handle exclamation mark.
--
Reverting local change, merge upstream's debug-tracing branch.
(commit 21281fc1b63bb74d51762b8e363c49b1a258783d)
Fixes-commit: d4c0187dd93163f12e9f953366adef81ecf526a6
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'dirmngr/dns.c')
| -rw-r--r-- | dirmngr/dns.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/dirmngr/dns.c b/dirmngr/dns.c index 8e8b6db0b..13ef4b8fd 100644 --- a/dirmngr/dns.c +++ b/dirmngr/dns.c @@ -6096,17 +6096,9 @@ int dns_nssconf_loadfile(struct dns_resolv_conf *resconf, FILE *fp) { dns_anyconf_skip(" \t", fp); if ('[' == dns_anyconf_peek(fp)) { - dns_anyconf_skip("[ \t", fp); + dns_anyconf_skip("[! \t", fp); - for (;;) { - if ('!' == dns_anyconf_peek(fp)) { - dns_anyconf_skip("! \t", fp); - /* FIXME: negating statuses; currently not implemented */ - dns_anyconf_skip("^#;]\n", fp); /* skip to end of criteria */ - break; - } - - if (!dns_anyconf_scan(&cf, "%w_", fp, &error)) break; + while (dns_anyconf_scan(&cf, "%w_", fp, &error)) { dns_anyconf_skip("= \t", fp); if (!dns_anyconf_scan(&cf, "%w_", fp, &error)) { dns_anyconf_pop(&cf); /* discard status */ |