[SCM] Samba Shared Repository - branch v3-0-test updated -
release-3-0-28-109-g485ceda
Jeremy Allison
jra at samba.org
Fri Jan 25 02:23:25 GMT 2008
The branch, v3-0-test has been updated
via 485cedadb0e61775e6cb152f42f4dfdf17e82666 (commit)
from fc0508922417e9ef9a4450067d29d15121b52902 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -----------------------------------------------------------------
commit 485cedadb0e61775e6cb152f42f4dfdf17e82666
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 24 18:22:41 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 21ad422..f40a344 100644
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -1402,7 +1402,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