[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2908-g12b4ed7]

[Jeremy Allison]

Karolin,

This needs pulling for 3.2.2.

Thanks,

Jeremy.
----- Forwarded message from Jeremy Allison <jra@xxxxxxxxx> -----

To: samba-cvs@xxxxxxxxx
From: Jeremy Allison <jra@xxxxxxxxx>
Subject: [SCM] Samba Shared Repository - branch v3-2-test updated -
        release-3-2-0pre2-2908-g12b4ed7
Reply-To: samba-technical@xxxxxxxxxxxxxxx

The branch, v3-2-test has been updated
       via  12b4ed7c3c10a6a29d108f6a83d961bf19751ca7 (commit)
      from  8e4f9b935f57f73c0f1a653ac02b59677c1192d1 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 12b4ed7c3c10a6a29d108f6a83d961bf19751ca7
Author: Jeremy Allison <jra@xxxxxxxxx>
Date:   Thu Aug 14 11:00:47 2008 -0700

    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.

-----------------------------------------------------------------------

Summary of changes:
 examples/VFS/skel_opaque.c      |    2 +-
 source/modules/vfs_aixacl2.c    |    2 +-
 source/modules/vfs_catia.c      |    2 +-
 source/modules/vfs_full_audit.c |    5 ++---
 4 files changed, 5 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index eb49f35..ee9ae1d 100644
--- 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/source/modules/vfs_aixacl2.c b/source/modules/vfs_aixacl2.c
index ecb2a09..89be219 100644
--- a/source/modules/vfs_aixacl2.c
+++ b/source/modules/vfs_aixacl2.c
@@ -180,7 +180,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/source/modules/vfs_catia.c b/source/modules/vfs_catia.c
index ab48c96..51ee435 100644
--- a/source/modules/vfs_catia.c
+++ b/source/modules/vfs_catia.c
@@ -286,7 +286,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/source/modules/vfs_full_audit.c b/source/modules/vfs_full_audit.c
index 4a66fb4..68dd0b8 100644
--- a/source/modules/vfs_full_audit.c
+++ b/source/modules/vfs_full_audit.c
@@ -199,7 +199,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,
@@ -1572,7 +1572,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)
@@ -1582,7 +1581,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;
 }


-- 
Samba Shared Repository

----- End forwarded message -----