|
Added
Link Here
|
| 1 |
--- pdns_recursor.cc.orig 2008-06-24 22:23:33.000000000 +0400 |
| 2 |
+++ pdns_recursor.cc 2009-03-19 23:27:01.000000000 +0300 |
| 3 |
@@ -666,7 +666,7 @@ |
| 4 |
catch(MOADNSException& e) { |
| 5 |
L<<Logger::Error<<"DNS parser error: "<<dc->d_mdp.d_qname<<", "<<e.what()<<endl; |
| 6 |
} |
| 7 |
- catch(exception& e) { |
| 8 |
+ catch(std::exception& e) { |
| 9 |
L<<Logger::Error<<"STL error: "<<e.what()<<endl; |
| 10 |
} |
| 11 |
catch(...) { |
| 12 |
@@ -1183,7 +1183,7 @@ |
| 13 |
s_rcc.send(answer, &remote); |
| 14 |
command(); |
| 15 |
} |
| 16 |
- catch(exception& e) { |
| 17 |
+ catch(std::exception& e) { |
| 18 |
L<<Logger::Error<<"Error dealing with control socket request: "<<e.what()<<endl; |
| 19 |
} |
| 20 |
catch(AhuException& ae) { |
| 21 |
@@ -1486,7 +1486,7 @@ |
| 22 |
SyncRes::s_negcache.clear(); |
| 23 |
return "ok\n"; |
| 24 |
} |
| 25 |
- catch(exception& e) { |
| 26 |
+ catch(std::exception& e) { |
| 27 |
L<<Logger::Error<<"Had error reloading zones, keeping original data: "<<e.what()<<endl; |
| 28 |
} |
| 29 |
catch(AhuException& ae) { |
| 30 |
@@ -1525,7 +1525,7 @@ |
| 31 |
string tmp=DNSRR2String(rr); |
| 32 |
rr=String2DNSRR(rr.qname, rr.qtype, tmp, rr.ttl); |
| 33 |
} |
| 34 |
- catch(exception &e) { |
| 35 |
+ catch(std::exception &e) { |
| 36 |
throw AhuException("Error parsing record '"+rr.qname+"' of type "+rr.qtype.getName()+" in zone '"+headers.first+"' from file '"+headers.second+"': "+e.what()); |
| 37 |
} |
| 38 |
catch(...) { |
| 39 |
@@ -1647,7 +1647,7 @@ |
| 40 |
} |
| 41 |
} |
| 42 |
} |
| 43 |
- catch(exception& e) { |
| 44 |
+ catch(std::exception& e) { |
| 45 |
L<<Logger::Error<<"Retaining current script, error from '"<<fname<<"': "<< e.what() <<endl; |
| 46 |
return string("Retaining current script, error from '"+fname+"': "+string(e.what())+"\n"); |
| 47 |
} |
| 48 |
@@ -1771,7 +1771,7 @@ |
| 49 |
} |
| 50 |
|
| 51 |
} |
| 52 |
- catch(exception &e) { |
| 53 |
+ catch(std::exception &e) { |
| 54 |
L<<Logger::Error<<"Failed to load 'lua' script from '"<<::arg()["lua-dns-script"]<<"': "<<e.what()<<endl; |
| 55 |
exit(99); |
| 56 |
} |
| 57 |
@@ -2060,7 +2060,7 @@ |
| 58 |
L<<Logger::Error<<"Exception: "<<ae.reason<<endl; |
| 59 |
ret=EXIT_FAILURE; |
| 60 |
} |
| 61 |
- catch(exception &e) { |
| 62 |
+ catch(std::exception &e) { |
| 63 |
L<<Logger::Error<<"STL Exception: "<<e.what()<<endl; |
| 64 |
ret=EXIT_FAILURE; |
| 65 |
} |