From 880c24168318ba18c92e1c489405af0f996ebbce Mon Sep 17 00:00:00 2001
From: Alexander Trofimov <devnull@localhost>
Date: Fri, 30 Jan 2015 16:28:04 +0700
Subject: [PATCH] fix comments of wsp-10299 Web Publishing not created in IIS
 8.5

---
 .../WebServers/WebServerController.cs           | 17 +++++++++++++++++
 .../WebsitePanel.Providers.Web.IIS70/IIs70.cs   |  3 +++
 2 files changed, 20 insertions(+)

diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebServers/WebServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebServers/WebServerController.cs
index 98f22ef1..266fdf3c 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebServers/WebServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebServers/WebServerController.cs
@@ -3633,6 +3633,17 @@ namespace WebsitePanel.EnterpriseServer
 				WebServer server = GetWebServer(item.ServiceId);
 				//
 				server.RevokeWebManagementAccess(item.SiteId, accountName);
+
+                // Cleanup web site properties if the web management and web deploy user are the same
+                if (GetNonQualifiedAccountName(accountName) == item.WebDeployPublishingAccount)
+			    {
+			        item.WebDeployPublishingAccount = String.Empty;
+			        item.WebDeploySitePublishingEnabled = false;
+			        item.WebDeploySitePublishingProfile = String.Empty;
+			        item.WebDeployPublishingPassword = String.Empty;
+			        // Put changes into effect
+			        PackageController.UpdatePackageItem(item);
+			    }
 			}
 			catch (Exception ex)
 			{
@@ -3644,6 +3655,12 @@ namespace WebsitePanel.EnterpriseServer
 			}
 		}
 
+        protected static string GetNonQualifiedAccountName(string accountName)
+        {
+            int idx = accountName.LastIndexOf("\\");
+            return (idx != -1) ? accountName.Substring(idx + 1) : accountName;
+        }
+
 		public static ResultObject ChangeWebManagementAccessPassword(int siteItemId, string accountPassword)
 		{
 			ResultObject result = new ResultObject { IsSuccess = true };
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/IIs70.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/IIs70.cs
index 163eb5c9..a4d5eff2 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/IIs70.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/IIs70.cs
@@ -4133,6 +4133,9 @@ namespace WebsitePanel.Providers.Web
                 // Restore setting back
                 ServerSettings.ADEnabled = adEnabled;
             }
+
+            //
+			RemoveDelegationRulesRestrictions(siteName, accountName);
 		}
 
 		private void ReadWebDeployPublishingAccessDetails(WebVirtualDirectory iisObject)