summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-06-09 21:46:04 +0200
committerVolker Lendecke <vl@samba.org>2009-06-09 21:46:30 +0200
commit9af9a43464d5e900b16b9ef29bbe516e70867e90 (patch)
treecfddf25e018aa7788b705703fe2356c9d4454523 /source3
parenta18341dab955dc0ffce6e787de1798f8665c1d92 (diff)
downloadsamba-9af9a43464d5e900b16b9ef29bbe516e70867e90.tar.gz
samba-9af9a43464d5e900b16b9ef29bbe516e70867e90.tar.bz2
samba-9af9a43464d5e900b16b9ef29bbe516e70867e90.zip
Do not pull samAccountName twice
Diffstat (limited to 'source3')
-rw-r--r--source3/passdb/pdb_ads.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c
index 4eb764f616..4e63297436 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) {