summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-05-09 14:35:55 +1000
committerJeremy Allison <jra@samba.org>2012-05-09 13:17:28 +0200
commitd46ddfa748523b5d75c7ea2bb5664bfb48ab3814 (patch)
tree1224b22771b90e932d9b57fa5f77f895c5699c8c /source3
parent0d87c0fe97056d6e8589f86d9403447e39f12745 (diff)
downloadsamba-d46ddfa748523b5d75c7ea2bb5664bfb48ab3814.tar.gz
samba-d46ddfa748523b5d75c7ea2bb5664bfb48ab3814.tar.bz2
samba-d46ddfa748523b5d75c7ea2bb5664bfb48ab3814.zip
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 <jra@samba.org> Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Wed May 9 13:17:29 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/posix_acls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index f54bfa1648..bbf0eae0f1 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;
}