security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

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: d4c0187dd9
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2018-06-14 13:10:57 +09:00
parent 5b40338f12
commit 3e6ad302ea
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dirmngr/dns.c
View File

@ -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 */