summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/lib/util_sid.c3
-rw-r--r--source3/smbd/posix_acls.c1
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;
}