From: Christian Ambach Date: Mon, 5 Nov 2012 17:49:54 +0000 (+0100) Subject: s3:modules:nfs4_acls remove unused mem_ctx parameter to smbacl4_fill_ace4 X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=e6a100e86b7adf1c06a7c06b24fa50717ddcdb67;hp=c9d70740e39722a2f98ccd932b053723a4f3de62;p=obnox%2Fsamba%2Fsamba-obnox.git s3:modules:nfs4_acls remove unused mem_ctx parameter to smbacl4_fill_ace4 Signed-off-by: Christian Ambach Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Sat Nov 17 01:11:07 CET 2012 on sn-devel-104 --- diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index 1b691c3b5f4..67db6b023c5 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -580,7 +580,6 @@ static SMB_ACE4PROP_T *smbacl4_find_equal_special( static bool smbacl4_fill_ace4( - TALLOC_CTX *mem_ctx, const struct smb_filename *filename, smbacl4_vfs_params *params, uid_t ownerUID, @@ -701,7 +700,6 @@ static SMB4ACL_T *smbacl4_win2nfs4( { SMB4ACL_T *theacl; uint32 i; - TALLOC_CTX *mem_ctx = talloc_tos(); const char *filename = fsp->fsp_name->base_name; DEBUG(10, ("smbacl4_win2nfs4 invoked\n")); @@ -714,7 +712,7 @@ static SMB4ACL_T *smbacl4_win2nfs4( SMB_ACE4PROP_T ace_v4; bool addNewACE = True; - if (!smbacl4_fill_ace4(mem_ctx, fsp->fsp_name, pparams, + if (!smbacl4_fill_ace4(fsp->fsp_name, pparams, ownerUID, ownerGID, dacl->aces + i, &ace_v4)) { DEBUG(3, ("Could not fill ace for file %s, SID %s\n",