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
89//89//
90//******************************************************************************************************90//******************************************************************************************************
91 91
92using GSF.Collections;
93using GSF.Communication;
94using GSF.Configuration;
95using GSF.Diagnostics;
96using GSF.ErrorManagement;
97using GSF.IO;
98using GSF.Reflection;
99using GSF.Scheduling;
100using GSF.Security;
101using GSF.Security.Cryptography;
102using System;92using System;
103using System.Collections.Generic;93using System.Collections.Generic;
104using System.ComponentModel;94using System.ComponentModel;
@@ -112,6 +102,16 @@ using System.Security.Principal; · 7 unmodified lines
112using System.ServiceProcess;102using System.ServiceProcess;
113using System.Text;103using System.Text;
114using System.Threading;104using System.Threading;
105using GSF.Collections;
106using GSF.Communication;
107using GSF.Configuration;
108using GSF.Diagnostics;
109using GSF.ErrorManagement;
110using GSF.IO;
111using GSF.Reflection;
112using GSF.Scheduling;
113using GSF.Security;
114using GSF.Security.Cryptography;
115 115
116namespace GSF.ServiceProcess116namespace GSF.ServiceProcess
117{117{
@@ -1572,7 +1572,7 @@ namespace GSF.ServiceProcess · 1454 unmodified lines
1572 {1572 {
1573 lock (m_processes)1573 lock (m_processes)
1574 {1574 {
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);
1576 }1576 }
1577 }1577 }
1578 1578
@@ -1598,7 +1598,7 @@ namespace GSF.ServiceProcess · 19 unmodified lines
1598 {1598 {
1599 lock (m_clientRequestHandlers)1599 lock (m_clientRequestHandlers)
1600 {1600 {
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);
1602 }1602 }
1603 }1603 }
1604 1604
@@ -1829,14 +1829,14 @@ namespace GSF.ServiceProcess · 224 unmodified lines
1829 SecurityProviderCache.CurrentProvider = SecurityProviderUtility.CreateProvider(string.Empty);1829 SecurityProviderCache.CurrentProvider = SecurityProviderUtility.CreateProvider(string.Empty);
1830 1830
1831 // Initialize security provider for the remote client's user from specified credentials.1831 // Initialize security provider for the remote client's user from specified credentials.
1832 if (!Thread.CurrentPrincipal.Identity.IsAuthenticated &&1832 if (!Thread.CurrentPrincipal.Identity.IsAuthenticated && !string.IsNullOrEmpty(client.ClientUserCredentials))
1833 !string.IsNullOrEmpty(client.ClientUserCredentials))
1834 {1833 {
1835 string[] credentialParts = client.ClientUserCredentials.Split(':');1834 string[] credentialParts = client.ClientUserCredentials.Split(':');
1835
1836 if (credentialParts.Length == 2)1836 if (credentialParts.Length == 2)
1837 {1837 {
1838 ISecurityProvider provider = SecurityProviderUtility.CreateProvider(credentialParts[0]);1838 ISecurityProvider provider = SecurityProviderUtility.CreateProvider(credentialParts[0]);
1839 provider.Initialize();1839
1840 if (provider.Authenticate(credentialParts[1]))1840 if (provider.Authenticate(credentialParts[1]))
1841 SecurityProviderCache.CurrentProvider = provider;1841 SecurityProviderCache.CurrentProvider = provider;
1842 }1842 }
@@ -2892,7 +2892,7 @@ namespace GSF.ServiceProcess · 1049 unmodified lines
2892 {2892 {
2893 typedComponent = component as IPersistSettings;2893 typedComponent = component as IPersistSettings;
2894 2894
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)
2896 continue;2896 continue;
2897 2897
2898 typedComponent.LoadSettings();2898 typedComponent.LoadSettings();
@@ -2962,7 +2962,7 @@ namespace GSF.ServiceProcess · 63 unmodified lines
2962 {2962 {
2963 typedComponent = component as IPersistSettings;2963 typedComponent = component as IPersistSettings;
2964 2964
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)
2966 continue;2966 continue;
2967 2967
2968 ConfigurationFile config = ConfigurationFile.Current;2968 ConfigurationFile config = ConfigurationFile.Current;
@@ -3210,7 +3210,7 @@ namespace GSF.ServiceProcess · 241 unmodified lines
3210 // Abort system process.3210 // Abort system process.
3211 Process processToAbort = null;3211 Process processToAbort = null;
3212 3212
3213 if (string.Compare(processName, "Me", true) == 0)3213 if (string.Compare(processName, "Me", StringComparison.OrdinalIgnoreCase) == 0)
3214 processName = Process.GetCurrentProcess().ProcessName;3214 processName = Process.GetCurrentProcess().ProcessName;
3215 3215
3216 foreach (Process process in Process.GetProcessesByName(processName))3216 foreach (Process process in Process.GetProcessesByName(processName))
@@ -3707,7 +3707,7 @@ namespace GSF.ServiceProcess · 490 unmodified lines
3707 UpdateStatus(requestinfo.Sender.ClientID, UpdateType.Alarm, "Failed to establish remote command session - Password is invalid.\r\n\r\n");3707 UpdateStatus(requestinfo.Sender.ClientID, UpdateType.Alarm, "Failed to establish remote command session - Password is invalid.\r\n\r\n");
3708 }3708 }
3709 }3709 }
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)
3711 {3711 {
3712 // User wants to terminate an established remote command session. 3712 // User wants to terminate an established remote command session.
3713 m_remoteCommandProcess.ErrorDataReceived -= RemoteCommandProcess_ErrorDataReceived;3713 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