From e7cd3687ef9a422119338ec5a49e520e576dd25e Mon Sep 17 00:00:00 2001
From: Shreyas Zare <shreyas@technitium.com>
Date: Sat, 20 Jun 2020 14:09:13 +0530
Subject: [PATCH] BlockedZoneManager: zone loading sequence updated.

---
 .../Dns/ZoneManagers/BlockedZoneManager.cs    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/DnsServerCore/Dns/ZoneManagers/BlockedZoneManager.cs b/DnsServerCore/Dns/ZoneManagers/BlockedZoneManager.cs
index b4695fa1..4b3ad3e2 100644
--- a/DnsServerCore/Dns/ZoneManagers/BlockedZoneManager.cs
+++ b/DnsServerCore/Dns/ZoneManagers/BlockedZoneManager.cs
@@ -28,13 +28,13 @@ using TechnitiumLibrary.Net.Dns.ResourceRecords;
 
 namespace DnsServerCore.Dns.ZoneManagers
 {
-    public class BlockedZoneManager
+    public sealed class BlockedZoneManager
     {
         #region variables
 
         readonly DnsServer _dnsServer;
 
-        readonly AuthZoneManager _zoneManager = new AuthZoneManager(null);
+        readonly AuthZoneManager _zoneManager;
 
         DnsSOARecord _soaRecord;
         DnsNSRecord _nsRecord;
@@ -49,8 +49,9 @@ namespace DnsServerCore.Dns.ZoneManagers
         {
             _dnsServer = dnsServer;
 
+            _zoneManager = new AuthZoneManager(_dnsServer);
+
             UpdateServerDomain(_dnsServer.ServerDomain);
-            LoadZoneFile();
         }
 
         #endregion
@@ -61,9 +62,15 @@ namespace DnsServerCore.Dns.ZoneManagers
         {
             _soaRecord = new DnsSOARecord(serverDomain, "hostadmin." + serverDomain, 1, 14400, 3600, 604800, 900);
             _nsRecord = new DnsNSRecord(serverDomain);
+
+            _zoneManager.ServerDomain = serverDomain;
         }
 
-        private void LoadZoneFile()
+        #endregion
+
+        #region public
+
+        public void LoadBlockedZoneFile()
         {
             string blockedZoneFile = Path.Combine(_dnsServer.ConfigFolder, "blocked.config");
 
@@ -113,10 +120,6 @@ namespace DnsServerCore.Dns.ZoneManagers
             }
         }
 
-        #endregion
-
-        #region public
-
         public bool BlockZone(string domain)
         {
             if (_zoneManager.CreatePrimaryZone(domain, _soaRecord, _nsRecord) != null)