From 1cf8b9bb7f4090e50df73805d6d37d4e61a37c2b Mon Sep 17 00:00:00 2001 From: Olov Karlsson Date: Sun, 1 Feb 2015 21:13:25 +0100 Subject: [PATCH] Fix for not deleting secondary DNS service items when deleting domain --- .../DnsServers/DnsServerController.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/DnsServers/DnsServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/DnsServers/DnsServerController.cs index 039c3473..d659f9aa 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/DnsServers/DnsServerController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/DnsServers/DnsServerController.cs @@ -272,6 +272,14 @@ namespace WebsitePanel.EnterpriseServer // delete service item PackageController.DeletePackageItem(zoneItemId); + + // Delete also all seconday service items + var zoneItems = PackageController.GetPackageItemsByType(zoneItem.PackageId, ResourceGroups.Dns, typeof (SecondaryDnsZone)); + + foreach (var item in zoneItems.Where(z => z.Name == zoneItem.Name)) + { + PackageController.DeletePackageItem(item.Id); + } } catch (Exception ex) {