Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-04-22 08:23:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

dll: FSP_FILE_SYSTEM_INTERFACE: rename GetSecurity to GetSecurityByName

Browse Source
This commit is contained in:
Bill Zissimopoulos 2016-02-17 11:08:46 -08:00
parent 40a9feb237
commit 9514bcfd8c
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/winfsp/winfsp.h
View File

@ -42,7 +42,7 @@ typedef struct _FSP_FILE_SYSTEM_INTERFACE
FSP_FSCTL_TRANSACT_REQ *Request, FSP_FSCTL_TRANSACT_REQ *Request,
PWSTR VolumeLabel, PWSTR VolumeLabel,
FSP_FSCTL_VOLUME_INFO *VolumeInfo); FSP_FSCTL_VOLUME_INFO *VolumeInfo);
NTSTATUS (*GetSecurity)(FSP_FILE_SYSTEM *FileSystem, NTSTATUS (*GetSecurityByName)(FSP_FILE_SYSTEM *FileSystem,
PWSTR FileName, PUINT32 PFileAttributes, PWSTR FileName, PUINT32 PFileAttributes,
PSECURITY_DESCRIPTOR SecurityDescriptor, SIZE_T *PSecurityDescriptorSize); PSECURITY_DESCRIPTOR SecurityDescriptor, SIZE_T *PSecurityDescriptorSize);
NTSTATUS (*Create)(FSP_FILE_SYSTEM *FileSystem, NTSTATUS (*Create)(FSP_FILE_SYSTEM *FileSystem,

8
src/dll/create.c
View File

@ -25,7 +25,7 @@ static NTSTATUS FspGetSecurity(FSP_FILE_SYSTEM *FileSystem,
{ {
for (;;) for (;;)
{ {
NTSTATUS Result = FileSystem->Interface->GetSecurity(FileSystem, NTSTATUS Result = FileSystem->Interface->GetSecurityByName(FileSystem,
FileName, PFileAttributes, *PSecurityDescriptor, PSecurityDescriptorSize); FileName, PFileAttributes, *PSecurityDescriptor, PSecurityDescriptorSize);
if (STATUS_BUFFER_OVERFLOW != Result) if (STATUS_BUFFER_OVERFLOW != Result)
return Result; return Result;
@ -47,7 +47,7 @@ FSP_API NTSTATUS FspAccessCheckEx(FSP_FILE_SYSTEM *FileSystem,
if (0 != PSecurityDescriptor) if (0 != PSecurityDescriptor)
*PSecurityDescriptor = 0; *PSecurityDescriptor = 0;
if (0 == FileSystem->Interface->GetSecurity || if (0 == FileSystem->Interface->GetSecurityByName ||
(!Request->Req.Create.UserMode && 0 == PSecurityDescriptor)) (!Request->Req.Create.UserMode && 0 == PSecurityDescriptor))
{ {
*PGrantedAccess = (MAXIMUM_ALLOWED & DesiredAccess) ? *PGrantedAccess = (MAXIMUM_ALLOWED & DesiredAccess) ?
@ -538,9 +538,9 @@ static NTSTATUS FspFileSystemOpCreate_FileOpenTargetDirectory(FSP_FILE_SYSTEM *F
return Result; return Result;
Information = FILE_OPENED; Information = FILE_OPENED;
if (0 != FileSystem->Interface->GetSecurity) if (0 != FileSystem->Interface->GetSecurityByName)
{ {
Result = FileSystem->Interface->GetSecurity(FileSystem, (PWSTR)Request->Buffer, 0, 0, 0); Result = FileSystem->Interface->GetSecurityByName(FileSystem, (PWSTR)Request->Buffer, 0, 0, 0);
Information = NT_SUCCESS(Result) ? FILE_EXISTS : FILE_DOES_NOT_EXIST; Information = NT_SUCCESS(Result) ? FILE_EXISTS : FILE_DOES_NOT_EXIST;
} }

12
src/sys/security.c
View File

@ -37,7 +37,8 @@ NTSTATUS FspFsvolQuerySecurityComplete(
{ {
FSP_ENTER_IOC(PAGED_CODE()); FSP_ENTER_IOC(PAGED_CODE());
FSP_LEAVE_IOC("%s", ""); FSP_LEAVE_IOC("FileObject=%p, SecurityInformation=%x",
IrpSp->FileObject, IrpSp->Parameters.QuerySecurity.SecurityInformation);
} }
static NTSTATUS FspFsvolSetSecurity( static NTSTATUS FspFsvolSetSecurity(
@ -53,7 +54,8 @@ NTSTATUS FspFsvolSetSecurityComplete(
{ {
FSP_ENTER_IOC(PAGED_CODE()); FSP_ENTER_IOC(PAGED_CODE());
FSP_LEAVE_IOC("%s", ""); FSP_LEAVE_IOC("FileObject=%p, SecurityInformation=%x",
IrpSp->FileObject, IrpSp->Parameters.SetSecurity.SecurityInformation);
} }
NTSTATUS FspQuerySecurity( NTSTATUS FspQuerySecurity(
@ -69,7 +71,8 @@ NTSTATUS FspQuerySecurity(
FSP_RETURN(Result = STATUS_INVALID_DEVICE_REQUEST); FSP_RETURN(Result = STATUS_INVALID_DEVICE_REQUEST);
} }
FSP_LEAVE_MJ("%s", ""); FSP_LEAVE_MJ("FileObject=%p, SecurityInformation=%x",
IrpSp->FileObject, IrpSp->Parameters.QuerySecurity.SecurityInformation);
} }
NTSTATUS FspSetSecurity( NTSTATUS FspSetSecurity(
@ -85,5 +88,6 @@ NTSTATUS FspSetSecurity(
FSP_RETURN(Result = STATUS_INVALID_DEVICE_REQUEST); FSP_RETURN(Result = STATUS_INVALID_DEVICE_REQUEST);
} }
FSP_LEAVE_MJ("%s", ""); FSP_LEAVE_MJ("FileObject=%p, SecurityInformation=%x",
IrpSp->FileObject, IrpSp->Parameters.SetSecurity.SecurityInformation);
} }

4
tst/winfsp-tests/memfs.cpp
View File

@ -229,7 +229,7 @@ static NTSTATUS SetVolumeLabel(FSP_FILE_SYSTEM *FileSystem,
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
static NTSTATUS GetSecurity(FSP_FILE_SYSTEM *FileSystem, static NTSTATUS GetSecurityByName(FSP_FILE_SYSTEM *FileSystem,
PWSTR FileName, PUINT32 PFileAttributes, PWSTR FileName, PUINT32 PFileAttributes,
PSECURITY_DESCRIPTOR SecurityDescriptor, SIZE_T *PSecurityDescriptorSize) PSECURITY_DESCRIPTOR SecurityDescriptor, SIZE_T *PSecurityDescriptorSize)
{ {
@ -557,7 +557,7 @@ static FSP_FILE_SYSTEM_INTERFACE MemfsInterface =
{ {
GetVolumeInfo, GetVolumeInfo,
SetVolumeLabel, SetVolumeLabel,
GetSecurity, GetSecurityByName,
Create, Create,
Open, Open,
Overwrite, Overwrite,