From: Ondřej Surý <ondrej@isc.org>
Date: Mon, 5 Aug 2024 13:55:53 +0000 (+0200)
Subject: Move matching isc_mem_destroy() outside of ifdef
X-Git-Tag: alessio/regression/2ebcafd8c2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ebcafd8c2ce8ceeb2452ff4ce1b7b2a20f2afb2;p=thirdparty%2Fbind9.git

Move matching isc_mem_destroy() outside of ifdef

The isc_mem_create() in printversion() was created outside of an #ifdef
HAVE_GEOIP, but destroyed inside the #ifdef; move it to the outside of
the #ifdef where it belongs.

This is really a nit as we immediately exit() after printing the
versions, but I found it and it would bug me for the rest of my life.
---

diff --git a/bin/named/main.c b/bin/named/main.c
index 2bb5c1292dd..735b361ac59 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -674,8 +674,8 @@ printversion(bool verbose) {
 	}
 	cfg_obj_destroy(parser, &config);
 	cfg_parser_destroy(&parser);
-	isc_mem_detach(&mctx);
 #endif /* HAVE_GEOIP2 */
+	isc_mem_detach(&mctx);
 }
 
 static void