[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2201-g9af9a43

[Volker Lendecke]

The branch, master has been updated
       via  9af9a43464d5e900b16b9ef29bbe516e70867e90 (commit)
      from  a18341dab955dc0ffce6e787de1798f8665c1d92 (commit)

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


- Log -----------------------------------------------------------------
commit 9af9a43464d5e900b16b9ef29bbe516e70867e90
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Jun 9 21:46:04 2009 +0200

    Do not pull samAccountName twice

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

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


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c
index 4eb764f..4e63297 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) {


-- 
Samba Shared Repository