diff options
| author | Jeremy Allison <jra@samba.org> | 2007-04-30 16:32:17 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:50 -0500 |
| commit | f5d6c8e0d77683af8818a37e7daaa169cc6fd0f9 (patch) | |
| tree | 7252b39b34f6e9275ec8d338b522cc36e9310de8 /source3 | |
| parent | 879081236d634c6483ac17a563171ad30f3af53b (diff) | |
| download | samba-f5d6c8e0d77683af8818a37e7daaa169cc6fd0f9.tar.gz samba-f5d6c8e0d77683af8818a37e7daaa169cc6fd0f9.tar.bz2 samba-f5d6c8e0d77683af8818a37e7daaa169cc6fd0f9.zip | |
r22611: Fix from Jens Nissen <jens.nissen@gmx.net>. 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.
(This used to be commit 10649540ac11e679997f414d4a6b12d057bd7913)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/util_sid.c | 3 | ||||
| -rw-r--r-- | source3/smbd/posix_acls.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c index c89abc916f..032be9aa93 100644 --- a/source3/lib/util_sid.c +++ b/source3/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/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index cdb60a23e7..7eda998547 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/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; } |