summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-01-24 18:22:43 -0800
committerJeremy Allison <jra@samba.org>2008-01-24 18:22:43 -0800
commit51f62beabd91c94374bcadf70ee1bcad20fd60ad (patch)
tree5fa867eed88d022f1f49f57dc0c11f0b4d36a46f
parentfccae57310dcd9b625c4f41be9548d2ed6d81427 (diff)
downloadsamba-51f62beabd91c94374bcadf70ee1bcad20fd60ad.tar.gz
samba-51f62beabd91c94374bcadf70ee1bcad20fd60ad.tar.bz2
samba-51f62beabd91c94374bcadf70ee1bcad20fd60ad.zip
Fix the same bug with user -> user_obj.
Jeremy. (This used to be commit c5edf7456955471b8590c2cfa67c7f47a387cdf0)
-rw-r--r--source3/smbd/posix_acls.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 9c015261b5..f60329a039 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -1474,7 +1474,13 @@ static bool create_canon_ace_lists(files_struct *fsp, SMB_STRUCT_STAT *pst,
} else if (sid_to_uid( &current_ace->trustee, &current_ace->unix_ug.uid)) {
current_ace->owner_type = UID_ACE;
- current_ace->type = SMB_ACL_USER;
+ /* If it's the owning user, this is a user_obj, not
+ * a user. */
+ if (current_ace->unix_ug.uid == pst->st_uid) {
+ current_ace->type = SMB_ACL_USER_OBJ;
+ } else {
+ current_ace->type = SMB_ACL_USER;
+ }
} else if (sid_to_gid( &current_ace->trustee, &current_ace->unix_ug.gid)) {
current_ace->owner_type = GID_ACE;
/* If it's the primary group, this is a group_obj, not