From: Mark Zealey <mark@markandruth.co.uk>
Date: Wed, 4 Dec 2013 13:41:47 +0000 (+0200)
Subject: rebase to HEAD
X-Git-Tag: rec-3.6.0-rc1~265^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ab7e9ac911bf46a6ebc712132d47a9071e88d0d;p=thirdparty%2Fpdns.git

rebase to HEAD
---

diff --git a/pdns/nameserver.cc b/pdns/nameserver.cc
index 7905576952..f53e0518ab 100644
--- 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 35b986afe7..aab0cd244b 100644
--- 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");
       }
     }