From 27d8af3e3975dccf2d9fd2ba6029079a70bb6e1c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 27 Feb 2018 17:45:04 +0100 Subject: resolve-tool: trivial coding style improvements --- src/resolve/resolve-tool.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/resolve/resolve-tool.c b/src/resolve/resolve-tool.c index 2a6bf94070f..0b446a341ba 100644 --- a/src/resolve/resolve-tool.c +++ b/src/resolve/resolve-tool.c @@ -88,7 +88,7 @@ static char *arg_set_dnssec = NULL; static char **arg_set_nta = NULL; static ServiceFamily service_family_from_string(const char *s) { - if (s == NULL || streq(s, "tcp")) + if (!s || streq(s, "tcp")) return SERVICE_FAMILY_TCP; if (streq(s, "udp")) return SERVICE_FAMILY_UDP; @@ -1940,12 +1940,10 @@ static int parse_argv(int argc, char *argv[]) { arg_family = AF_INET6; break; - case 'i': { - int ifi; + case 'i': + if (parse_ifindex(optarg, &arg_ifindex) < 0) { + int ifi; - if (parse_ifindex(optarg, &ifi) >= 0) - arg_ifindex = ifi; - else { ifi = if_nametoindex(optarg); if (ifi <= 0) return log_error_errno(errno, "Unknown interface %s: %m", optarg); @@ -1954,7 +1952,6 @@ static int parse_argv(int argc, char *argv[]) { } break; - } case 't': if (streq(optarg, "help")) { @@ -2415,7 +2412,6 @@ int main(int argc, char **argv) { break; - case MODE_SET_LINK: if (argc > optind) { log_error("Too many arguments."); -- cgit v1.2.3-59-g8ed1b From 9f0454a833c3a0894d5f18154f0fbd5ef713af07 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 27 Feb 2018 17:46:00 +0100 Subject: resolve-tool: propagate sensible errors from due to dns_name_is_valid() check failures --- src/resolve/resolve-tool.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/resolve/resolve-tool.c b/src/resolve/resolve-tool.c index 0b446a341ba..d4aac244be9 100644 --- a/src/resolve/resolve-tool.c +++ b/src/resolve/resolve-tool.c @@ -2131,8 +2131,10 @@ static int parse_argv(int argc, char *argv[]) { r = dns_name_is_valid(p); if (r < 0) return log_error_errno(r, "Failed to validate specified domain %s: %m", p); - if (r == 0) - return log_error_errno(r, "Domain not valid: %s", p); + if (r == 0) { + log_error("Domain not valid: %s", p); + return -EINVAL; + } r = strv_extend(&arg_set_domain, optarg); if (r < 0) @@ -2170,8 +2172,10 @@ static int parse_argv(int argc, char *argv[]) { r = dns_name_is_valid(optarg); if (r < 0) return log_error_errno(r, "Failed to validate specified domain %s: %m", optarg); - if (r == 0) - return log_error_errno(r, "Domain not valid: %s", optarg); + if (r == 0) { + log_error("Domain not valid: %s", optarg); + return -EINVAL; + } r = strv_extend(&arg_set_nta, optarg); if (r < 0) -- cgit v1.2.3-59-g8ed1b From e40ec7de3afa966cb27172b8def7aba19eaf56fe Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 28 Feb 2018 10:53:27 +0100 Subject: man: extend synopsys to recently added commands --- man/systemd-resolve.xml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/man/systemd-resolve.xml b/man/systemd-resolve.xml index f9240905535..fd5e35954a4 100644 --- a/man/systemd-resolve.xml +++ b/man/systemd-resolve.xml @@ -104,6 +104,36 @@ --reset-statistics + + systemd-resolve + OPTIONS + --flush-caches + + + + systemd-resolve + OPTIONS + --reset-server-features + + + + systemd-resolve + OPTIONS + --status + + + + systemd-resolve + OPTIONS + --set-dns=SERVER --set-domain=DOMAIN --set-llmnr=MODE --set-mdns=MODE --set-dnssec=MODE --set-nta=DOMAIN + + + + systemd-resolve + OPTIONS + --revert + + -- cgit v1.2.3-59-g8ed1b From b351c300ee4b3f0cdd50fe3dc4eab9abd931b438 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 27 Feb 2018 17:47:00 +0100 Subject: resolved: debug log about resolv.conf lines we don't grok --- src/resolve/resolved-resolv-conf.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/resolve/resolved-resolv-conf.c b/src/resolve/resolved-resolv-conf.c index bad04d6a29d..c828e9201f7 100644 --- a/src/resolve/resolved-resolv-conf.c +++ b/src/resolve/resolved-resolv-conf.c @@ -68,6 +68,7 @@ int manager_read_resolv_conf(Manager *m) { _cleanup_fclose_ FILE *f = NULL; struct stat st; char line[LINE_MAX]; + unsigned n = 0; int r; assert(m); @@ -118,8 +119,10 @@ int manager_read_resolv_conf(Manager *m) { const char *a; char *l; + n++; + l = strstrip(line); - if (IN_SET(*l, '#', ';')) + if (IN_SET(*l, '#', ';', 0)) continue; a = first_word(l, "nameserver"); @@ -139,6 +142,8 @@ int manager_read_resolv_conf(Manager *m) { if (r < 0) log_warning_errno(r, "Failed to parse search domain string '%s', ignoring.", a); } + + log_syntax(NULL, LOG_DEBUG, "/etc/resolv.conf", n, 0, "Ignoring resolv.conf line: %s", l); } m->resolv_conf_mtime = timespec_load(&st.st_mtim); -- cgit v1.2.3-59-g8ed1b