From e4ea33480f65264a7a7febc8518f22b245f8d133 Mon Sep 17 00:00:00 2001
From: robvde <devnull@localhost>
Date: Fri, 31 Jan 2014 17:51:22 +0400
Subject: [PATCH 1/2] Fixed addressbookpolicy not applied to publicfolder
 database.

---
 .../Exchange2013.cs                                          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs
index e8080f56..e61b25ca 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs
@@ -4370,7 +4370,7 @@ namespace WebsitePanel.Providers.HostedSolution
                 ExchangeTransaction transaction = StartTransaction();
                 try
                 {
-                    string rootId = AddPublicFolderMailbox(runSpace, orgCanonicalName, GetPublicFolderMailboxName(organizationId), domain);
+                    string rootId = AddPublicFolderMailbox(runSpace, orgCanonicalName, GetPublicFolderMailboxName(organizationId), domain, GetAddressBookPolicyName(organizationId));
                     transaction.RegisterNewPublicFolderMailbox(orgCanonicalName + "/" + GetPublicFolderMailboxName(organizationId));
                 }
                 catch
@@ -4421,7 +4421,7 @@ namespace WebsitePanel.Providers.HostedSolution
             return id;
         }
 
-        private string AddPublicFolderMailbox(Runspace runSpace, string organizationDistinguishedName, string name, string domain)
+        private string AddPublicFolderMailbox(Runspace runSpace, string organizationDistinguishedName, string name, string domain, string addressBookPolicy)
         {
             ExchangeLog.LogStart("CreatePublicFolderMailbox");
             Command cmd = new Command("New-Mailbox");
@@ -4429,6 +4429,7 @@ namespace WebsitePanel.Providers.HostedSolution
             cmd.Parameters.Add("PublicFolder");
             cmd.Parameters.Add("PrimarySmtpAddress", name.Replace(" ", "")+"@"+domain);
             cmd.Parameters.Add("OrganizationalUnit", organizationDistinguishedName);
+            cmd.Parameters.Add("AddressBookPolicy", addressBookPolicy);
             string database = GetDatabase(runSpace, PrimaryDomainController, MailboxDatabase);
             ExchangeLog.DebugInfo("database: " + database);
             if (database != string.Empty)

From 329e9c10fe56d312c80168cce304b0abdaa658a8 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Fri, 31 Jan 2014 09:23:20 -0500
Subject: [PATCH 2/2] Added tag build-2.1.0.278 for changeset f513db01918f