Merge branch '429' of github.com:cyclops1982/pdns into cyclops1982-429

diff --cc pdns/arguments.cc
index a62bbeac0a4aa9a70a1a7fa1abb2b208f2a63654,585ae1e87bf5530885772a088311de8b9a1a6907..846b27d6cd0e584aa10f7eec1905f8d5879be499
mode 100644,100755..100755
--- 1/pdns/arguments.cc
--- 2/pdns/arguments.cc
+++ b/pdns/arguments.cc

diff --cc pdns/arguments.hh
index 30c74f28266e33f14e23c882e99e3498fffbf5e3,86fc07fb9538a6717f36ca1b43a28c1c55e2f4dc..45e114bacda300a78bb4ebbe81317e1448cfc2bd
mode 100644,100755..100755
--- 1/pdns/arguments.hh
--- 2/pdns/arguments.hh
+++ b/pdns/arguments.hh

diff --cc pdns/docs/pdns.xml
Simple merge

diff --cc pdns/dynhandler.cc
index dde9d89041ca3996045b80e10d384f6f4ad82fbd,e50d489148034bbab9310bda5b36241f61505b18..56322c7e44c2c4af9db842be7a32f1e227ce827c
mode 100644,100755..100755
--- 1/pdns/dynhandler.cc
--- 2/pdns/dynhandler.cc
+++ b/pdns/dynhandler.cc

diff --cc pdns/dynlistener.cc
index 597eadd5089ba2a7843e1714c5524b1898472786,fb820c742218775aa7780158c3144bb11c9ed7fe..51586640a4c93cac9f948a29a671d77081aaab34
mode 100644,100755..100755
--- 1/pdns/dynlistener.cc
--- 2/pdns/dynlistener.cc
+++ b/pdns/dynlistener.cc
@@@ -343,10 -305,18 +331,18 @@@ void DynListener::theListener(
          continue;
        }
  
-       sendLine((*(s_funcdb[parts[0]].func))(parts,d_ppid));
+       parts[0] = toUpper( parts[0] );
+       if(s_funcdb.count(parts[0])) 
+         sendlines((*(s_funcdb[parts[0]].func))(parts,d_ppid));
+       else if (parts[0] == "HELP")
+         sendlines(getHelp());
+       else if(s_restfunc)
+         sendlines((*s_restfunc)(parts,d_ppid));
+       else
+         sendlines("Unknown command: '"+parts[0]+"'");
      }
    }
 -  catch(AhuException &AE)
 +  catch(PDNSException &AE)
      {
        L<<Logger::Error<<"Fatal error in control listener: "<<AE.reason<<endl;
      }

diff --cc pdns/dynlistener.hh
index fd28439594f4dd472c89f6ad09cb3dd65c111dfa,c349f18bd9c3ceb1bd3292713ec1eda4fdbfce06..827ecd27037d1f312790268d0d679ba0dd8113a8
mode 100644,100755..100755
--- 1/pdns/dynlistener.hh
--- 2/pdns/dynlistener.hh
+++ b/pdns/dynlistener.hh

diff --cc pdns/receiver.cc
index 2048978a2fc64ea17aec41699547113febc32f35,c3c2595a4f7529d8d93ae945b43ef583d3521f6b..0d25c55e466d8efab9fe4b42509e2f348d45efd4
mode 100644,100755..100755
--- 1/pdns/receiver.cc
--- 2/pdns/receiver.cc
+++ b/pdns/receiver.cc

diff --cc pdns/win32_dynlistener.cc
index b24030fba7eadbffa513041e811c13f3dc85ac61,5d1d4a0f9d1dc24b022a7dfd4c64520353a43311..436e9f29550f8629abbba58b259ca0e238d50f00
mode 100644,100755..100755
--- 1/pdns/win32_dynlistener.cc
--- 2/pdns/win32_dynlistener.cc
+++ b/pdns/win32_dynlistener.cc
@@@ -157,10 -157,10 +157,10 @@@ void DynListener::theListener(
          continue;
        }
  
-       sendLine((*d_funcdb[parts[0]])(parts,d_ppid));
+       sendlines((*d_funcdb[parts[0]])(parts,d_ppid));
      }
    }
 -  catch(AhuException &AE)
 +  catch(PDNSException &AE)
      {
        L<<Logger::Error<<"Fatal: "<<AE.reason<<endl;
      }