From 18deed4c11334951ef2610afacf289c85580436f Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Mon, 14 Aug 2023 15:32:30 +0200
Subject: [PATCH] ixfrdist: after --help or --version, exit (includes var
 rename)

---
 pdns/ixfrdist.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pdns/ixfrdist.cc b/pdns/ixfrdist.cc
index d5fb195354..29b16ff13e 100644
--- a/pdns/ixfrdist.cc
+++ b/pdns/ixfrdist.cc
@@ -1194,7 +1194,7 @@ struct IXFRDistConfiguration
   uint16_t tcpInThreads{0};
   uid_t uid{0};
   gid_t gid{0};
-  bool done{false};
+  bool shouldExit{false};
 };
 
 static std::optional<IXFRDistConfiguration> parseConfiguration(int argc, char** argv, FDMultiplexer& fdm)
@@ -1218,11 +1218,13 @@ static std::optional<IXFRDistConfiguration> parseConfiguration(int argc, char**
 
     if (g_vm.count("help") > 0) {
       usage(desc);
+      configuration.shouldExit = true;
       return configuration;
     }
 
     if (g_vm.count("version") > 0) {
       cout<<"ixfrdist "<<VERSION<<endl;
+      configuration.shouldExit = true;
       return configuration;
     }
 
@@ -1435,7 +1437,7 @@ int main(int argc, char** argv) {
       return EXIT_FAILURE;
     }
 
-    if (configuration->done) {
+    if (configuration->shouldExit) {
       return EXIT_SUCCESS;
     }
   }
-- 
2.47.2