diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-02-12 15:08:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-12 15:08:19 -0500 |
| commit | 179e679edd5c4456da5cf09c230941d620ed4c3a (patch) | |
| tree | 7eca1f0bef034d0992bae7871465dcf066a6acc4 /src/resolve/resolve-tool.c | |
| parent | 6818c54ca6663c008fad77d2677c61758c7215f5 (diff) | |
| parent | 12bf233175208d9250e44f5e4ec137d154b69a16 (diff) | |
Merge pull request #5276 from poettering/resolved-cname
a good number of resolved fixes
Diffstat (limited to 'src/resolve/resolve-tool.c')
| -rw-r--r-- | src/resolve/resolve-tool.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/resolve/resolve-tool.c b/src/resolve/resolve-tool.c index 07d9582ccb..13841c2b57 100644 --- a/src/resolve/resolve-tool.c +++ b/src/resolve/resolve-tool.c @@ -1186,6 +1186,7 @@ static int status_ifindex(sd_bus *bus, int ifindex, const char *name, bool *empt {} }; + _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_free_ char *ifi = NULL, *p = NULL; char ifname[IF_NAMESIZE] = ""; char **i; @@ -1213,9 +1214,10 @@ static int status_ifindex(sd_bus *bus, int ifindex, const char *name, bool *empt "org.freedesktop.resolve1", p, property_map, + &error, &link_info); if (r < 0) { - log_error_errno(r, "Failed to get link data for %i: %m", ifindex); + log_error_errno(r, "Failed to get link data for %i: %s", ifindex, bus_error_message(&error, r)); goto finish; } @@ -1405,6 +1407,7 @@ static int status_global(sd_bus *bus, bool *empty_line) { {} }; + _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; char **i; int r; @@ -1415,9 +1418,10 @@ static int status_global(sd_bus *bus, bool *empty_line) { "org.freedesktop.resolve1", "/org/freedesktop/resolve1", property_map, + &error, &global_info); if (r < 0) { - log_error_errno(r, "Failed to get global data: %m"); + log_error_errno(r, "Failed to get global data: %s", bus_error_message(&error, r)); goto finish; } |