rebase to HEAD

diff --git a/pdns/nameserver.cc b/pdns/nameserver.cc
index 790557695279784e52fd3c4e5198dc0cbde9ee3b..f53e0518ab87b9e392b4a7ad6fa6f6984f005182 100644 (file)
--- a/pdns/nameserver.cc
+++ b/pdns/nameserver.cc
@@ -225,7 +225,7 @@ void UDPNameserver::bindIPv6()
         continue;
       } else {
         L<<Logger::Error<<"binding to UDP ipv6 socket "<< localname <<": "<<strerror(errno)<<endl;
-        throw AhuException("Unable to bind to UDP ipv6 socket");
+        throw PDNSException("Unable to bind to UDP ipv6 socket");
       }
     }
     d_sockets.push_back(s);

diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index 35b986afe766ac4bab2a5c34355b8027fb9243a9..aab0cd244bcd3d6153bee168f238df0b4d804b9f 100644 (file)
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -884,7 +884,7 @@ TCPNameserver::TCPNameserver()
         continue;
       } else {
         L<<Logger::Error<<"binding to TCP socket " << *laddr << ": "<<strerror(errno)<<endl;
-        throw AhuException("Unable to bind to TCP socket");
+        throw PDNSException("Unable to bind to TCP socket");
       }
     }
     
@@ -924,7 +924,7 @@ TCPNameserver::TCPNameserver()
         continue;
       } else {
         L<<Logger::Error<<"binding to TCPv6 socket" << *laddr << ": "<<strerror(errno)<<endl;
-        throw AhuException("Unable to bind to TCPv6 socket");
+        throw PDNSException("Unable to bind to TCPv6 socket");
       }
     }