Changeset 2608

Timestamp:

05/09/12 12:27:04 (13 months ago)

Author:

peter

Message:

make sure pdns_server --version works even if guardian or daemon are enabled. Fixes #456, reported by several.

Files:

• trunk/pdns/pdns/receiver.cc (modified) (2 diffs)

trunk/pdns/pdns/receiver.cc

@@ -415 +415 @@
     declareArguments();
     UNIX_declareArguments();
-      
+
     ::arg().laxParse(argc,argv); // do a lax parse
     
+    if(::arg().mustDo("version")) {
+      cerr<<"Version: "VERSION", compiled on "<<__DATE__", "__TIME__;
+#ifdef __GNUC__ 
+      cerr<<" with gcc version "<<__VERSION__;
+#endif
+      cout<<endl;
+      exit(99);
+    }
+
     if(::arg()["config-name"]!="") 
       s_programname+="-"+::arg()["config-name"];
@@ -456 +465 @@
     }
 
-    if(::arg().mustDo("version")) {
-      cerr<<"Version: "VERSION", compiled on "<<__DATE__", "__TIME__;
-#ifdef __GNUC__ 
-      cerr<<" with gcc version "<<__VERSION__;
-#endif
-      cout<<endl;
-      exit(99);
-    }
     
     // we really need to do work - either standalone or as an instance