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

Merge pull request #8578 from yuwata/resolve-tool-cleanup 

resolve-tool: small cleanups
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-03-26 14:54:30 +02:00 committed by GitHub
parent 1238250f1d 79b20ad8e2
commit ea7a9e9e2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/resolve/resolve-tool.c
View File

@ -1454,11 +1454,6 @@ static int status_global(sd_bus *bus, bool *empty_line) {
goto finish;
}
if (strv_isempty(global_info.dns) && strv_isempty(global_info.domains) && strv_isempty(global_info.ntas)) {
r = 0;
goto finish;
}
(void) pager_open(arg_no_pager, false);
printf("%sGlobal%s\n", ansi_highlight(), ansi_normal());
@ -2421,11 +2416,11 @@ int main(int argc, char **argv) {
STRV_FOREACH(ifname, argv + optind) {
int ifindex, q;
q = parse_ifindex(argv[optind], &ifindex);
q = parse_ifindex(*ifname, &ifindex);
if (q < 0) {
ifindex = if_nametoindex(argv[optind]);
ifindex = if_nametoindex(*ifname);
if (ifindex <= 0) {
log_error_errno(errno, "Failed to resolve interface name: %s", argv[optind]);
log_error_errno(errno, "Failed to resolve interface name '%s': %m", *ifname);
continue;
}
}