[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  568ca24... s4:samdb_server_site_dn - free unused DNs in the right way
      from  c7dfe73... s4:torture - "dbspeed" test - add newlines as we have them in the other failure messages

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


- Log -----------------------------------------------------------------
commit 568ca2433d0d2292047979abbfcb03543bb27a67
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Sun Apr 11 12:56:50 2010 +0200

    s4:samdb_server_site_dn - free unused DNs in the right way

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

Summary of changes:
 source4/dsdb/common/util.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index b469b06..c6870da 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -1469,16 +1469,16 @@ struct ldb_dn *samdb_server_site_dn(struct ldb_context *ldb, TALLOC_CTX *mem_ctx
 	struct ldb_dn *server_site_dn;
 
 	/* TODO: there must be a saner way to do this!! */
-
 	server_dn = samdb_server_dn(ldb, mem_ctx);
 	if (!server_dn) return NULL;
 
 	servers_dn = ldb_dn_get_parent(mem_ctx, server_dn);
+	talloc_free(server_dn);
 	if (!servers_dn) return NULL;
 
 	server_site_dn = ldb_dn_get_parent(mem_ctx, servers_dn);
+	talloc_free(servers_dn);
 
-	talloc_free(server_dn);
 	return server_site_dn;
 }
 


-- 
Samba Shared Repository