From 70746415c7e9eea14633aaab1dcbf57b13faf7b6 Mon Sep 17 00:00:00 2001
From: Jan Kadlec <jan.kadlec@nic.cz>
Date: Fri, 21 Feb 2014 15:49:03 +0100
Subject: [PATCH] Review: Fixed remarks for zone-sign.c.
---
src/knot/dnssec/zone-sign.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/knot/dnssec/zone-sign.c b/src/knot/dnssec/zone-sign.c
index 908e4abad..3abac02c8 100644
--- a/src/knot/dnssec/zone-sign.c
+++ b/src/knot/dnssec/zone-sign.c
@@ -519,14 +519,10 @@ static int sign_node_rrsets(const knot_node_t *node,
}
if (result != KNOT_EOK) {
- break;
+ return result;
}
}
- if (result != KNOT_EOK) {
- return result;
- }
-
return remove_standalone_rrsigs(node, rrsigs, changeset);
}
@@ -837,8 +833,8 @@ static int add_missing_dnskeys(const knot_rrset_t *soa,
knot_rrset_t *to_add = NULL;
int result = KNOT_EOK;
- bool add_all = dnskeys == NULL ||
- knot_rrset_rr_ttl(dnskeys, 0) != knot_rrset_rr_ttl(soa, 0);
+ bool add_all = (dnskeys == NULL ||
+ knot_rrset_rr_ttl(dnskeys, 0) != knot_rrset_rr_ttl(soa, 0));
for (int i = 0; i < zone_keys->count; i++) {
const knot_zone_key_t *key = &zone_keys->keys[i];
@@ -1016,10 +1012,10 @@ static int update_dnskeys(const knot_zone_contents_t *zone,
return result;
}
- bool modified = knot_changeset_size(changeset) != changes_before;
- bool signatures_exist = dnskeys &&
+ bool modified = (knot_changeset_size(changeset) != changes_before);
+ bool signatures_exist = (dnskeys &&
all_signatures_exist(dnskeys, dnskey_rrsig,
- zone_keys, policy);
+ zone_keys, policy));
knot_rrset_deep_free(&dnskey_rrsig, true, NULL);
if (!modified && signatures_exist) {
return KNOT_EOK;
--
GitLab