[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1444-gfee4c99

Günther Deschner gd at samba.org
Tue May 5 19:23:18 GMT 2009


The branch, master has been updated
       via  fee4c99be494b9679c414d6ba1938aa88adeacd3 (commit)
       via  5b37df21f6af52d20ad3a25361b1d7faa51308d1 (commit)
      from  e7a8577df1e92982ff717a62280f86e3b0384d54 (commit)

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


- Log -----------------------------------------------------------------
commit fee4c99be494b9679c414d6ba1938aa88adeacd3
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 5 21:12:33 2009 +0200

    s3-ldap: fix more callers of smbldap_dn_talloc() that were passing a NULL context.
    
    Guenther

commit 5b37df21f6af52d20ad3a25361b1d7faa51308d1
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 5 18:50:48 2009 +0200

    s3-ldapsam: Fix Bug #6313: ldapsam_update_sam_account() crashes while doing talloc_free on malloced memory.
    
    Guenther

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

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


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index d548fe9..01d3da8 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -1909,7 +1909,7 @@ static NTSTATUS ldapsam_update_sam_account(struct pdb_methods *my_methods, struc
 	}
 
 	entry = ldap_first_entry(ldap_state->smbldap_state->ldap_struct, result);
-	dn = smbldap_talloc_dn(NULL, ldap_state->smbldap_state->ldap_struct, entry);
+	dn = smbldap_talloc_dn(talloc_tos(), ldap_state->smbldap_state->ldap_struct, entry);
 	if (!dn) {
 		return NT_STATUS_UNSUCCESSFUL;
 	}
@@ -3513,7 +3513,7 @@ static NTSTATUS ldapsam_modify_aliasmem(struct pdb_methods *methods,
 		return NT_STATUS_UNSUCCESSFUL;
 	}
 
-	dn = smbldap_talloc_dn(NULL, ldap_state->smbldap_state->ldap_struct, entry);
+	dn = smbldap_talloc_dn(talloc_tos(), ldap_state->smbldap_state->ldap_struct, entry);
 	if (!dn) {
 		ldap_msgfree(result);
 		return NT_STATUS_UNSUCCESSFUL;
diff --git a/source3/passdb/pdb_nds.c b/source3/passdb/pdb_nds.c
index 08665e4..1545b45 100644
--- a/source3/passdb/pdb_nds.c
+++ b/source3/passdb/pdb_nds.c
@@ -788,7 +788,7 @@ static NTSTATUS pdb_nds_update_login_attempts(struct pdb_methods *methods,
 		}
 
 		entry = ldap_first_entry(ldap_state->smbldap_state->ldap_struct, result);
-		dn = smbldap_talloc_dn(NULL, ldap_state->smbldap_state->ldap_struct, entry);
+		dn = smbldap_talloc_dn(talloc_tos(), ldap_state->smbldap_state->ldap_struct, entry);
 		if (!dn) {
 			return NT_STATUS_OBJECT_NAME_NOT_FOUND;
 		}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list