The branch, v3-3-test has been updated
via cb49b48e5cb1d8530292bac41052ef163fddec43 (commit)
from a2c751a26b3f85e96e91c3a65c94c2e6fba30e3c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit cb49b48e5cb1d8530292bac41052ef163fddec43
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date: Thu Aug 14 10:40:14 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 bac035a..89d8ce5 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 7745c97..23c4d88 100644
--- a/source/modules/vfs_aixacl2.c
+++ b/source/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/source/modules/vfs_catia.c b/source/modules/vfs_catia.c
index 7ffb310..47d178a 100644
--- a/source/modules/vfs_catia.c
+++ b/source/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/source/modules/vfs_full_audit.c b/source/modules/vfs_full_audit.c
index 6aa47af..1224ec3 100644
--- a/source/modules/vfs_full_audit.c
+++ b/source/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;
}
--
Samba Shared Repository
