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: rec-4.4.4~8^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10313%2Fhead;p=thirdparty%2Fpdns.git

Exception loading the RPZ seedfile is not fatal.

Catch PDNSException and clear on failure.

(cherry picked from commit a47cc75dfa7519bcf7b31cee511852ae954a50f8)
---

diff --git a/pdns/rec-lua-conf.cc b/pdns/rec-lua-conf.cc
index 0481c8a0cc..8737f63204 100644
--- a/pdns/rec-lua-conf.cc
+++ b/pdns/rec-lua-conf.cc
@@ -370,8 +370,13 @@ void loadRecursorLuaConfig(const std::string& fname, luaConfigDelayedThreads& de
               throw PDNSException("The RPZ zone " + zoneName + " loaded from the seed file (" + zone->getDomain().toString() + ") has no SOA record");
             }
           }
-          catch(const std::exception& e) {
+          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();
           }
         }
       }