picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Lennart Poettering 2018-02-27 17:46:00 +01:00
parent 27d8af3e39
commit 9f0454a833
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/resolve/resolve-tool.c
View 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)