mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
Remove superfluous parameter fd from SMB_VFS_FSET_NT_ACL().
Michael
This commit is contained in:
parent
8fce247bcf
commit
4f2d139a18
@ -78,6 +78,7 @@
|
||||
/* Leave at 22 - not yet released. Change get_nt_acl to *not* take a
|
||||
* files_struct. - obnox.*/
|
||||
/* Leave at 22 - not yet released. Remove parameter fd from fget_nt_acl. - obnox */
|
||||
/* Leave at 22 - not yet released. Remove parameter fd from gset_nt_acl. - obnox */
|
||||
|
||||
#define SMB_VFS_INTERFACE_VERSION 22
|
||||
|
||||
@ -320,7 +321,6 @@ struct vfs_ops {
|
||||
struct security_descriptor **ppdesc);
|
||||
NTSTATUS (*fset_nt_acl)(struct vfs_handle_struct *handle,
|
||||
struct files_struct *fsp,
|
||||
int fd,
|
||||
uint32 security_info_sent,
|
||||
struct security_descriptor *psd);
|
||||
NTSTATUS (*set_nt_acl)(struct vfs_handle_struct *handle,
|
||||
|
@ -86,7 +86,7 @@
|
||||
/* NT ACL operations. */
|
||||
#define SMB_VFS_FGET_NT_ACL(fsp, security_info, ppdesc) ((fsp)->conn->vfs.ops.fget_nt_acl((fsp)->conn->vfs.handles.fget_nt_acl, (fsp), (security_info), (ppdesc)))
|
||||
#define SMB_VFS_GET_NT_ACL(conn, name, security_info, ppdesc) ((conn)->vfs.ops.get_nt_acl((conn)->vfs.handles.get_nt_acl, (name), (security_info), (ppdesc)))
|
||||
#define SMB_VFS_FSET_NT_ACL(fsp, fd, security_info_sent, psd) ((fsp)->conn->vfs.ops.fset_nt_acl((fsp)->conn->vfs.handles.fset_nt_acl, (fsp), (fd), (security_info_sent), (psd)))
|
||||
#define SMB_VFS_FSET_NT_ACL(fsp, security_info_sent, psd) ((fsp)->conn->vfs.ops.fset_nt_acl((fsp)->conn->vfs.handles.fset_nt_acl, (fsp), (security_info_sent), (psd)))
|
||||
#define SMB_VFS_SET_NT_ACL(fsp, name, security_info_sent, psd) ((fsp)->conn->vfs.ops.set_nt_acl((fsp)->conn->vfs.handles.set_nt_acl, (fsp), (name), (security_info_sent), (psd)))
|
||||
|
||||
/* POSIX ACL operations. */
|
||||
@ -205,7 +205,7 @@
|
||||
/* NT ACL operations. */
|
||||
#define SMB_VFS_OPAQUE_FGET_NT_ACL(fsp, security_info, ppdesc) ((fsp)->conn->vfs_opaque.ops.fget_nt_acl((fsp)->conn->vfs_opaque.handles.fget_nt_acl, (fsp), (security_info), (ppdesc)))
|
||||
#define SMB_VFS_OPAQUE_GET_NT_ACL(conn, name, security_info, ppdesc) ((conn)->vfs_opaque.ops.get_nt_acl((conn)->vfs_opaque.handles.get_nt_acl, (name), (security_info), (ppdesc)))
|
||||
#define SMB_VFS_OPAQUE_FSET_NT_ACL(fsp, fd, security_info_sent, psd) ((fsp)->conn->vfs_opaque.ops.fset_nt_acl((fsp)->conn->vfs_opaque.handles.fset_nt_acl, (fsp), (fd), (security_info_sent), (psd)))
|
||||
#define SMB_VFS_OPAQUE_FSET_NT_ACL(fsp, security_info_sent, psd) ((fsp)->conn->vfs_opaque.ops.fset_nt_acl((fsp)->conn->vfs_opaque.handles.fset_nt_acl, (fsp), (security_info_sent), (psd)))
|
||||
#define SMB_VFS_OPAQUE_SET_NT_ACL(fsp, name, security_info_sent, psd) ((fsp)->conn->vfs_opaque.ops.set_nt_acl((fsp)->conn->vfs_opaque.handles.set_nt_acl, (fsp), (name), (security_info_sent), (psd)))
|
||||
|
||||
/* POSIX ACL operations. */
|
||||
@ -325,7 +325,7 @@
|
||||
/* NT ACL operations. */
|
||||
#define SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp, security_info, ppdesc) ((handle)->vfs_next.ops.fget_nt_acl((handle)->vfs_next.handles.fget_nt_acl, (fsp), (security_info), (ppdesc)))
|
||||
#define SMB_VFS_NEXT_GET_NT_ACL(handle, name, security_info, ppdesc) ((handle)->vfs_next.ops.get_nt_acl((handle)->vfs_next.handles.get_nt_acl, (name), (security_info), (ppdesc)))
|
||||
#define SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, fd, security_info_sent, psd) ((handle)->vfs_next.ops.fset_nt_acl((handle)->vfs_next.handles.fset_nt_acl, (fsp), (fd), (security_info_sent), (psd)))
|
||||
#define SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent, psd) ((handle)->vfs_next.ops.fset_nt_acl((handle)->vfs_next.handles.fset_nt_acl, (fsp), (security_info_sent), (psd)))
|
||||
#define SMB_VFS_NEXT_SET_NT_ACL(handle, fsp, name, security_info_sent, psd) ((handle)->vfs_next.ops.set_nt_acl((handle)->vfs_next.handles.set_nt_acl, (fsp), (name), (security_info_sent), (psd)))
|
||||
|
||||
/* POSIX ACL operations. */
|
||||
|
@ -1039,7 +1039,7 @@ static NTSTATUS afsacl_get_nt_acl(struct vfs_handle_struct *handle,
|
||||
|
||||
NTSTATUS afsacl_fset_nt_acl(vfs_handle_struct *handle,
|
||||
files_struct *fsp,
|
||||
int fd, uint32 security_info_sent,
|
||||
uint32 security_info_sent,
|
||||
SEC_DESC *psd)
|
||||
{
|
||||
return afs_set_nt_acl(handle, fsp, security_info_sent, psd);
|
||||
|
@ -399,7 +399,7 @@ static NTSTATUS aixjfs2_set_nt_acl_common(files_struct *fsp, uint32 security_inf
|
||||
return result;
|
||||
}
|
||||
|
||||
NTSTATUS aixjfs2_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, int fd, uint32 security_info_sent, SEC_DESC *psd)
|
||||
NTSTATUS aixjfs2_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
|
||||
{
|
||||
return aixjfs2_set_nt_acl_common(fsp, security_info_sent, psd);
|
||||
}
|
||||
|
@ -967,7 +967,7 @@ static NTSTATUS vfswrap_get_nt_acl(vfs_handle_struct *handle,
|
||||
return result;
|
||||
}
|
||||
|
||||
static NTSTATUS vfswrap_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, int fd, uint32 security_info_sent, SEC_DESC *psd)
|
||||
static NTSTATUS vfswrap_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
|
||||
{
|
||||
NTSTATUS result;
|
||||
|
||||
|
@ -197,7 +197,7 @@ static NTSTATUS smb_full_audit_get_nt_acl(vfs_handle_struct *handle, files_struc
|
||||
const char *name, uint32 security_info,
|
||||
SEC_DESC **ppdesc);
|
||||
static NTSTATUS smb_full_audit_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
|
||||
int fd, uint32 security_info_sent,
|
||||
uint32 security_info_sent,
|
||||
SEC_DESC *psd);
|
||||
static NTSTATUS smb_full_audit_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
|
||||
const char *name, uint32 security_info_sent,
|
||||
@ -1555,13 +1555,12 @@ static NTSTATUS smb_full_audit_get_nt_acl(vfs_handle_struct *handle,
|
||||
}
|
||||
|
||||
static NTSTATUS smb_full_audit_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
|
||||
int fd, uint32 security_info_sent,
|
||||
uint32 security_info_sent,
|
||||
SEC_DESC *psd)
|
||||
{
|
||||
NTSTATUS result;
|
||||
|
||||
result = SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, fd, security_info_sent,
|
||||
psd);
|
||||
result = SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent, psd);
|
||||
|
||||
do_log(SMB_VFS_OP_FSET_NT_ACL, NT_STATUS_IS_OK(result), handle, "%s", fsp->fsp_name);
|
||||
|
||||
|
@ -363,7 +363,7 @@ static NTSTATUS gpfsacl_set_nt_acl_internal(files_struct *fsp, uint32 security_i
|
||||
return result;
|
||||
}
|
||||
|
||||
static NTSTATUS gpfsacl_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, int fd, uint32 security_info_sent, SEC_DESC *psd)
|
||||
static NTSTATUS gpfsacl_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
|
||||
{
|
||||
return gpfsacl_set_nt_acl_internal(fsp, security_info_sent, psd);
|
||||
}
|
||||
|
@ -206,7 +206,7 @@ static NTSTATUS zfsacl_get_nt_acl(struct vfs_handle_struct *handle,
|
||||
|
||||
static NTSTATUS zfsacl_fset_nt_acl(vfs_handle_struct *handle,
|
||||
files_struct *fsp,
|
||||
int fd, uint32 security_info_sent,
|
||||
uint32 security_info_sent,
|
||||
SEC_DESC *psd)
|
||||
{
|
||||
return zfs_set_nt_acl(handle, fsp, security_info_sent, psd);
|
||||
|
@ -769,8 +769,7 @@ static NTSTATUS set_sd(files_struct *fsp, uint8 *data, uint32 sd_len,
|
||||
}
|
||||
|
||||
if (fsp->fh->fd != -1) {
|
||||
status = SMB_VFS_FSET_NT_ACL(fsp, fsp->fh->fd,
|
||||
security_info_sent, psd);
|
||||
status = SMB_VFS_FSET_NT_ACL(fsp, security_info_sent, psd);
|
||||
}
|
||||
else {
|
||||
status = SMB_VFS_SET_NT_ACL(fsp, fsp->fsp_name,
|
||||
|
@ -2621,8 +2621,7 @@ NTSTATUS create_file_unixpath(connection_struct *conn,
|
||||
|
||||
fsp->access_mask = FILE_GENERIC_ALL;
|
||||
|
||||
status = SMB_VFS_FSET_NT_ACL(
|
||||
fsp, fsp->fh->fd, sec_info_sent, sd);
|
||||
status = SMB_VFS_FSET_NT_ACL(fsp, sec_info_sent, sd);
|
||||
|
||||
fsp->access_mask = saved_access_mask;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user