From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Mon, 14 Aug 2023 13:32:30 +0000 (+0200)
Subject: ixfrdist: after --help or --version, exit (includes var rename)
X-Git-Tag: rec-5.0.0-alpha1~62^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F13094%2Fhead;p=thirdparty%2Fpdns.git

ixfrdist: after --help or --version, exit (includes var rename)
---

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;
     }
   }