From 4e65f5ed8bf8dbc9a484c3fce069cfb597630b7b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 5 Jan 2010 13:30:42 +0100 Subject: [PATCH] s3:pdb_ldap: restore Samba 3.0.x behavior and use the first "uid" value. See bug #6157 for more details. metze Signed-off-by: Stefan Metzmacher (cherry picked from commit 25806f43ddee7e2653e907eea2c6fcc075960fa1) (cherry picked from commit ac224452b94865db346ed68dc517f84d40e6303c) (cherry picked from commit 13fd42e84025dd0427ec8454c56f07869a3af962) --- source3/passdb/pdb_ldap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index 90ac8e5ffa7..32d63e228ac 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -560,7 +560,7 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state, goto fn_exit; } - if (!(username = smbldap_talloc_smallest_attribute(priv2ld(ldap_state), + if (!(username = smbldap_talloc_first_attribute(priv2ld(ldap_state), entry, "uid", ctx))) { -- 2.11.4.GIT