From: Evan Hunt <each@isc.org>
Date: Wed, 13 Oct 2021 15:43:47 +0000 (-0700)
Subject: Remove dead code
X-Git-Tag: v9.17.20~49^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4595536a0dec5c419212a27bd650c400dccf86b8;p=thirdparty%2Fbind9.git

Remove dead code

Remove code from dns_zone_setparentals() that cannot be reached
now that set_serverslist() returns void.
---

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 163ccb3c25f..c2e1dafd2b0 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -6454,7 +6454,6 @@ void
 dns_zone_setparentals(dns_zone_t *zone, const isc_sockaddr_t *parentals,
 		      dns_name_t **keynames, dns_name_t **tlsnames,
 		      uint32_t count) {
-	isc_result_t result = ISC_R_SUCCESS;
 	isc_sockaddr_t *newaddrs = NULL;
 	isc_dscp_t *newdscps = NULL;
 	dns_name_t **newkeynames = NULL;
@@ -6485,9 +6484,6 @@ dns_zone_setparentals(dns_zone_t *zone, const isc_sockaddr_t *parentals,
 	set_serverslist(count, parentals, &newaddrs, NULL, &newdscps, keynames,
 			&newkeynames, tlsnames, &newtlsnames, zone->mctx);
 	INSIST(newdscps == NULL);
-	if (result != ISC_R_SUCCESS) {
-		goto unlock;
-	}
 
 	/*
 	 * Everything is ok so attach to the zone.