History

Restored updates to UserInfo.UserAccountControl lost during previous check-in.

ritchiecarroll committed 12 years ago

Commit e968dd51 parent 3d784da6 files · +112 −72Browse files

Showing the changes to Source/Libraries/GSF.ServiceProcess (1 of 6 files). Show all

Unified · Split

Source/Libraries/GSF.ServiceProcess/ServiceHelper.cs+19−19
@@ -89,16 +89,6 @@ · 88 unmodified lines
8989 //
9090 //******************************************************************************************************
9191
92−using GSF.Collections;
93−using GSF.Communication;
94−using GSF.Configuration;
95−using GSF.Diagnostics;
96−using GSF.ErrorManagement;
97−using GSF.IO;
98−using GSF.Reflection;
99−using GSF.Scheduling;
100−using GSF.Security;
101−using GSF.Security.Cryptography;
10292 using System;
10393 using System.Collections.Generic;
10494 using System.ComponentModel;
@@ -112,6 +102,16 @@ using System.Security.Principal; · 7 unmodified lines
112102 using System.ServiceProcess;
113103 using System.Text;
114104 using System.Threading;
105+using GSF.Collections;
106+using GSF.Communication;
107+using GSF.Configuration;
108+using GSF.Diagnostics;
109+using GSF.ErrorManagement;
110+using GSF.IO;
111+using GSF.Reflection;
112+using GSF.Scheduling;
113+using GSF.Security;
114+using GSF.Security.Cryptography;
115115
116116 namespace GSF.ServiceProcess
117117 {
@@ -1572,7 +1572,7 @@ namespace GSF.ServiceProcess · 1454 unmodified lines
15721572 {
15731573 lock (m_processes)
15741574 {
1575− return m_processes.Find(process => string.Compare(process.Name, processName, true) == 0);
1575+ return m_processes.Find(process => string.Compare(process.Name, processName, StringComparison.OrdinalIgnoreCase) == 0);
15761576 }
15771577 }
15781578
@@ -1598,7 +1598,7 @@ namespace GSF.ServiceProcess · 19 unmodified lines
15981598 {
15991599 lock (m_clientRequestHandlers)
16001600 {
1601− return m_clientRequestHandlers.Find(handler => string.Compare(handler.Command, handlerCommand, true) == 0);
1601+ return m_clientRequestHandlers.Find(handler => string.Compare(handler.Command, handlerCommand, StringComparison.OrdinalIgnoreCase) == 0);
16021602 }
16031603 }
16041604
@@ -1829,14 +1829,14 @@ namespace GSF.ServiceProcess · 224 unmodified lines
18291829 SecurityProviderCache.CurrentProvider = SecurityProviderUtility.CreateProvider(string.Empty);
18301830
18311831 // Initialize security provider for the remote client's user from specified credentials.
1832− if (!Thread.CurrentPrincipal.Identity.IsAuthenticated &&
1833− !string.IsNullOrEmpty(client.ClientUserCredentials))
1832+ if (!Thread.CurrentPrincipal.Identity.IsAuthenticated && !string.IsNullOrEmpty(client.ClientUserCredentials))
18341833 {
18351834 string[] credentialParts = client.ClientUserCredentials.Split(':');
1835+
18361836 if (credentialParts.Length == 2)
18371837 {
18381838 ISecurityProvider provider = SecurityProviderUtility.CreateProvider(credentialParts[0]);
1839− provider.Initialize();
1839+
18401840 if (provider.Authenticate(credentialParts[1]))
18411841 SecurityProviderCache.CurrentProvider = provider;
18421842 }
@@ -2892,7 +2892,7 @@ namespace GSF.ServiceProcess · 1049 unmodified lines
28922892 {
28932893 typedComponent = component as IPersistSettings;
28942894
2895− if ((object)typedComponent == null || string.Compare(categoryName, typedComponent.SettingsCategory, true) != 0)
2895+ if ((object)typedComponent == null || string.Compare(categoryName, typedComponent.SettingsCategory, StringComparison.OrdinalIgnoreCase) != 0)
28962896 continue;
28972897
28982898 typedComponent.LoadSettings();
@@ -2962,7 +2962,7 @@ namespace GSF.ServiceProcess · 63 unmodified lines
29622962 {
29632963 typedComponent = component as IPersistSettings;
29642964
2965− if ((object)typedComponent == null || string.Compare(categoryName, typedComponent.SettingsCategory, true) != 0)
2965+ if ((object)typedComponent == null || string.Compare(categoryName, typedComponent.SettingsCategory, StringComparison.OrdinalIgnoreCase) != 0)
29662966 continue;
29672967
29682968 ConfigurationFile config = ConfigurationFile.Current;
@@ -3210,7 +3210,7 @@ namespace GSF.ServiceProcess · 241 unmodified lines
32103210 // Abort system process.
32113211 Process processToAbort = null;
32123212
3213− if (string.Compare(processName, "Me", true) == 0)
3213+ if (string.Compare(processName, "Me", StringComparison.OrdinalIgnoreCase) == 0)
32143214 processName = Process.GetCurrentProcess().ProcessName;
32153215
32163216 foreach (Process process in Process.GetProcessesByName(processName))
@@ -3707,7 +3707,7 @@ namespace GSF.ServiceProcess · 490 unmodified lines
37073707 UpdateStatus(requestinfo.Sender.ClientID, UpdateType.Alarm, "Failed to establish remote command session - Password is invalid.\r\n\r\n");
37083708 }
37093709 }
3710− else if (string.Compare(requestinfo.Request.Command, "Telnet", true) == 0 && (object)m_remoteCommandProcess != null && disconnectSession)
3710+ else if (string.Compare(requestinfo.Request.Command, "Telnet", StringComparison.OrdinalIgnoreCase) == 0 && (object)m_remoteCommandProcess != null && disconnectSession)
37113711 {
37123712 // User wants to terminate an established remote command session.
37133713 m_remoteCommandProcess.ErrorDataReceived -= RemoteCommandProcess_ErrorDataReceived;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t