From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Mon, 10 Jun 2013 12:20:37 +0000 (+0200)
Subject: initialise server-id after all parsing is done, instead of half way through. Fixes... 
X-Git-Tag: rec-3.6.0-rc1~690
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5bc3abe773d5baad9b11d3e6fef4bd230ba137a2;p=thirdparty%2Fpdns.git

initialise server-id after all parsing is done, instead of half way through. Fixes situations where server-id was emptied explicitly. Reported by Wouter de Jong
---

diff --git a/pdns/receiver.cc b/pdns/receiver.cc
index 826bdd5d42..99b94f7b80 100644
--- a/pdns/receiver.cc
+++ b/pdns/receiver.cc
@@ -524,12 +524,6 @@ int main(int argc, char **argv)
         daemonize();
     }
 
-    if(::arg()["server-id"].empty()) {
-      char tmp[128];
-      gethostname(tmp, sizeof(tmp)-1);
-      ::arg().set("server-id")=tmp;
-    }
-
     if(isGuarded(argv)) {
       L<<Logger::Warning<<"This is a guarded instance of pdns"<<endl;
       dl=new DynListener; // listens on stdin 
@@ -567,6 +561,13 @@ int main(int argc, char **argv)
     if(!::arg().mustDo("no-config"))
       ::arg().file(configname.c_str());
     ::arg().parse(argc,argv);
+
+    if(::arg()["server-id"].empty()) {
+      char tmp[128];
+      gethostname(tmp, sizeof(tmp)-1);
+      ::arg().set("server-id")=tmp;
+    }
+
     UeberBackend::go();
     N=new UDPNameserver; // this fails when we are not root, throws exception