zydronium/SMBLibrary
1
0
Fork 0
mirror of https://github.com/TalAloni/SMBLibrary.git synced 2025-07-21 08:45:54 +02:00
Code Issues Projects Releases Packages Wiki Activity

SMB1FileStoreHelper: Delete / Rename: The status of SetFileInformation should be returned regardless of the status of CloseFile

Browse source
This commit is contained in:
Tal Aloni 2017-07-18 14:59:48 +03:00
parent 2f39e9072c
commit 2457d2c246
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
SMBLibrary/Server/SMB1/SMB1FileStoreHelper.cs
View file

@ -41,20 +41,20 @@ namespace SMBLibrary.Server.SMB1
{ {
object handle; object handle;
FileStatus fileStatus; FileStatus fileStatus;
NTStatus openStatus = fileStore.CreateFile(out handle, out fileStatus, path, DirectoryAccessMask.DELETE, 0, 0, CreateDisposition.FILE_OPEN, createOptions, securityContext); NTStatus status = fileStore.CreateFile(out handle, out fileStatus, path, DirectoryAccessMask.DELETE, 0, 0, CreateDisposition.FILE_OPEN, createOptions, securityContext);
if (openStatus != NTStatus.STATUS_SUCCESS) if (status != NTStatus.STATUS_SUCCESS)
{ {
return openStatus; return status;
} }
FileDispositionInformation fileDispositionInfo = new FileDispositionInformation(); FileDispositionInformation fileDispositionInfo = new FileDispositionInformation();
fileDispositionInfo.DeletePending = true; fileDispositionInfo.DeletePending = true;
NTStatus setStatus = fileStore.SetFileInformation(handle, fileDispositionInfo); status = fileStore.SetFileInformation(handle, fileDispositionInfo);
if (setStatus != NTStatus.STATUS_SUCCESS) if (status != NTStatus.STATUS_SUCCESS)
{ {
return setStatus; return status;
} }
NTStatus closeStatus = fileStore.CloseFile(handle); fileStore.CloseFile(handle);
return closeStatus; return status;
} }
public static NTStatus Rename(INTFileStore fileStore, string oldName, string newName, SMBFileAttributes searchAttributes, SecurityContext securityContext) public static NTStatus Rename(INTFileStore fileStore, string oldName, string newName, SMBFileAttributes searchAttributes, SecurityContext securityContext)
@ -68,21 +68,21 @@ namespace SMBLibrary.Server.SMB1
{ {
createOptions = CreateOptions.FILE_NON_DIRECTORY_FILE; createOptions = CreateOptions.FILE_NON_DIRECTORY_FILE;
} }
NTStatus openStatus = fileStore.CreateFile(out handle, out fileStatus, oldName, DirectoryAccessMask.DELETE, 0, 0, CreateDisposition.FILE_OPEN, createOptions, securityContext); NTStatus status = fileStore.CreateFile(out handle, out fileStatus, oldName, DirectoryAccessMask.DELETE, 0, 0, CreateDisposition.FILE_OPEN, createOptions, securityContext);
if (openStatus != NTStatus.STATUS_SUCCESS) if (status != NTStatus.STATUS_SUCCESS)
{ {
return openStatus; return status;
} }
FileRenameInformationType2 renameInfo = new FileRenameInformationType2(); FileRenameInformationType2 renameInfo = new FileRenameInformationType2();
renameInfo.ReplaceIfExists = false; renameInfo.ReplaceIfExists = false;
renameInfo.FileName = newName; renameInfo.FileName = newName;
NTStatus setStatus = fileStore.SetFileInformation(handle, renameInfo); status = fileStore.SetFileInformation(handle, renameInfo);
if (setStatus != NTStatus.STATUS_SUCCESS) if (status != NTStatus.STATUS_SUCCESS)
{ {
return setStatus; return status;
} }
NTStatus closeStatus = fileStore.CloseFile(handle); fileStore.CloseFile(handle);
return closeStatus; return status;
} }
public static NTStatus CheckDirectory(INTFileStore fileStore, string path, SecurityContext securityContext) public static NTStatus CheckDirectory(INTFileStore fileStore, string path, SecurityContext securityContext)