]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
geoipbackend: Handle read error for config file 7024/head
authorAki Tuomi <cmouse@cmouse.fi>
Thu, 4 Oct 2018 16:43:50 +0000 (19:43 +0300)
committerAki Tuomi <cmouse@cmouse.fi>
Thu, 11 Oct 2018 11:36:31 +0000 (14:36 +0300)
modules/geoipbackend/geoipbackend.cc

index 11173c0a610e2edf3aa5688b9c72110f08458405..de1d2ffa6076cb0c897b597245e629564ed779ab 100644 (file)
@@ -108,8 +108,13 @@ void GeoIPBackend::initialize() {
   if (s_geoip_files.empty())
     g_log<<Logger::Warning<<"No GeoIP database files loaded!"<<endl;
 
-  if(!getArg("zones-file").empty())
-    config = YAML::LoadFile(getArg("zones-file"));
+  if(!getArg("zones-file").empty()) {
+    try {
+       config = YAML::LoadFile(getArg("zones-file"));
+    } catch (YAML::Exception &ex) {
+       throw PDNSException(string("Cannot read config file ") + ex.msg);
+    }
+  }
 
   for(YAML::Node domain :  config["domains"]) {
     GeoIPDomain dom;