From: Jeremy Allison Date: Mon, 30 Apr 2007 16:32:17 +0000 (+0000) Subject: r22611: Fix from Jens Nissen . Fix bad X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~573 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10649540ac11e679997f414d4a6b12d057bd7913;p=thirdparty%2Fsamba.git r22611: Fix from Jens Nissen . Fix bad memory leak I introduced into acl code, also remove redundent extra check for global_sid_System : global_sid_System == S-1-5-18 which is already included in the check for a domain of global_sid_NT_Authority == S-1-5 Jeremy. --- diff --git a/source/lib/util_sid.c b/source/lib/util_sid.c index c89abc916f2..032be9aa93b 100644 --- a/source/lib/util_sid.c +++ b/source/lib/util_sid.c @@ -510,9 +510,6 @@ BOOL non_mappable_sid(DOM_SID *sid) DOM_SID dom; uint32 rid; - if (sid_equal(sid, &global_sid_System)) - return True; - sid_copy(&dom, sid); sid_split_rid(&dom, &rid); diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c index cdb60a23e72..7eda998547e 100644 --- a/source/smbd/posix_acls.c +++ b/source/smbd/posix_acls.c @@ -1413,6 +1413,7 @@ static BOOL create_canon_ace_lists(files_struct *fsp, SMB_STRUCT_STAT *pst, if (non_mappable_sid(&psa->trustee)) { DEBUG(10,("create_canon_ace_lists: ignoring non-mappable SID %s\n", sid_to_string(str, &psa->trustee) )); + SAFE_FREE(current_ace); continue; }