diff options
| author | Michael Adam <obnox@samba.org> | 2007-11-06 08:01:31 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2007-12-19 23:07:56 +0100 |
| commit | 8e2323e391e312e0f0284c918e2bb8567c035e20 (patch) | |
| tree | 1ef9f07a74473e6b7f6c2d46b5ef1107981effed /source3/modules | |
| parent | a7e15d41c66e811777e52fbfa19df817d8617d5a (diff) | |
| download | samba-8e2323e391e312e0f0284c918e2bb8567c035e20.tar.gz samba-8e2323e391e312e0f0284c918e2bb8567c035e20.tar.bz2 samba-8e2323e391e312e0f0284c918e2bb8567c035e20.zip | |
Split get_nt_acl() into two functions: fsp- and non-fsp variant.
Replace smbd/posix_acls.c:get_nt_acl() by two funcions:
posix_get_nt_acl() and posix_fget_nt_acl(). The first
takes a connection struct and a file name instead of a
files_struct pointer. This is in preparation of changing
the vfs api for SMB_VFS_GET_NT_ACL.
Michael
(This used to be commit 50c82cc1456736fa634fb656e63555319742f725)
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/vfs_aixacl2.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_default.c | 4 | ||||
| -rw-r--r-- | source3/modules/vfs_gpfs.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source3/modules/vfs_aixacl2.c b/source3/modules/vfs_aixacl2.c index 756977df4f..ab7c75691c 100644 --- a/source3/modules/vfs_aixacl2.c +++ b/source3/modules/vfs_aixacl2.c @@ -170,7 +170,7 @@ static NTSTATUS aixjfs2_get_nt_acl_common(files_struct *fsp, if (retryPosix) { DEBUG(10, ("retrying with posix acl...\n")); - return get_nt_acl(fsp, security_info, ppdesc); + return posix_fget_nt_acl(fsp, security_info, ppdesc); } if (result==False) return NT_STATUS_ACCESS_DENIED; diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index cce5430493..3dd3727340 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -950,7 +950,7 @@ static NTSTATUS vfswrap_fget_nt_acl(vfs_handle_struct *handle, NTSTATUS result; START_PROFILE(fget_nt_acl); - result = get_nt_acl(fsp, security_info, ppdesc); + result = posix_fget_nt_acl(fsp, security_info, ppdesc); END_PROFILE(fget_nt_acl); return result; } @@ -962,7 +962,7 @@ static NTSTATUS vfswrap_get_nt_acl(vfs_handle_struct *handle, NTSTATUS result; START_PROFILE(get_nt_acl); - result = get_nt_acl(fsp, security_info, ppdesc); + result = posix_get_nt_acl(fsp->conn, fsp->fsp_name, security_info, ppdesc); END_PROFILE(get_nt_acl); return result; } diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index c207bbfe2d..91d38874b9 100644 --- a/source3/modules/vfs_gpfs.c +++ b/source3/modules/vfs_gpfs.c @@ -240,7 +240,7 @@ static NTSTATUS gpfsacl_get_nt_acl_common(files_struct *fsp, if (result > 0) { DEBUG(10, ("retrying with posix acl...\n")); - return get_nt_acl(fsp, security_info, ppdesc); + return posix_fget_nt_acl(fsp, security_info, ppdesc); } /* GPFS ACL was not read, something wrong happened, error code is set in errno */ |