lots of coolness!

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@89 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/build-scripts/rpm-build-instruction b/build-scripts/rpm-build-instruction
index 618ee76d277741c533b6d3d40883709625d32808..6099d1aa9d957fcab51139cc5f568a2d69ec1bdb 100755 (executable)
--- a/build-scripts/rpm-build-instruction
+++ b/build-scripts/rpm-build-instruction
@@ -1,5 +1,5 @@
 #!/bin/sh
-./configure --with-modules="mysql pgmysql pipe pdns" --with-dynmodules="" \
+./configure --with-modules="mysql gmysql gpgsql pipe pdns xdb" --with-dynmodules="" \
        --enable-static-binaries --enable-mysql --enable-pgsql \
        --with-pgsql-lib=/opt/postgresql-with-3.2/lib/ --prefix=/usr \
        --sysconfdir=/etc/powerdns \

diff --git a/pdns/docs/pdns.sgml b/pdns/docs/pdns.sgml
index 7b133f846fb65cc24a341e62de2a5e70a7c31014..797b41da0b8fb4aee1b3a6a4d108299bba4235a0 100644 (file)
--- a/pdns/docs/pdns.sgml
+++ b/pdns/docs/pdns.sgml
@@ -15,7 +15,7 @@
       </affiliation>
     </author>
     
-    <PubDate>v2.1 $Date: 2002/12/18 16:22:20 $</PubDate>
+    <PubDate>v2.1 $Date: 2002/12/19 17:00:44 $</PubDate>
     
     <Abstract>
        <para>  
@@ -90,7 +90,7 @@
          Broad range of improvements. We now have an all-static .rpm and .deb for Linux users and a a link to an OpenBSD port.
          Major news is that work on the Bind backend has progressed to the point that we've just retired our last Bind server and 
          replaced it with PowerDNS in Bind mode! This server is operating a number of master and slave setups so it should stress the Bind backend 
-         quite a bit.
+         somewhat.
        </para>
        <para>
          <warning>
@@ -119,6 +119,13 @@
                General robustness improvements in Bind backend - many errors are now non-fatal.
              </para>
            </listitem>
+           <listitem>
+             <para>
+               Accessability, Serviceability. New <command>pdns_server</command> commands like <command>bind-list-rejects</command>
+               (lists zones that could not be loaded, and the reason why), <command>bind-reload-now</command> (reload a zone from disk NOW),
+               <command>rediscover</command> (reread named.conf NOW). More is coming up.
+             </para>
+           </listitem>
            <listitem>
              <para>
                Added support for retrieving RP (Responsible Person) records from remote masters. Serving them was already possible.

diff --git a/pdns/dynhandler.cc b/pdns/dynhandler.cc
index db089f0300492e3a18e6b8b73be25d539d00f47e..52505e93efa8bb7fc3ed7f041c06cef740c2d9d4 100644 (file)
--- a/pdns/dynhandler.cc
+++ b/pdns/dynhandler.cc
@@ -180,6 +180,22 @@ string DLVersionHandler(const vector<string>&parts, Utility::pid_t ppid)
   return VERSION;
 }
 
+string DLNotifyRetrieveHandler(const vector<string>&parts, Utility::pid_t ppid)
+{
+  extern CommunicatorClass Communicator;
+  ostringstream os;
+  if(parts.size()!=2)
+    return "syntax: retrieve domain";
+
+  const string& domain=parts[1];
+  DomainInfo di;
+  PacketHandler P;
+  if(!P.getBackend()->getDomainInfo(domain, di))
+    return "Domain '"+domain+"' unknown";
+  
+  Communicator.addSuckRequest(domain,di.master);
+  return "Added retrieval request for '"+domain+"' from master "+di.master;
+}
 
 string DLNotifyHostHandler(const vector<string>&parts, Utility::pid_t ppid)
 {

diff --git a/pdns/dynhandler.hh b/pdns/dynhandler.hh
index 620814b960f0146296c9113c30d727251af36325..e211bc80531432e1f844dc47c33e8d96367d9b79 100644 (file)
--- a/pdns/dynhandler.hh
+++ b/pdns/dynhandler.hh
@@ -23,13 +23,13 @@
 #include <string>
 #include <stdlib.h>
 #include <sys/types.h>
-\r
-#ifndef WIN32\r
-# include "config.h"\r
-# include <unistd.h>\r
-#else\r
-# include "pdnsservice.hh"\r
-#endif // WIN32\r
+
+#ifndef WIN32
+# include "config.h"
+# include <unistd.h>
+#else
+# include "pdnsservice.hh"
+#endif // WIN32
 
 using namespace std;
 
@@ -50,4 +50,5 @@ string DLReloadHandler(const vector<string>&parts, Utility::pid_t ppid);
 string DLRediscoverHandler(const vector<string>&parts, Utility::pid_t ppid);
 string DLVersionHandler(const vector<string>&parts, Utility::pid_t ppid);
 string DLPurgeHandler(const vector<string>&parts, Utility::pid_t ppid);
+string DLNotifyRetrieveHandler(const vector<string>&parts, Utility::pid_t ppid);
 #endif /* PDNS_DYNHANDLER_HH */

diff --git a/pdns/receiver.cc b/pdns/receiver.cc
index 37809bc7929f00c487f1af1a153cb94c1a186962..8093c3c049e320027761944437da9f1608a4b38b 100644 (file)
--- a/pdns/receiver.cc
+++ b/pdns/receiver.cc
@@ -16,7 +16,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-// $Id: receiver.cc,v 1.3 2002/12/12 19:53:19 ahu Exp $
+// $Id: receiver.cc,v 1.4 2002/12/19 17:00:44 ahu Exp $
 #include <cstdio>
 #include <signal.h>
 #include <cstring>
@@ -515,6 +515,7 @@ int main(int argc, char **argv)
     dl->registerFunc("PURGE",&DLPurgeHandler);
     dl->registerFunc("CCOUNTS",&DLCCHandler);
     dl->registerFunc("SET",&DLSettingsHandler);
+    dl->registerFunc("RETRIEVE",&DLNotifyRetrieveHandler);
 
     
     // reparse, with error checking

diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index 05e92d2fb535453ee14d97c7e890253857eb2b49..ca82afbd8d9cda41dc3516b6f8253adc4cfa8f3c 100644 (file)
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -221,12 +221,12 @@ void *TCPNameserver::doConnection(void *data)
     
   out:;
   }
-  catch(AhuException &ae) {
-    L<<Logger::Error<<"TCP nameserver: "<<ae.reason<<endl;
-  }
   catch(DBException &e) {
     L<<Logger::Error<<"TCP Connection Thread unable to answer a question because of a backend error"<<endl;
   }
+  catch(AhuException &ae) {
+    L<<Logger::Error<<"TCP nameserver: "<<ae.reason<<endl;
+  }
   catch(exception &e) {
     L<<Logger::Error<<"TCP Connection Thread died because of STL error: "<<e.what()<<endl;
   }