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

resolved: rename suffix_rr → zone_rr 

The domain name for this NSEC3 RR was originally stored in a variable
called "suffix", which was then renamed to "zone" in
d1511b3338. Hence also rename the
RR variable accordingly.
This commit is contained in:
Lennart Poettering 2016-01-07 12:40:59 +01:00
parent 3a33c81bfe
commit 7e35195fe3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/resolve/resolved-dns-dnssec.c
View File

@ -1257,7 +1257,7 @@ static int nsec3_hashed_domain(DnsResourceRecord *nsec3, const char *domain, con
static int dnssec_test_nsec3(DnsAnswer *answer, DnsResourceKey *key, DnssecNsecResult *result, bool *authenticated, uint32_t *ttl) { static int dnssec_test_nsec3(DnsAnswer *answer, DnsResourceKey *key, DnssecNsecResult *result, bool *authenticated, uint32_t *ttl) {
_cleanup_free_ char *next_closer_domain = NULL, *wildcard = NULL, *wildcard_domain = NULL; _cleanup_free_ char *next_closer_domain = NULL, *wildcard = NULL, *wildcard_domain = NULL;
const char *zone, *p, *pp = NULL; const char *zone, *p, *pp = NULL;
DnsResourceRecord *rr, *enclosure_rr, *suffix_rr, *wildcard_rr = NULL; DnsResourceRecord *rr, *enclosure_rr, *zone_rr, *wildcard_rr = NULL;
DnsAnswerFlags flags; DnsAnswerFlags flags;
int hashed_size, r; int hashed_size, r;
bool a, no_closer = false, no_wildcard = false, optout = false; bool a, no_closer = false, no_wildcard = false, optout = false;
@ -1272,14 +1272,14 @@ static int dnssec_test_nsec3(DnsAnswer *answer, DnsResourceKey *key, DnssecNsecR
* parameters. */ * parameters. */
zone = DNS_RESOURCE_KEY_NAME(key); zone = DNS_RESOURCE_KEY_NAME(key);
for (;;) { for (;;) {
DNS_ANSWER_FOREACH_FLAGS(suffix_rr, flags, answer) { DNS_ANSWER_FOREACH_FLAGS(zone_rr, flags, answer) {
r = nsec3_is_good(suffix_rr, flags, NULL); r = nsec3_is_good(zone_rr, flags, NULL);
if (r < 0) if (r < 0)
return r; return r;
if (r == 0) if (r == 0)
continue; continue;
r = dns_name_equal_skip(DNS_RESOURCE_KEY_NAME(suffix_rr->key), 1, zone); r = dns_name_equal_skip(DNS_RESOURCE_KEY_NAME(zone_rr->key), 1, zone);
if (r < 0) if (r < 0)
return r; return r;
if (r > 0) if (r > 0)
@ -1303,7 +1303,7 @@ found_zone:
for (;;) { for (;;) {
_cleanup_free_ char *hashed_domain = NULL; _cleanup_free_ char *hashed_domain = NULL;
hashed_size = nsec3_hashed_domain(suffix_rr, p, zone, &hashed_domain); hashed_size = nsec3_hashed_domain(zone_rr, p, zone, &hashed_domain);
if (hashed_size == -EOPNOTSUPP) { if (hashed_size == -EOPNOTSUPP) {
*result = DNSSEC_NSEC_UNSUPPORTED_ALGORITHM; *result = DNSSEC_NSEC_UNSUPPORTED_ALGORITHM;
return 0; return 0;
@ -1313,7 +1313,7 @@ found_zone:
DNS_ANSWER_FOREACH_FLAGS(enclosure_rr, flags, answer) { DNS_ANSWER_FOREACH_FLAGS(enclosure_rr, flags, answer) {
r = nsec3_is_good(enclosure_rr, flags, suffix_rr); r = nsec3_is_good(enclosure_rr, flags, zone_rr);
if (r < 0) if (r < 0)
return r; return r;
if (r == 0) if (r == 0)
@ -1401,7 +1401,7 @@ found_closest_encloser:
DNS_ANSWER_FOREACH_FLAGS(rr, flags, answer) { DNS_ANSWER_FOREACH_FLAGS(rr, flags, answer) {
_cleanup_free_ char *label = NULL, *next_hashed_domain = NULL; _cleanup_free_ char *label = NULL, *next_hashed_domain = NULL;
r = nsec3_is_good(rr, flags, suffix_rr); r = nsec3_is_good(rr, flags, zone_rr);
if (r < 0) if (r < 0)
return r; return r;
if (r == 0) if (r == 0)