From: bert hubert <bert.hubert@powerdns.com>
Date: Thu, 17 Sep 2015 14:52:10 +0000 (+0200)
Subject: make pdns_control and rec_control mention the 'help' command to query pdns for possib... 
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b710dd81c9cbbcb0d9af130d87f1cc705a28876f;p=thirdparty%2Fpdns.git

make pdns_control and rec_control mention the 'help' command to query pdns for possible commands. Close #2686.
---

diff --git a/pdns/dynloader.cc b/pdns/dynloader.cc
index cd5771b2ee..a079c2fa30 100644
--- a/pdns/dynloader.cc
+++ b/pdns/dynloader.cc
@@ -73,6 +73,7 @@ int main(int argc, char **argv)
   if(::arg().mustDo("help")) {
     cout<<"syntax:"<<endl<<endl;
     cout<<::arg().helpstring(::arg()["help"])<<endl;
+    cout<<"In addition, 'pdns_control help' can be used to retrieve a list\nof available commands from PowerDNS"<<endl;
     exit(0);
   }
 
diff --git a/pdns/rec_control.cc b/pdns/rec_control.cc
index eb45651e1e..df370e0fd2 100644
--- a/pdns/rec_control.cc
+++ b/pdns/rec_control.cc
@@ -51,16 +51,11 @@ static void initArguments(int argc, char** argv)
   arg().setCmd("help","Provide this helpful message");
 
   arg().laxParse(argc,argv);  
-  if(arg().mustDo("help")) {
+  if(arg().mustDo("help") || arg().getCommands().empty()) {
     cout<<"syntax: rec_control [options] command, options as below: "<<endl<<endl;
     cout<<arg().helpstring(arg()["help"])<<endl;
-    exit(0);
-  }
-
-  if(arg().getCommands().empty()) {
-    cerr<<"syntax: rec_control [options] command, options as below: "<<endl<<endl;
-    cerr<<arg().helpstring(arg()["help"])<<endl;
-    exit(99);
+    cout<<"In addition, 'rec_control help' can be used to retrieve a list\nof available commands from PowerDNS"<<endl;
+    exit(arg().mustDo("help") ? 0 : 99);
   }
 
   string configname=::arg()["config-dir"]+"/recursor.conf";