SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve: dns_answer_contains() does not return negative errno

Browse Source
This commit is contained in:
Yu Watanabe
2021-03-23 21:30:23 +09:00
parent 06939d3b0c
commit 9fffe0a912
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resolve/resolved-dns-answer.c
+2 -2
View File
@@ -277,7 +277,7 @@ int dns_answer_match_key(DnsAnswer *a, const DnsResourceKey *key, DnsAnswerFlags
return found;
}
int dns_answer_contains_nsec_or_nsec3(DnsAnswer *a) {
bool dns_answer_contains_nsec_or_nsec3(DnsAnswer *a) {
DnsResourceRecord *i;
DNS_ANSWER_FOREACH(i, a)
@@ -314,7 +314,7 @@ int dns_answer_contains_zone_nsec3(DnsAnswer *answer, const char *zone) {
return false;
}
int dns_answer_contains(DnsAnswer *answer, DnsResourceRecord *rr) {
bool dns_answer_contains(DnsAnswer *answer, DnsResourceRecord *rr) {
DnsResourceRecord *i;
DNS_ANSWER_FOREACH(i, answer)
src/resolve/resolved-dns-answer.h
+2 -2
View File
@@ -51,9 +51,9 @@ int dns_answer_add_extend(DnsAnswer **a, DnsResourceRecord *rr, int ifindex, Dns
int dns_answer_add_soa(DnsAnswer *a, const char *name, uint32_t ttl, int ifindex);
int dns_answer_match_key(DnsAnswer *a, const DnsResourceKey *key, DnsAnswerFlags *ret_flags);
int dns_answer_contains_nsec_or_nsec3(DnsAnswer *a);
bool dns_answer_contains_nsec_or_nsec3(DnsAnswer *a);
int dns_answer_contains_zone_nsec3(DnsAnswer *answer, const char *zone);
int dns_answer_contains(DnsAnswer *answer, DnsResourceRecord *rr);
bool dns_answer_contains(DnsAnswer *answer, DnsResourceRecord *rr);
int dns_answer_find_soa(DnsAnswer *a, const DnsResourceKey *key, DnsResourceRecord **ret, DnsAnswerFlags *ret_flags);
int dns_answer_find_cname_or_dname(DnsAnswer *a, const DnsResourceKey *key, DnsResourceRecord **ret, DnsAnswerFlags *ret_flags);
src/resolve/resolved-dns-transaction.c
+1 -7
View File
@@ -2222,13 +2222,7 @@ static int dns_transaction_has_unsigned_negative_answer(DnsTransaction *t) {
* question. If so, let's see if there are any NSEC/NSEC3 RRs
* included. If not, the answer is unsigned. */
r = dns_answer_contains_nsec_or_nsec3(t->answer);
if (r < 0)
return r;
if (r > 0)
return false;
return true;
return !dns_answer_contains_nsec_or_nsec3(t->answer);
}
static int dns_transaction_is_primary_response(DnsTransaction *t, DnsResourceRecord *rr) {