From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 27 Feb 2018 16:46:00 +0000 (+0100)
Subject: resolve-tool: propagate sensible errors from due to dns_name_is_valid() check failures
X-Git-Tag: v238~16^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f0454a833c3a0894d5f18154f0fbd5ef713af07;p=thirdparty%2Fsystemd.git

resolve-tool: propagate sensible errors from due to dns_name_is_valid() check failures
---

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)