diff options
| author | Andrew Tridgell <tridge@samba.org> | 2003-04-01 11:12:42 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2003-04-01 11:12:42 +0000 |
| commit | d84acbc8aac11fa7f80de6de8b9c5b70b1c084d3 (patch) | |
| tree | 2bfd86fcff6fa019297f60dee117c5619d931ce4 /source3/smbd | |
| parent | 65d7f6afbad8a1a38d99612a96229e8ff1ba77a2 (diff) | |
| download | samba-d84acbc8aac11fa7f80de6de8b9c5b70b1c084d3.tar.gz samba-d84acbc8aac11fa7f80de6de8b9c5b70b1c084d3.tar.bz2 samba-d84acbc8aac11fa7f80de6de8b9c5b70b1c084d3.zip | |
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.
(This used to be commit b3edfa91964d2edfd1692fa58f98de00405e14c4)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/posix_acls.c | 6 |
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( ¤t_ace->trustee, ¤t_ace->unix_ug.uid, &sid_type)) { - current_ace->owner_type = UID_ACE; - current_ace->type = SMB_ACL_USER; } else if (sid_to_gid( ¤t_ace->trustee, ¤t_ace->unix_ug.gid, &sid_type)) { current_ace->owner_type = GID_ACE; current_ace->type = SMB_ACL_GROUP; + } else if (sid_to_uid( ¤t_ace->trustee, ¤t_ace->unix_ug.uid, &sid_type)) { + current_ace->owner_type = UID_ACE; + current_ace->type = SMB_ACL_USER; } else { fstring str; |