Commit aa3fa3f0 authored by Sandrine Avakian's avatar Sandrine Avakian
Browse files

Merge branch 'master' into socket_api

* master:
  Fix nsswitch.conf parsing error.
parents 2f42800e d95f3f9f
......@@ -5310,7 +5310,7 @@ int dns_nssconf_loadfile(struct dns_resolv_conf *resconf, FILE *fp) {
if ('[' == dns_anyconf_peek(fp)) {
dns_anyconf_skip("[ \t", fp);
while (dns_anyconf_scan(&cf, "%w_", fp, &error)) {
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 */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment