[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-717-g39f3efb

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  39f3efbcc5fbdff1db1b12e5fc7368968f240993 (commit)
      from  12cce3be2a24fd72106d747890caf6c7f29db43d (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 39f3efbcc5fbdff1db1b12e5fc7368968f240993
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Dec 18 17:30:02 2007 -0800

    We've finished with the old node once we've copied the
    keyval.
    Jeremy.

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

Summary of changes:
 source/lib/dbwrap_rbt.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/dbwrap_rbt.c b/source/lib/dbwrap_rbt.c
index 15d9b67..468b940 100644
--- a/source/lib/dbwrap_rbt.c
+++ b/source/lib/dbwrap_rbt.c
@@ -121,6 +121,10 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
 	memcpy(this_key.dptr, rec->key.dptr, node->keysize);
 	memcpy(this_val.dptr, data.dptr, node->valuesize);
 
+	if (del_old_keyval) {
+		SAFE_FREE(rec_priv->node);
+	}
+
 	parent = NULL;
 	p = &rec_priv->db_ctx->tree.rb_node;
 
@@ -157,10 +161,6 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
 	rb_link_node(&node->rb_node, parent, p);
 	rb_insert_color(&node->rb_node, &rec_priv->db_ctx->tree);
 
-	if (del_old_keyval) {
-		SAFE_FREE(rec_priv->node);
-	}
-
 	return NT_STATUS_OK;
 }
 


-- 
Samba Shared Repository