diff options
Diffstat (limited to 'src/resolve/resolved-dns-trust-anchor.c')
| -rw-r--r-- | src/resolve/resolved-dns-trust-anchor.c | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/src/resolve/resolved-dns-trust-anchor.c b/src/resolve/resolved-dns-trust-anchor.c index 533e438fae..c5ec93b724 100644 --- a/src/resolve/resolved-dns-trust-anchor.c +++ b/src/resolve/resolved-dns-trust-anchor.c @@ -218,7 +218,10 @@ static int dns_trust_anchor_load_positive(DnsTrustAnchor *d, const char *path, u if (r < 0) return log_warning_errno(r, "Unable to parse domain in line %s:%u: %m", path, line); - if (!dns_name_is_valid(domain)) { + r = dns_name_is_valid(domain); + if (r < 0) + return log_warning_errno(r, "Failed to chack validity of domain name '%s', at line %s:%u, ignoring line: %m", domain, path, line); + if (r == 0) { log_warning("Domain name %s is invalid, at line %s:%u, ignoring line.", domain, path, line); return -EINVAL; } @@ -385,7 +388,10 @@ static int dns_trust_anchor_load_negative(DnsTrustAnchor *d, const char *path, u if (r < 0) return log_warning_errno(r, "Unable to parse line %s:%u: %m", path, line); - if (!dns_name_is_valid(domain)) { + r = dns_name_is_valid(domain); + if (r < 0) + return log_warning_errno(r, "Failed to chack validity of domain name '%s', at line %s:%u, ignoring line: %m", domain, path, line); + if (r == 0) { log_warning("Domain name %s is invalid, at line %s:%u, ignoring line.", domain, path, line); return -EINVAL; } @@ -427,7 +433,6 @@ static int dns_trust_anchor_load_files( STRV_FOREACH(f, files) { _cleanup_fclose_ FILE *g = NULL; - char line[LINE_MAX]; unsigned n = 0; g = fopen(*f, "r"); @@ -435,13 +440,22 @@ static int dns_trust_anchor_load_files( if (errno == ENOENT) continue; - log_warning_errno(errno, "Failed to open %s: %m", *f); + log_warning_errno(errno, "Failed to open '%s', ignoring: %m", *f); continue; } - FOREACH_LINE(line, g, log_warning_errno(errno, "Failed to read %s, ignoring: %m", *f)) { + for (;;) { + _cleanup_free_ char *line = NULL; char *l; + r = read_line(g, LONG_LINE_MAX, &line); + if (r < 0) { + log_warning_errno(r, "Failed to read '%s', ignoring: %m", *f); + break; + } + if (r == 0) + break; + n++; l = strstrip(line); @@ -458,10 +472,8 @@ static int dns_trust_anchor_load_files( return 0; } -static int domain_name_cmp(const void *a, const void *b) { - char **x = (char**) a, **y = (char**) b; - - return dns_name_compare_func(*x, *y); +static int domain_name_cmp(char * const *a, char * const *b) { + return dns_name_compare_func(*a, *b); } static int dns_trust_anchor_dump(DnsTrustAnchor *d) { @@ -491,7 +503,7 @@ static int dns_trust_anchor_dump(DnsTrustAnchor *d) { if (!l) return log_oom(); - qsort_safe(l, set_size(d->negative_by_name), sizeof(char*), domain_name_cmp); + typesafe_qsort(l, set_size(d->negative_by_name), domain_name_cmp); j = strv_join(l, " "); if (!j) |