Merge pull request #2231 from phomes/resolve-misc2

Resolve misc2
This commit is contained in:
Tom Gundersen 2015-12-28 17:27:42 +01:00
commit b038f6d1d8
2 changed files with 4 additions and 2 deletions

View file

@ -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,

View file

@ -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;