From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Mon, 22 Jul 2013 06:42:16 +0000 (+0200)
Subject: Merge branch '429' of github.com:cyclops1982/pdns into cyclops1982-429
X-Git-Tag: rec-3.6.0-rc1~550
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12d17140b838f08844fb93423f105b1f8f28fa75;p=thirdparty%2Fpdns.git

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

12d17140b838f08844fb93423f105b1f8f28fa75
diff --cc pdns/arguments.cc
index a62bbeac0a,585ae1e87b..846b27d6cd
mode 100644,100755..100755
--- a/pdns/arguments.cc
+++ b/pdns/arguments.cc
diff --cc pdns/arguments.hh
index 30c74f2826,86fc07fb95..45e114bacd
mode 100644,100755..100755
--- a/pdns/arguments.hh
+++ b/pdns/arguments.hh
diff --cc pdns/dynhandler.cc
index dde9d89041,e50d489148..56322c7e44
mode 100644,100755..100755
--- a/pdns/dynhandler.cc
+++ b/pdns/dynhandler.cc
diff --cc pdns/dynlistener.cc
index 597eadd508,fb820c7422..51586640a4
mode 100644,100755..100755
--- a/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 fd28439594,c349f18bd9..827ecd2703
mode 100644,100755..100755
--- a/pdns/dynlistener.hh
+++ b/pdns/dynlistener.hh
diff --cc pdns/receiver.cc
index 2048978a2f,c3c2595a4f..0d25c55e46
mode 100644,100755..100755
--- a/pdns/receiver.cc
+++ b/pdns/receiver.cc
diff --cc pdns/win32_dynlistener.cc
index b24030fba7,5d1d4a0f9d..436e9f2955
mode 100644,100755..100755
--- a/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;
      }