From 1297722c6a606fec1ba366ec4d7f766e50a6dfc4 Mon Sep 17 00:00:00 2001 From: robvde Date: Sat, 26 Jan 2013 10:00:06 +0400 Subject: [PATCH] AD provider logging increased due to duplicate user objects --- .../HostedSolutionLog.cs | 2 -- .../OrganizationProvider.cs | 10 ++++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/HostedSolutionLog.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/HostedSolutionLog.cs index 7783d442..e2adb2f8 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/HostedSolutionLog.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/HostedSolutionLog.cs @@ -75,10 +75,8 @@ namespace WebsitePanel.Providers.HostedSolution public static void DebugInfo(string message, params object[] args) { -#if DEBUG string text = String.Format(message, args); Log.WriteInfo("{0} {1}", LogPrefix, text); -#endif } public static void EndLog(string message, ResultObject res, string errorCode, Exception ex) diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/OrganizationProvider.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/OrganizationProvider.cs index e6b505d0..53689f1d 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/OrganizationProvider.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/OrganizationProvider.cs @@ -719,13 +719,14 @@ namespace WebsitePanel.Providers.HostedSolution private bool DoesSamAccountNameExistInternal(string accountName) { HostedSolutionLog.LogStart("DoesSamAccountNameExistInternal"); - HostedSolutionLog.DebugInfo("userPrincipalName : {0}", accountName); + HostedSolutionLog.DebugInfo("sAMAccountName : {0}", accountName); bool bFound = false; try { string path = GetRootOU(); + HostedSolutionLog.DebugInfo("Search path : {0}", path); DirectoryEntry entry = ActiveDirectoryUtils.GetADObject(path); DirectorySearcher searcher = new DirectorySearcher(entry); @@ -737,16 +738,17 @@ namespace WebsitePanel.Providers.HostedSolution if (resCollection != null) { if(resCollection.Properties["samaccountname"] != null) - bFound = true; ; + bFound = true; } - - HostedSolutionLog.LogEnd("GetSamAccountNameByUserPrincipalNameInternal"); } catch (Exception e) { HostedSolutionLog.DebugInfo("Failed : {0}", e.Message); } + HostedSolutionLog.DebugInfo("DoesSamAccountNameExistInternal Result: {0}", bFound); + HostedSolutionLog.LogEnd("DoesSamAccountNameExistInternal"); + return bFound; }