zydronium/SMBLibrary
1
0
Fork 0
mirror of https://github.com/TalAloni/SMBLibrary.git synced 2025-05-19 18:59:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

Corrected StringComparison type

Browse source
This commit is contained in:
Tal Aloni 2017-08-30 12:41:21 +03:00
parent ab7398d3cd
commit 0bc9452bbf
10 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
SMBLibrary/NTFileStore/Adapter/NTFileSystemAdapter.QueryDirectory.cs
View file

@ -128,15 +128,15 @@ namespace SMBLibrary
if (!findExactNameWithoutExtension) if (!findExactNameWithoutExtension)
{ {
if (fileName.StartsWith(desiredFileNameStart, StringComparison.InvariantCultureIgnoreCase)) if (fileName.StartsWith(desiredFileNameStart, StringComparison.OrdinalIgnoreCase))
{ {
return true; return true;
} }
} }
else else
{ {
if (fileName.StartsWith(desiredFileNameStart + ".", StringComparison.InvariantCultureIgnoreCase) || if (fileName.StartsWith(desiredFileNameStart + ".", StringComparison.OrdinalIgnoreCase) ||
fileName.Equals(desiredFileNameStart, StringComparison.InvariantCultureIgnoreCase)) fileName.Equals(desiredFileNameStart, StringComparison.OrdinalIgnoreCase))
{ {
return true; return true;
} }
@ -145,12 +145,12 @@ namespace SMBLibrary
else if (expression.StartsWith("<")) else if (expression.StartsWith("<"))
{ {
string desiredFileNameEnd = expression.Substring(1); string desiredFileNameEnd = expression.Substring(1);
if (fileName.EndsWith(desiredFileNameEnd, StringComparison.InvariantCultureIgnoreCase)) if (fileName.EndsWith(desiredFileNameEnd, StringComparison.OrdinalIgnoreCase))
{ {
return true; return true;
} }
} }
else if (String.Equals(fileName, expression, StringComparison.CurrentCultureIgnoreCase)) else if (String.Equals(fileName, expression, StringComparison.OrdinalIgnoreCase))
{ {
return true; return true;
} }

2
SMBLibrary/NTFileStore/NamedPipeStore.cs
View file

@ -60,7 +60,7 @@ namespace SMBLibrary
foreach (RemoteService service in m_services) foreach (RemoteService service in m_services)
{ {
if (String.Equals(path, service.PipeName, StringComparison.InvariantCultureIgnoreCase)) if (String.Equals(path, service.PipeName, StringComparison.OrdinalIgnoreCase))
{ {
return service; return service;
} }

2
SMBLibrary/Server/NameServer.cs
View file

@ -109,7 +109,7 @@ namespace SMBLibrary.Server
string name = NetBiosUtils.GetNameFromMSNetBiosName(request.Question.Name); string name = NetBiosUtils.GetNameFromMSNetBiosName(request.Question.Name);
NetBiosSuffix suffix = (NetBiosSuffix)request.Question.Name[15]; NetBiosSuffix suffix = (NetBiosSuffix)request.Question.Name[15];
bool nameMatch = String.Equals(name, Environment.MachineName, StringComparison.InvariantCultureIgnoreCase); bool nameMatch = String.Equals(name, Environment.MachineName, StringComparison.OrdinalIgnoreCase);
if (nameMatch && ((suffix == NetBiosSuffix.WorkstationService) || (suffix == NetBiosSuffix.FileServiceService))) if (nameMatch && ((suffix == NetBiosSuffix.WorkstationService) || (suffix == NetBiosSuffix.FileServiceService)))
{ {

2
SMBLibrary/Server/SMB1/TransactionHelper.cs
View file

@ -100,7 +100,7 @@ namespace SMBLibrary.Server.SMB1
internal static List<SMB1Command> GetCompleteTransactionResponse(SMB1Header header, uint maxDataCount, uint timeout, string name, byte[] requestSetup, byte[] requestParameters, byte[] requestData, ISMBShare share, SMB1ConnectionState state) internal static List<SMB1Command> GetCompleteTransactionResponse(SMB1Header header, uint maxDataCount, uint timeout, string name, byte[] requestSetup, byte[] requestParameters, byte[] requestData, ISMBShare share, SMB1ConnectionState state)
{ {
if (String.Equals(name, @"\pipe\lanman", StringComparison.InvariantCultureIgnoreCase)) if (String.Equals(name, @"\PIPE\lanman", StringComparison.OrdinalIgnoreCase))
{ {
// [MS-RAP] Remote Administration Protocol request // [MS-RAP] Remote Administration Protocol request
state.LogToServer(Severity.Debug, "Remote Administration Protocol requests are not implemented"); state.LogToServer(Severity.Debug, "Remote Administration Protocol requests are not implemented");

2
SMBLibrary/Server/SMB1/TreeConnectHelper.cs
View file

@ -22,7 +22,7 @@ namespace SMBLibrary.Server.SMB1
ISMBShare share; ISMBShare share;
ServiceName serviceName; ServiceName serviceName;
OptionalSupportFlags supportFlags; OptionalSupportFlags supportFlags;
if (String.Equals(shareName, NamedPipeShare.NamedPipeShareName, StringComparison.InvariantCultureIgnoreCase)) if (String.Equals(shareName, NamedPipeShare.NamedPipeShareName, StringComparison.OrdinalIgnoreCase))
{ {
share = services; share = services;
serviceName = ServiceName.NamedPipe; serviceName = ServiceName.NamedPipe;

2
SMBLibrary/Server/SMB2/TreeConnectHelper.cs
View file

@ -22,7 +22,7 @@ namespace SMBLibrary.Server.SMB2
ISMBShare share; ISMBShare share;
ShareType shareType; ShareType shareType;
ShareFlags shareFlags; ShareFlags shareFlags;
if (String.Equals(shareName, NamedPipeShare.NamedPipeShareName, StringComparison.InvariantCultureIgnoreCase)) if (String.Equals(shareName, NamedPipeShare.NamedPipeShareName, StringComparison.OrdinalIgnoreCase))
{ {
share = services; share = services;
shareType = ShareType.Pipe; shareType = ShareType.Pipe;

2
SMBLibrary/Server/Shares/SMBShareCollection.cs
View file

@ -50,7 +50,7 @@ namespace SMBLibrary.Server
/// <param name="relativePath">e.g. \Shared</param> /// <param name="relativePath">e.g. \Shared</param>
public FileSystemShare GetShareFromName(string shareName) public FileSystemShare GetShareFromName(string shareName)
{ {
int index = IndexOf(shareName, StringComparison.InvariantCultureIgnoreCase); int index = IndexOf(shareName, StringComparison.OrdinalIgnoreCase);
if (index >= 0) if (index >= 0)
{ {
return this[index]; return this[index];

2
SMBLibrary/Services/ServerService/ServerService.cs
View file

@ -166,7 +166,7 @@ namespace SMBLibrary.Services
{ {
for (int index = 0; index < m_shares.Count; index++) for (int index = 0; index < m_shares.Count; index++)
{ {
if (m_shares[index].Equals(shareName, StringComparison.InvariantCultureIgnoreCase)) if (m_shares[index].Equals(shareName, StringComparison.OrdinalIgnoreCase))
{ {
return index; return index;
} }

2
SMBServer/ServerUI.cs
View file

@ -261,7 +261,7 @@ namespace SMBServer
{ {
for (int index = 0; index < list.Count; index++) for (int index = 0; index < list.Count; index++)
{ {
if (string.Equals(list[index], value, StringComparison.InvariantCultureIgnoreCase)) if (string.Equals(list[index], value, StringComparison.OrdinalIgnoreCase))
{ {
return index; return index;
} }

2
SMBServer/UserCollection.cs
View file

@ -20,7 +20,7 @@ namespace SMBServer
{ {
for (int index = 0; index < this.Count; index++) for (int index = 0; index < this.Count; index++)
{ {
if (string.Equals(this[index].AccountName, accountName, StringComparison.InvariantCultureIgnoreCase)) if (string.Equals(this[index].AccountName, accountName, StringComparison.OrdinalIgnoreCase))
{ {
return index; return index;
} }