]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
resolve-tool: propagate sensible errors from due to dns_name_is_valid() check failures
authorLennart Poettering <lennart@poettering.net>
Tue, 27 Feb 2018 16:46:00 +0000 (17:46 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 2 Mar 2018 11:43:12 +0000 (12:43 +0100)
src/resolve/resolve-tool.c

index 0b446a341baa07c5c52aaa442253e6222b143444..d4aac244be92d14a35b2a0dbeb1e8a2a5ac0d720 100644 (file)
@@ -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)