1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00

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 commit is contained in:
Jeremy Allison -
parent b522892215
commit a4d7496994

View File

@ -1003,12 +1003,12 @@ static BOOL create_canon_ace_lists(files_struct *fsp,
if (nt4_compatible_acls()) if (nt4_compatible_acls())
psa->flags |= SEC_ACE_FLAG_INHERIT_ONLY; 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)) { } else if (sid_to_gid( &current_ace->trustee, &current_ace->unix_ug.gid, &sid_type)) {
current_ace->owner_type = GID_ACE; current_ace->owner_type = GID_ACE;
current_ace->type = SMB_ACL_GROUP; 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 { } else {
fstring str; fstring str;