The branch, master has been updated
via d46ddfa s3-smbd: Fix the creation of duplicate SMB_ACL_GROUP entries
from 0d87c0f s3-spoolss: Set DWORD values correctly.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d46ddfa748523b5d75c7ea2bb5664bfb48ab3814
Author: Andrew Bartlett <[email protected]>
Date: Wed May 9 14:35:55 2012 +1000
s3-smbd: Fix the creation of duplicate SMB_ACL_GROUP entries
The issue was a simple copy and paste bug, which casued a duplicate
SMB_ACL_GROUP
to be added when we already had one.
Andrew Bartlett
Signed-off-by: Jeremy Allison <[email protected]>
Autobuild-User: Jeremy Allison <[email protected]>
Autobuild-Date: Wed May 9 13:17:29 CEST 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/posix_acls.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index f54bfa1..bbf0eae 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -1510,8 +1510,8 @@ static bool ensure_canon_entry_valid(connection_struct
*conn, canon_ace **pp_ace
pace->unix_ug.uid ==
pace_user->unix_ug.uid) {
/* Already got one. */
got_duplicate_user = true;
- } else if (pace->type == SMB_ACL_USER &&
- pace->unix_ug.uid ==
pace_user->unix_ug.uid) {
+ } else if (pace->type == SMB_ACL_GROUP &&
+ pace->unix_ug.gid ==
pace_user->unix_ug.gid) {
/* Already got one. */
got_duplicate_group = true;
}
--
Samba Shared Repository
