From: Volker Lendecke <vl@samba.org>
Date: Tue, 9 Jun 2009 19:46:04 +0000 (+0200)
Subject: Do not pull samAccountName twice
X-Git-Tag: tdb-1.1.5~126
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=9af9a43464d5e900b16b9ef29bbe516e70867e90

Do not pull samAccountName twice
---

diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c
index 4eb764f6161..4e63297436c 100644
--- a/source3/passdb/pdb_ads.c
+++ b/source3/passdb/pdb_ads.c
@@ -158,7 +158,6 @@ static NTSTATUS pdb_ads_init_sam_from_ads(struct pdb_methods *m,
 		goto fail;
 	}
 	pdb_set_username(sam, str, PDB_SET);
-	TALLOC_FREE(str);
 
 	if (pdb_ads_pull_time(entry, "lastLogon", &tmp_time)) {
 		pdb_set_logon_time(sam, tmp_time, PDB_SET);
@@ -173,12 +172,6 @@ static NTSTATUS pdb_ads_init_sam_from_ads(struct pdb_methods *m,
 		pdb_set_pass_last_set_time(sam, tmp_time, PDB_SET);
 	}
 
-	str = tldap_talloc_single_attribute(entry, "samAccoutName",
-					    talloc_tos());
-	if (str != NULL) {
-		pdb_set_username(sam, str, PDB_SET);
-	}
-
 	str = tldap_talloc_single_attribute(entry, "displayName",
 					    talloc_tos());
 	if (str != NULL) {