diff -up pdns-recursor-3.1.7/lwres.cc.boost pdns-recursor-3.1.7/lwres.cc
--- pdns-recursor-3.1.7/lwres.cc.boost 2008-06-24 20:23:33.000000000 +0200
+++ pdns-recursor-3.1.7/lwres.cc 2009-02-27 15:14:06.000000000 +0100
@@ -181,7 +181,7 @@ int asyncresolve(const ComboAddress& ip,
return 1;
}
- catch(exception &mde) {
+ catch(std::exception &mde) {
if(::arg().mustDo("log-common-errors"))
L<<Logger::Notice<<"Unable to parse packet from remote server "<<ip.toString()<<": "<<mde.what()<<endl;
}
diff -up pdns-recursor-3.1.7/pdns_recursor.cc.boost pdns-recursor-3.1.7/pdns_recursor.cc
--- pdns-recursor-3.1.7/pdns_recursor.cc.boost 2008-06-24 20:23:33.000000000 +0200
+++ pdns-recursor-3.1.7/pdns_recursor.cc 2009-02-27 15:15:42.000000000 +0100
@@ -666,7 +666,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(...) {
@@ -1183,7 +1183,7 @@ void handleRCC(int fd, FDMultiplexer::fu
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) {
@@ -1486,7 +1486,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) {
@@ -1525,7 +1525,7 @@ void parseAuthAndForwards()
string tmp=DNSRR2String(rr);
rr=String2DNSRR(rr.qname, rr.qtype, tmp, rr.ttl);
}
- 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(...) {
@@ -1647,7 +1647,7 @@ string doReloadLuaScript(vector<string>:
}
}
}
- catch(exception& e) {
+ catch(std::exception& e) {
L<<Logger::Error<<"Retaining current script, error from '"<<fname<<"': "<< e.what() <<endl;
return string("Retaining current script, error from '"+fname+"': "+string(e.what())+"\n");
}
@@ -1771,7 +1771,7 @@ int serviceMain(int argc, char*argv[])
}
}
- catch(exception &e) {
+ catch(std::exception &e) {
L<<Logger::Error<<"Failed to load 'lua' script from '"<<::arg()["lua-dns-script"]<<"': "<<e.what()<<endl;
exit(99);
}
@@ -2060,7 +2060,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;
}