From: Otto <otto.moerbeek@open-xchange.com>
Date: Tue, 13 Apr 2021 13:16:09 +0000 (+0200)
Subject: Exception loading the RPZ seedfile is not fatal.
X-Git-Tag: dnsdist-1.6.0-rc1~9^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10291%2Fhead;p=thirdparty%2Fpdns.git

Exception loading the RPZ seedfile is not fatal.

Catch PDNSException and clear on failure.
---

diff --git a/pdns/rec-lua-conf.cc b/pdns/rec-lua-conf.cc
index fa6a4c13bd..3631dc2761 100644
--- a/pdns/rec-lua-conf.cc
+++ b/pdns/rec-lua-conf.cc
@@ -300,8 +300,13 @@ static void rpzPrimary(LuaConfigItems& lci, luaConfigDelayedThreads& delayedThre
           throw PDNSException("The RPZ zone " + zoneName + " loaded from the seed file (" + zone->getDomain().toString() + ") has no SOA record");
         }
       }
+      catch(const PDNSException& e) {
+        g_log<<Logger::Warning<<"Unable to pre-load RPZ zone "<<zoneName<<" from seed file '"<<seedFile<<"': "<<e.reason<<endl;
+        zone->clear();
+      }
       catch(const std::exception& e) {
         g_log<<Logger::Warning<<"Unable to pre-load RPZ zone "<<zoneName<<" from seed file '"<<seedFile<<"': "<<e.what()<<endl;
+        zone->clear();
       }
     }
   }