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)

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index bac035a821607e65604279ba582478f4f1c03ed3..89d8ce5239a68a388607334ea2086dc930e5caf6 100644 (file)
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -307,7 +307,7 @@ static size_t skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
        return 0;
 }
 
-static size_t skel_get_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
+static size_t skel_get_nt_acl(vfs_handle_struct *handle,
        const char *name, uint32 security_info, SEC_DESC **ppdesc)
 {
        errno = ENOSYS;

diff --git a/source3/modules/vfs_aixacl2.c b/source3/modules/vfs_aixacl2.c
index 7745c97364313a3faa8b0619af8ed6e7279c9b32..23c4d88134740bd42d071f85e3f7b69941f4f64a 100644 (file)
--- 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 7ffb3109758a5b41ca3b1609163dae7bf7eb0491..47d178a33f16eaf7d9e85a6f0b2506d12a155e0a 100644 (file)
--- 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 6aa47aff9b1ea68e2dc9f88b40bc90fd582fcc63..1224ec3edb45355cb7e798740d6bfbc67658a608 100644 (file)
--- 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;
 }