From 550bbee42762d8b23a58fe2c995d4593dc4043aa Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 6 Feb 2020 11:02:17 +1100 Subject: [PATCH 1/3] Correct logged function name. --- bin/dnssec/dnssec-signzone.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index 532a71aa94..e11ef49afb 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c @@ -1926,7 +1926,7 @@ addnsec3param(const unsigned char *salt, size_t salt_len, check_result(result, "dns_rdatalist_tordataset()"); result = dns_db_findnode(gdb, gorigin, true, &node); - check_result(result, "dns_db_find(gorigin)"); + check_result(result, "dns_db_findnode(gorigin)"); /* * Delete any current NSEC3PARAM records. From 98d5109e82b6b1d64776fe64153a9ff49f68826c Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 6 Feb 2020 11:02:38 +1100 Subject: [PATCH 2/3] Fix indenting. --- lib/dns/zone.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dns/zone.c b/lib/dns/zone.c index b63e1b889b..8604b5f3dc 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -8028,7 +8028,7 @@ zone_nsec3chain(dns_zone_t *zone) { DNS_DBFIND_NOWILD, 0, NULL, found, NULL, NULL); if ((result == DNS_R_DELEGATION || - result == DNS_R_DNAME) && + result == DNS_R_DNAME) && !dns_name_equal(name, found)) { /* * Remember the obscuring name so that From e8bf82efc6dfffa7f17117617c6dfe32ce7ac96d Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 6 Feb 2020 11:02:55 +1100 Subject: [PATCH 3/3] Silence unchecked return of dns_db_find() 190 dns_rdataset_init(&rdataset); 3. Condition r == 0, taking true branch. 4. Condition result, taking false branch. CID 1452691 (#1 of 1): Unchecked return value (CHECKED_RETURN) 5. check_return: Calling dns_db_find without checking return value (as is done elsewhere 39 out of 45 times). 191 check_assertion(dns_db_find(db1, dns_rootname, v2, 192 dns_rdatatype_soa, 0, 0, NULL, 193 name, &rdataset, NULL)); --- lib/dns/tests/dbversion_test.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/dns/tests/dbversion_test.c b/lib/dns/tests/dbversion_test.c index 79272735ca..2046e8ce68 100644 --- a/lib/dns/tests/dbversion_test.c +++ b/lib/dns/tests/dbversion_test.c @@ -186,9 +186,9 @@ find(void **state) { } dns_rdataset_init(&rdataset); - check_assertion(dns_db_find(db1, dns_rootname, v2, - dns_rdatatype_soa, 0, 0, NULL, - name, &rdataset, NULL)); + check_assertion((void)dns_db_find(db1, dns_rootname, v2, + dns_rdatatype_soa, 0, 0, NULL, + name, &rdataset, NULL)); } /*