diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-12-28 17:27:42 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-12-28 17:27:42 +0100 |
| commit | b038f6d1d83606b25f84e180745e263ccee3c61b (patch) | |
| tree | 17ec375a17f55d6bfc6e5a26dfe6727de10dec3b | |
| parent | 8e3efbaeaa59b87701898a33d158be1bef803552 (diff) | |
| parent | f770083430d03d7fe8b5771b6ef269802735e914 (diff) | |
| download | systemd-b038f6d1d83606b25f84e180745e263ccee3c61b.tar.gz systemd-b038f6d1d83606b25f84e180745e263ccee3c61b.tar.bz2 systemd-b038f6d1d83606b25f84e180745e263ccee3c61b.zip | |
Merge pull request #2231 from phomes/resolve-misc2
Resolve misc2
| -rw-r--r-- | src/resolve-host/resolve-host.c | 4 | ||||
| -rw-r--r-- | src/resolve/resolved-dns-dnssec.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/resolve-host/resolve-host.c b/src/resolve-host/resolve-host.c index 793c560373..dc82769ac6 100644 --- a/src/resolve-host/resolve-host.c +++ b/src/resolve-host/resolve-host.c @@ -688,6 +688,8 @@ static int show_statistics(sd_bus *bus) { &error, &reply, "(ttt)"); + if (r < 0) + return log_error_errno(r, "Failed to get cache statistics: %s", bus_error_message(&error, r)); r = sd_bus_message_read(reply, "(ttt)", &cache_size, @@ -716,6 +718,8 @@ static int show_statistics(sd_bus *bus) { &error, &reply, "(tttt)"); + if (r < 0) + return log_error_errno(r, "Failed to get DNSSEC statistics: %s", bus_error_message(&error, r)); r = sd_bus_message_read(reply, "(tttt)", &n_dnssec_secure, diff --git a/src/resolve/resolved-dns-dnssec.c b/src/resolve/resolved-dns-dnssec.c index ba8c83ebb9..a3aa90e98d 100644 --- a/src/resolve/resolved-dns-dnssec.c +++ b/src/resolve/resolved-dns-dnssec.c @@ -1182,8 +1182,6 @@ static int dnssec_test_nsec3(DnsAnswer *answer, DnsResourceKey *key, DnssecNsecR suffix = DNS_RESOURCE_KEY_NAME(key); for (;;) { DNS_ANSWER_FOREACH_FLAGS(suffix_rr, flags, answer) { - _cleanup_free_ char *hashed_domain = NULL, *label = NULL; - r = nsec3_is_good(suffix_rr, flags, NULL); if (r < 0) return r; |