[SCM] Samba Shared Repository - branch v3-4-test updated

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  b206d75... s3:pdb_ldap: fix bug 7507 - init_sam_from_ldap stores group in sid2uid cache (cherry picked from commit ba809ecb8ab217e4376bf75d2300e146b62b88eb) (cherry picked from commit cc740fb5eb56a0875703753d4a116d2fe33ec186)
      from  5fbf50d... s3-netdomjoin-gui: Fix Bug #7500. Fix 'not a string literal' warning in netdomjoin-gui.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit b206d75ca5ba04a866a22dfca5b7441fb49078d8
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 10 11:56:15 2010 +0200

    s3:pdb_ldap: fix bug 7507 - init_sam_from_ldap stores group in sid2uid cache
    (cherry picked from commit ba809ecb8ab217e4376bf75d2300e146b62b88eb)
    (cherry picked from commit cc740fb5eb56a0875703753d4a116d2fe33ec186)

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

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


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index f95f912..249a990 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -1106,7 +1106,7 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state,
 		if (primary_gsid && sid_equal(primary_gsid, &mapped_gsid)) {
 			store_gid_sid_cache(primary_gsid,
 					    sampass->unix_pw->pw_gid);
-			idmap_cache_set_sid2uid(primary_gsid,
+			idmap_cache_set_sid2gid(primary_gsid,
 						sampass->unix_pw->pw_gid);
 		}
 	}


-- 
Samba Shared Repository