zydronium/SMBLibrary
1
0
Fork 0
mirror of https://github.com/TalAloni/SMBLibrary.git synced 2025-08-15 11:43:46 +02:00
Code Issues Projects Releases Packages Wiki Activity

Set DeletePending if FILE_DELETE_ON_CLOSE has been set

Browse source
This commit is contained in:
Tal Aloni 2017-01-17 21:22:27 +02:00
parent 26ca17c4b9
commit d5dee56079
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
SMBLibrary/Server/SMB1/InfoHelper.cs
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved. /* Copyright (C) 2014-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
* *
* You can redistribute this program and/or modify it under the terms of * You can redistribute this program and/or modify it under the terms of
* the GNU Lesser Public License as published by the Free Software Foundation, * the GNU Lesser Public License as published by the Free Software Foundation,
@ -111,7 +111,7 @@ namespace SMBLibrary.Server.SMB1
} }
} }
internal static QueryInformation FromFileSystemEntry(FileSystemEntry entry, QueryInformationLevel informationLevel) internal static QueryInformation FromFileSystemEntry(FileSystemEntry entry, bool deletePending, QueryInformationLevel informationLevel)
{ {
switch (informationLevel) switch (informationLevel)
{ {
@ -164,6 +164,7 @@ namespace SMBLibrary.Server.SMB1
QueryFileStandardInfo result = new QueryFileStandardInfo(); QueryFileStandardInfo result = new QueryFileStandardInfo();
result.AllocationSize = GetAllocationSize(entry.Size); result.AllocationSize = GetAllocationSize(entry.Size);
result.EndOfFile = entry.Size; result.EndOfFile = entry.Size;
result.DeletePending = deletePending;
result.Directory = entry.IsDirectory; result.Directory = entry.IsDirectory;
return result; return result;
} }
@ -189,7 +190,7 @@ namespace SMBLibrary.Server.SMB1
result.LastChangeTime = entry.LastWriteTime; result.LastChangeTime = entry.LastWriteTime;
result.AllocationSize = GetAllocationSize(entry.Size); result.AllocationSize = GetAllocationSize(entry.Size);
result.EndOfFile = entry.Size; result.EndOfFile = entry.Size;
result.DeletePending = false; // We delete immediately result.DeletePending = deletePending;
result.Directory = entry.IsDirectory; result.Directory = entry.IsDirectory;
result.EASize = 0; result.EASize = 0;
result.FileName = entry.Name; result.FileName = entry.Name;

4
SMBLibrary/Server/SMB1/Transaction2SubcommandHelper.cs
View file

@ -253,7 +253,7 @@ namespace SMBLibrary.Server.SMB1
return null; return null;
} }
Transaction2QueryPathInformationResponse response = new Transaction2QueryPathInformationResponse(); Transaction2QueryPathInformationResponse response = new Transaction2QueryPathInformationResponse();
QueryInformation queryInformation = InfoHelper.FromFileSystemEntry(entry, subcommand.InformationLevel); QueryInformation queryInformation = InfoHelper.FromFileSystemEntry(entry, false, subcommand.InformationLevel);
response.SetQueryInformation(queryInformation); response.SetQueryInformation(queryInformation);
return response; return response;
@ -277,7 +277,7 @@ namespace SMBLibrary.Server.SMB1
return null; return null;
} }
Transaction2QueryFileInformationResponse response = new Transaction2QueryFileInformationResponse(); Transaction2QueryFileInformationResponse response = new Transaction2QueryFileInformationResponse();
QueryInformation queryInformation = InfoHelper.FromFileSystemEntry(entry, subcommand.InformationLevel); QueryInformation queryInformation = InfoHelper.FromFileSystemEntry(entry, openFile.DeleteOnClose, subcommand.InformationLevel);
response.SetQueryInformation(queryInformation); response.SetQueryInformation(queryInformation);
return response; return response;