[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-test-1665-gc5edf74
Jeremy Allison
jra at samba.org
Fri Jan 25 02:23:21 GMT 2008
The branch, v3-2-test has been updated
via c5edf7456955471b8590c2cfa67c7f47a387cdf0 (commit)
from 4d302254fdfce2c267cf6b21f662d5aa2dc9c72c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit c5edf7456955471b8590c2cfa67c7f47a387cdf0
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 24 18:22:43 2008 -0800
Fix the same bug with user -> user_obj.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/smbd/posix_acls.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index 9c01526..f60329a 100644
--- a/source/smbd/posix_acls.c
+++ b/source/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( ¤t_ace->trustee, ¤t_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( ¤t_ace->trustee, ¤t_ace->unix_ug.gid)) {
current_ace->owner_type = GID_ACE;
/* If it's the primary group, this is a group_obj, not
--
Samba Shared Repository
More information about the samba-cvs
mailing list