summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-04-01 18:12:06 +0000
committerJeremy Allison <jra@samba.org>2003-04-01 18:12:06 +0000
commitd8c1c54d3e8e75df4fc363b7bd0bc11d8bbe53ac (patch)
tree8ae0ae57b47c2f0c208dd0ab6a67056de730ad09
parent9660f5887e9c2b33e49d17fb9f9fb82f1d48e029 (diff)
downloadsamba-d8c1c54d3e8e75df4fc363b7bd0bc11d8bbe53ac.tar.gz
samba-d8c1c54d3e8e75df4fc363b7bd0bc11d8bbe53ac.tar.bz2
samba-d8c1c54d3e8e75df4fc363b7bd0bc11d8bbe53ac.zip
Doing janitor work for tridge.
"changed the order of checking whether a SID is a UID or a GID in posix acls. This is needed because sid_to_uid always claims that the sid is a user, due ot a change I made some months back. This change was suggested by Chere Zhou, but is really an interim measure. Chere is looking at a longer term solution." REMEMBER - 3.0 is the one we will SHIP ! Jeremy. (This used to be commit a4d7496994b740e074398d98c999a803afff4404)
-rw-r--r--source3/smbd/posix_acls.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 01e3c31ba7..d4d966a636 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -1003,12 +1003,12 @@ static BOOL create_canon_ace_lists(files_struct *fsp,
if (nt4_compatible_acls())
psa->flags |= SEC_ACE_FLAG_INHERIT_ONLY;
- } else if (sid_to_uid( &current_ace->trustee, &current_ace->unix_ug.uid, &sid_type)) {
- current_ace->owner_type = UID_ACE;
- current_ace->type = SMB_ACL_USER;
} else if (sid_to_gid( &current_ace->trustee, &current_ace->unix_ug.gid, &sid_type)) {
current_ace->owner_type = GID_ACE;
current_ace->type = SMB_ACL_GROUP;
+ } else if (sid_to_uid( &current_ace->trustee, &current_ace->unix_ug.uid, &sid_type)) {
+ current_ace->owner_type = UID_ACE;
+ current_ace->type = SMB_ACL_USER;
} else {
fstring str;