merge commit

This commit is contained in:
robvde 2012-11-28 07:15:28 +04:00
parent dfbdfc0024
commit d8956feb58
2 changed files with 2 additions and 2 deletions

View file

@ -54,7 +54,7 @@ namespace WebsitePanel.Providers.HostedSolution
void SetUserPassword(string organizationId, string accountName, string password); void SetUserPassword(string organizationId, string accountName, string password);
void SetUserPrincipalName(string organizationId, string accountName, string userPrincipalName); void SetUserPrincipalName(string organizationId, string accountName, string userPrincipalName);
bool OrganizationExists(string organizationId); bool OrganizationExists(string organizationId);
void DeleteOrganizationDomain(string organizationDistinguishedName, string domain); void DeleteOrganizationDomain(string organizationDistinguishedName, string domain);

View file

@ -645,7 +645,7 @@ namespace WebsitePanel.Providers.HostedSolution
{ {
string path = GetUserPath(organizationId, accountName); string path = GetUserPath(organizationId, accountName);
DirectoryEntry entry = ActiveDirectoryUtils.GetADObject(path); DirectoryEntry entry = ActiveDirectoryUtils.GetADObject(path);
if (!string.IsNullOrEmpty(password)) if (!string.IsNullOrEmpty(password))
entry.Invoke(ADAttributes.SetPassword, password); entry.Invoke(ADAttributes.SetPassword, password);