File pdns-2.9.21.1_new_boost_exceptions.patch of Package pdns
Index: modules/ldapbackend/ldapbackend.cc
===================================================================
--- modules/ldapbackend/ldapbackend.cc.orig 2007-04-21 15:56:36.000000000 +0200
+++ modules/ldapbackend/ldapbackend.cc 2008-11-05 16:51:12.758885272 +0100
@@ -65,7 +65,7 @@ LdapBackend::LdapBackend( const string &
L << Logger::Error << m_myname << " Ldap connection to server failed: " << le.what() << endl;
throw( AhuException( "Unable to connect to ldap server" ) );
}
- catch( exception &e )
+ catch(std::exception &e )
{
if( m_pldap != NULL ) { delete( m_pldap ); }
L << Logger::Error << m_myname << " Caught STL exception: " << e.what() << endl;
@@ -105,7 +105,7 @@ bool LdapBackend::list( const string& ta
L << Logger::Error << m_myname << " Unable to get zone " + target + " from LDAP directory: " << le.what() << endl;
throw( AhuException( "LDAP server unreachable" ) ); // try to reconnect to another server
}
- catch( exception &e )
+ catch(std::exception &e )
{
L << Logger::Error << m_myname << " Caught STL exception for target " << target << ": " << e.what() << endl;
throw( DBException( "STL exception" ) );
@@ -182,7 +182,7 @@ void LdapBackend::lookup( const QType &q
L << Logger::Error << m_myname << " Unable to search LDAP directory: " << le.what() << endl;
throw( AhuException( "LDAP server unreachable" ) ); // try to reconnect to another server
}
- catch( exception &e )
+ catch(std::exception &e )
{
L << Logger::Error << m_myname << " Caught STL exception for qname " << qname << ": " << e.what() << endl;
throw( DBException( "STL exception" ) );
@@ -472,7 +472,7 @@ bool LdapBackend::get( DNSResourceRecord
L << Logger::Error << m_myname << " Search failed: " << le.what() << endl;
throw( AhuException( "LDAP server unreachable" ) ); // try to reconnect to another server
}
- catch( exception &e )
+ catch(std::exception &e )
{
L << Logger::Error << m_myname << " Caught STL exception for " << m_qname << ": " << e.what() << endl;
throw( DBException( "STL exception" ) );
Index: pdns/backends/bind/bindbackend2.cc
===================================================================
--- pdns/backends/bind/bindbackend2.cc.orig 2007-04-21 15:56:36.000000000 +0200
+++ pdns/backends/bind/bindbackend2.cc 2008-11-05 16:52:32.854386092 +0100
@@ -600,7 +600,7 @@ void Bind2Backend::loadConfig(string* st
L<<Logger::Warning<<d_logprefix<<msg.str()<<endl;
rejected++;
}
- catch(exception &ae) {
+ catch(std::exception &ae) {
ostringstream msg;
msg<<" error at "+nowTime()+" parsing '"<<i->name<<"' from file '"<<i->filename<<"': "<<ae.what();
@@ -715,7 +715,7 @@ void Bind2Backend::queueReload(BB2Domain
msg<<" error at "+nowTime()+" parsing '"<<bbd->d_name<<"' from file '"<<bbd->d_filename<<"': "<<ae.reason;
bbd->d_status=msg.str();
}
- catch(exception &ae) {
+ catch(std::exception &ae) {
ostringstream msg;
msg<<" error at "+nowTime()+" parsing '"<<bbd->d_name<<"' from file '"<<bbd->d_filename<<"': "<<ae.what();
bbd->d_status=msg.str();
Index: pdns/backends/bind/zone2ldap.cc
===================================================================
--- pdns/backends/bind/zone2ldap.cc.orig 2007-04-21 15:56:36.000000000 +0200
+++ pdns/backends/bind/zone2ldap.cc 2008-11-05 16:52:32.854386092 +0100
@@ -235,7 +235,7 @@ int main( int argc, char* argv[] )
cerr << "Fatal error: " << ae.reason << endl;
return 1;
}
- catch( exception &e )
+ catch(std::exception &e )
{
cerr << "Died because of STL error: " << e.what() << endl;
return 1;
Index: pdns/backends/bind/zone2sql.cc
===================================================================
--- pdns/backends/bind/zone2sql.cc.orig 2007-04-21 15:56:36.000000000 +0200
+++ pdns/backends/bind/zone2sql.cc 2008-11-05 16:52:32.854386092 +0100
@@ -302,7 +302,7 @@ int main(int argc, char **argv)
cerr<<"\nFatal error: "<<ae.reason<<endl;
return 0;
}
- catch(exception &e) {
+ catch(std::exception &e) {
cerr<<"died because of STL error: "<<e.what()<<endl;
exit(0);
}
Index: pdns/communicator.cc
===================================================================
--- pdns/communicator.cc.orig 2007-04-21 15:56:36.000000000 +0200
+++ pdns/communicator.cc 2008-11-05 16:52:32.858386388 +0100
@@ -461,7 +461,7 @@ void CommunicatorClass::mainloop(void)
Utility::sleep(1);
exit(0);
}
- catch(exception &e) {
+ catch(std::exception &e) {
L<<Logger::Error<<"Communicator thread died because of STL error: "<<e.what()<<endl;
exit(0);
}
Index: pdns/dnsproxy.cc
===================================================================
--- pdns/dnsproxy.cc.orig 2007-04-21 15:56:36.000000000 +0200
+++ pdns/dnsproxy.cc 2008-11-05 16:52:32.858386388 +0100
@@ -202,7 +202,7 @@ void DNSProxy::mainloop(void)
catch(AhuException &ae) {
L<<Logger::Error<<"Fatal error in DNS proxy: "<<ae.reason<<endl;
}
- catch(exception &e) {
+ catch(std::exception &e) {
L<<Logger::Error<<"Communicator thread died because of STL error: "<<e.what()<<endl;
}
catch( ... )
Index: pdns/lwres.cc
===================================================================
--- pdns/lwres.cc.orig 2007-04-21 15:56:36.000000000 +0200
+++ pdns/lwres.cc 2008-11-05 16:52:32.858386388 +0100
@@ -175,7 +175,7 @@ LWRes::res_t LWRes::result()
return ret;
// return p.getAnswers();
}
- catch(exception &mde) {
+ catch(std::exception &mde) {
if(::arg().mustDo("log-common-errors"))
L<<Logger::Notice<<"Unable to parse packet from remote server "<<d_ip.toString()<<": "<<mde.what()<<endl;
}
Index: pdns/pdns_recursor.cc
===================================================================
--- pdns/pdns_recursor.cc.orig 2008-11-05 16:50:19.000000000 +0100
+++ pdns/pdns_recursor.cc 2008-11-05 17:14:06.294385873 +0100
@@ -635,7 +635,7 @@ void startDoResolve(void *p)
catch(MOADNSException& e) {
L<<Logger::Error<<"DNS parser error: "<<dc->d_mdp.d_qname<<", "<<e.what()<<endl;
}
- catch(exception& e) {
+ catch(std::exception &e) {
L<<Logger::Error<<"STL error: "<<e.what()<<endl;
}
catch(...) {
@@ -847,7 +847,7 @@ void handleNewUDPQuestion(int fd, boost:
try {
questionExpand(data, len, qname, sizeof(qname), type);
}
- catch(exception &e)
+ catch(std::exception &e)
{
throw MOADNSException(e.what());
}
@@ -1147,7 +1147,7 @@ void handleRCC(int fd, boost::any& var)
s_rcc.send(answer, &remote);
command();
}
- catch(exception& e) {
+ catch(std::exception &e) {
L<<Logger::Error<<"Error dealing with control socket request: "<<e.what()<<endl;
}
catch(AhuException& ae) {
@@ -1424,7 +1424,7 @@ string reloadAuthAndForwards()
SyncRes::s_negcache.clear();
return "ok\n";
}
- catch(exception& e) {
+ catch(std::exception &e) {
L<<Logger::Error<<"Had error reloading zones, keeping original data: "<<e.what()<<endl;
}
catch(AhuException& ae) {
@@ -1463,7 +1463,7 @@ void parseAuthAndForwards()
string tmp=DNSRR2String(rr);
rr=String2DNSRR(rr.qname, rr.qtype, tmp, 3600);
}
- catch(exception &e) {
+ catch(std::exception &e) {
throw AhuException("Error parsing record '"+rr.qname+"' of type "+rr.qtype.getName()+" in zone '"+headers.first+"' from file '"+headers.second+"': "+e.what());
}
catch(...) {
@@ -1883,7 +1883,7 @@ int main(int argc, char **argv)
L<<Logger::Error<<"Exception: "<<ae.reason<<endl;
ret=EXIT_FAILURE;
}
- catch(exception &e) {
+ catch(std::exception &e) {
L<<Logger::Error<<"STL Exception: "<<e.what()<<endl;
ret=EXIT_FAILURE;
}
Index: pdns/receiver.cc
===================================================================
--- pdns/receiver.cc.orig 2008-11-05 16:50:19.000000000 +0100
+++ pdns/receiver.cc 2008-11-05 16:52:32.854386092 +0100
@@ -567,7 +567,7 @@ int main(int argc, char **argv)
cerr<<"Exiting because: "<<AE.reason<<endl;
L<<Logger::Error<<"Exiting because: "<<AE.reason<<endl;
}
- catch(exception &e) {
+ catch(std::exception &e) {
if(!arg().mustDo("daemon"))
cerr<<"Exiting because of STL error: "<<e.what()<<endl;
L<<Logger::Error<<"Exiting because of STL error: "<<e.what()<<endl;
Index: pdns/sdig.cc
===================================================================
--- pdns/sdig.cc.orig 2007-04-21 15:56:36.000000000 +0200
+++ pdns/sdig.cc 2008-11-05 16:52:32.858386388 +0100
@@ -55,7 +55,7 @@ try
}
}
-catch(exception &e)
+catch(std::exception &e)
{
cerr<<"Fatal: "<<e.what()<<endl;
}
Index: pdns/tcpreceiver.cc
===================================================================
--- pdns/tcpreceiver.cc.orig 2007-04-21 15:56:36.000000000 +0200
+++ pdns/tcpreceiver.cc 2008-11-05 16:52:32.858386388 +0100
@@ -322,7 +322,7 @@ void *TCPNameserver::doConnection(void *
s_P = 0; // on next call, backend will be recycled
L<<Logger::Error<<"TCP nameserver had error, cycling backend: "<<ae.reason<<endl;
}
- catch(exception &e) {
+ catch(std::exception &e) {
L<<Logger::Error<<"TCP Connection Thread died because of STL error: "<<e.what()<<endl;
}
catch( ... )
Index: pdns/webserver.cc
===================================================================
--- pdns/webserver.cc.orig 2007-04-21 15:56:36.000000000 +0200
+++ pdns/webserver.cc 2008-11-05 16:52:32.858386388 +0100
@@ -170,7 +170,7 @@ void *WebServer::serveConnection(void *p
catch(Exception &e) {
L<<Logger::Error<<"Exception in webserver: "<<e.reason<<endl;
}
- catch(exception &e) {
+ catch(std::exception &e) {
L<<Logger::Error<<"STL Exception in webserver: "<<e.what()<<endl;
}
catch(...) {
@@ -214,7 +214,7 @@ void WebServer::go()
catch(Exception &e) {
L<<Logger::Error<<"Fatal error in main webserver thread: "<<e.reason<<endl;
}
- catch(exception &e) {
+ catch(std::exception &e) {
L<<Logger::Error<<"STL Exception in main webserver thread: "<<e.what()<<endl;
}
catch(...) {
Index: pdns/dnsdemog.cc
===================================================================
--- pdns/dnsdemog.cc.orig 2007-04-21 15:56:36.000000000 +0200
+++ pdns/dnsdemog.cc 2008-11-05 17:14:06.354385938 +0100
@@ -71,7 +71,7 @@ try
// cerr<<"error parsing packet: "<<mde.what()<<endl;
continue;
}
- catch(exception& e) {
+ catch(std::exception &e) {
cerr << e.what() << endl;
continue;
}
@@ -87,7 +87,7 @@ try
*/
}
-catch(exception& e)
+catch(std::exception &e)
{
cerr<<"Fatal: "<<e.what()<<endl;
}
Index: pdns/dnsgram.cc
===================================================================
--- pdns/dnsgram.cc.orig 2007-04-21 15:56:36.000000000 +0200
+++ pdns/dnsgram.cc 2008-11-05 17:14:06.378385410 +0100
@@ -148,7 +148,7 @@ try
parseErrors++;
continue;
}
- catch(exception& e) {
+ catch(std::exception &e) {
cerr << e.what() << endl;
continue;
}
@@ -177,7 +177,7 @@ try
}
}
}
-catch(exception& e)
+catch(std::exception &e)
{
cerr<<"Fatal: "<<e.what()<<endl;
}
Index: pdns/dnspacket.cc
===================================================================
--- pdns/dnspacket.cc.orig 2007-04-21 15:56:36.000000000 +0200
+++ pdns/dnspacket.cc 2008-11-05 17:14:06.378385410 +0100
@@ -320,7 +320,7 @@ void DNSPacket::wrapup(void)
}
pw.commit();
}
- catch(exception& e) {
+ catch(std::exception &e) {
L<<Logger::Error<<"Exception: "<<e.what()<<endl;
throw;
}
@@ -424,7 +424,7 @@ try
qclass=mdp.d_qclass;
return 0;
}
-catch(exception& e) {
+catch(std::exception &e) {
return -1;
}
Index: pdns/dnspbench.cc
===================================================================
--- pdns/dnspbench.cc.orig 2007-04-21 15:56:36.000000000 +0200
+++ pdns/dnspbench.cc 2008-11-05 17:14:06.306385447 +0100
@@ -89,7 +89,7 @@ try
cerr<<"Out: "<<argv[1]<<" IN "<<argv[2]<<" "<<regen->getZoneRepresentation()<<endl;
#endif
}
-catch(exception& e)
+catch(std::exception &e)
{
cerr<<"Fatal: "<<e.what()<<"\n";
}
Index: pdns/dnsreplay-mindex.cc
===================================================================
--- pdns/dnsreplay-mindex.cc.orig 2007-04-21 15:56:36.000000000 +0200
+++ pdns/dnsreplay-mindex.cc 2008-11-05 17:14:06.310389876 +0100
@@ -356,7 +356,7 @@ try
}
}
-catch(exception& e)
+catch(std::exception &e)
{
cerr<<"Receiver thread died: "<<e.what()<<endl;
exit(1);
@@ -579,7 +579,7 @@ try
}
out:;
}
-catch(exception& e)
+catch(std::exception &e)
{
cerr<<"Fatal: "<<e.what()<<endl;
}
Index: pdns/dnsreplay.cc
===================================================================
--- pdns/dnsreplay.cc.orig 2007-04-21 15:56:36.000000000 +0200
+++ pdns/dnsreplay.cc 2008-11-05 17:14:06.310389876 +0100
@@ -255,7 +255,7 @@ try
}
}
}
-catch(exception& e)
+catch(std::exception &e)
{
cerr<<"Receiver thread died: "<<e.what()<<endl;
exit(1);
@@ -445,7 +445,7 @@ try
receiveFromReference();
}
}
-catch(exception& e)
+catch(std::exception &e)
{
cerr<<"Fatal: "<<e.what()<<endl;
}
Index: pdns/dnsscan.cc
===================================================================
--- pdns/dnsscan.cc.orig 2007-04-21 15:56:36.000000000 +0200
+++ pdns/dnsscan.cc 2008-11-05 17:14:06.310389876 +0100
@@ -78,7 +78,7 @@ try
}
}
-catch(exception& e)
+catch(std::exception &e)
{
cout<<"Fatal: "<<e.what()<<endl;
}
Index: pdns/dnsscope.cc
===================================================================
--- pdns/dnsscope.cc.orig 2007-04-21 15:56:36.000000000 +0200
+++ pdns/dnsscope.cc 2008-11-05 17:14:06.378385410 +0100
@@ -110,7 +110,7 @@ try
dnserrors++;
continue;
}
- catch(exception& e) {
+ catch(std::exception &e) {
if(pw)
pw->write();
bogus++;
@@ -207,7 +207,7 @@ try
if(totpackets)
cerr<<"Average response time: "<<tottime/totpackets<<" usec"<<endl;
}
-catch(exception& e)
+catch(std::exception &e)
{
cerr<<"Fatal: "<<e.what()<<endl;
}
Index: pdns/dnswasher.cc
===================================================================
--- pdns/dnswasher.cc.orig 2007-04-21 15:56:36.000000000 +0200
+++ pdns/dnswasher.cc 2008-11-05 17:14:06.306385447 +0100
@@ -74,7 +74,7 @@ try
cerr<<"Saw "<<pr.d_correctpackets<<" correct packets, "<<pr.d_runts<<" runts, "<< pr.d_oversized<<" oversize, "<<
pr.d_nonetheripudp<<" unknown encaps"<<endl;
}
-catch(exception& e)
+catch(std::exception &e)
{
cerr<<"Fatal: "<<e.what()<<endl;
}
Index: pdns/dynlistener.cc
===================================================================
--- pdns/dynlistener.cc.orig 2007-04-21 15:56:36.000000000 +0200
+++ pdns/dynlistener.cc 2008-11-05 17:14:06.350385174 +0100
@@ -235,7 +235,7 @@ void DynListener::theListener()
{
L<<Logger::Error<<"Fatal error 2 in control listener: "<<E<<endl;
}
- catch(exception& e)
+ catch(std::exception &e)
{
L<<Logger::Error<<"Fatal STL error: "<<e.what()<<endl;
}
Index: pdns/rcpgenerator.cc
===================================================================
--- pdns/rcpgenerator.cc.orig 2007-04-21 15:56:36.000000000 +0200
+++ pdns/rcpgenerator.cc 2008-11-05 17:14:06.310389876 +0100
@@ -434,7 +434,7 @@ try
cout<<"Regenerated: '"<<out<<"'\n";
}
-catch(exception& e)
+catch(std::exception &e)
{
cerr<<"Fatal: "<<e.what()<<endl;
}
