diff options
| author | Jeremy Allison <jra@samba.org> | 2004-04-05 14:27:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:51:06 -0500 |
| commit | bca29e537741da5a361bb28b0246d1bfac326434 (patch) | |
| tree | c1984f6c19cc299c9de3442f4c78749efa59b97b /source3/smbd | |
| parent | 991112a73cf2abd1761c0680b737fa724666820b (diff) | |
| download | samba-bca29e537741da5a361bb28b0246d1bfac326434.tar.gz samba-bca29e537741da5a361bb28b0246d1bfac326434.tar.bz2 samba-bca29e537741da5a361bb28b0246d1bfac326434.zip | |
r50: Fix bug 1139 as per fix suggested by jdev@panix.com,
swap lookups for user and group - group will do an
algorithmic lookup if it fails, user won't.
Jeremy.
(This used to be commit a205c56a75c93c82796fd68687e8c0db26459073)
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 620e123e14..25e8fd802b 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -1363,12 +1363,12 @@ static BOOL create_canon_ace_lists(files_struct *fsp, SMB_STRUCT_STAT *pst, if (nt4_compatible_acls()) psa->flags |= SEC_ACE_FLAG_INHERIT_ONLY; - } else if (NT_STATUS_IS_OK(sid_to_gid( ¤t_ace->trustee, ¤t_ace->unix_ug.gid))) { - current_ace->owner_type = GID_ACE; - current_ace->type = SMB_ACL_GROUP; } else if (NT_STATUS_IS_OK(sid_to_uid( ¤t_ace->trustee, ¤t_ace->unix_ug.uid))) { current_ace->owner_type = UID_ACE; current_ace->type = SMB_ACL_USER; + } else if (NT_STATUS_IS_OK(sid_to_gid( ¤t_ace->trustee, ¤t_ace->unix_ug.gid))) { + current_ace->owner_type = GID_ACE; + current_ace->type = SMB_ACL_GROUP; } else { fstring str; |