diff options
| author | Jeremy Allison <jra@samba.org> | 2008-08-14 10:58:50 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-08-14 10:58:50 -0700 |
| commit | 9253044276fdf44bae2db2e232a47b229ebb0055 (patch) | |
| tree | 9847c6121278a4d80099bd88062b4ef85c9a863b /source3 | |
| parent | 762439025a522d4316278661119c6624b9ab2869 (diff) | |
| download | samba-9253044276fdf44bae2db2e232a47b229ebb0055.tar.gz samba-9253044276fdf44bae2db2e232a47b229ebb0055.tar.bz2 samba-9253044276fdf44bae2db2e232a47b229ebb0055.zip | |
Fix bug #5692 - Core dump in full_audit.so.
There were some function mismatches in the various GET_NT_ACL modules (some places the fsp parameter has not been removed).
Jeremy.
(This used to be commit 221cc5e21eb27cdad51f34ec6832467a7bd89213)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/modules/vfs_aixacl2.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_catia.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_full_audit.c | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/source3/modules/vfs_aixacl2.c b/source3/modules/vfs_aixacl2.c index 7745c97364..23c4d88134 100644 --- a/source3/modules/vfs_aixacl2.c +++ b/source3/modules/vfs_aixacl2.c @@ -177,7 +177,7 @@ static NTSTATUS aixjfs2_fget_nt_acl(vfs_handle_struct *handle, } static NTSTATUS aixjfs2_get_nt_acl(vfs_handle_struct *handle, - files_struct *fsp, const char *name, + const char *name, uint32 security_info, SEC_DESC **ppdesc) { SMB4ACL_T *pacl = NULL; diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c index 7ffb310975..47d178a33f 100644 --- a/source3/modules/vfs_catia.c +++ b/source3/modules/vfs_catia.c @@ -287,7 +287,7 @@ static char *catia_realpath(vfs_handle_struct *handle, return SMB_VFS_NEXT_REALPATH(handle, path, resolved_path); } -static NTSTATUS catia_get_nt_acl(vfs_handle_struct *handle, files_struct *fsp, +static NTSTATUS catia_get_nt_acl(vfs_handle_struct *handle, const char *name, uint32 security_info, struct security_descriptor **ppdesc) { diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index 6aa47aff9b..1224ec3edb 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -197,7 +197,7 @@ static NTSTATUS smb_full_audit_streaminfo(vfs_handle_struct *handle, static NTSTATUS smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp, uint32 security_info, SEC_DESC **ppdesc); -static NTSTATUS smb_full_audit_get_nt_acl(vfs_handle_struct *handle, files_struct *fsp, +static NTSTATUS smb_full_audit_get_nt_acl(vfs_handle_struct *handle, const char *name, uint32 security_info, SEC_DESC **ppdesc); static NTSTATUS smb_full_audit_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, @@ -1566,7 +1566,6 @@ static NTSTATUS smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_stru } static NTSTATUS smb_full_audit_get_nt_acl(vfs_handle_struct *handle, - files_struct *fsp, const char *name, uint32 security_info, SEC_DESC **ppdesc) @@ -1576,7 +1575,7 @@ static NTSTATUS smb_full_audit_get_nt_acl(vfs_handle_struct *handle, result = SMB_VFS_NEXT_GET_NT_ACL(handle, name, security_info, ppdesc); do_log(SMB_VFS_OP_GET_NT_ACL, NT_STATUS_IS_OK(result), handle, - "%s", fsp->fsp_name); + "%s", name); return result; } |