[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  c06d602 s3:smbd: Fix typo in got_duplicate_group check
      from  01f188a build: add DMAPI configure option and checks

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c06d602d7f3b8d3da972071a1b5392c6b145133f
Author: Arvid Requate <requate at univention.de>
Date:   Sat Nov 10 10:40:32 2012 +0100

    s3:smbd: Fix typo in got_duplicate_group check
    
    Reviewed by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Sat Nov 10 20:25:48 CET 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/posix_acls.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index fadd229..d46a16d 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -1609,7 +1609,7 @@ static bool ensure_canon_entry_valid_on_set(connection_struct *conn,
 			/* Already got one. */
 			got_duplicate_user = true;
 		} else if (pace->type == SMB_ACL_GROUP &&
-				pace->unix_ug.id == pace_user->unix_ug.id) {
+				pace->unix_ug.id == pace_group->unix_ug.id) {
 			/* Already got one. */
 			got_duplicate_group = true;
 		} else if ((pace->type == SMB_ACL_GROUP)


-- 
Samba Shared Repository