[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  30ff229... s4:LDB TDB index code - reintroduce accidentally removed code part
      from  f8dba77... s4:ldb_ldap.c - fix indentation

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


- Log -----------------------------------------------------------------
commit 30ff229a3e32549073424b423302e976c988d563
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Mon Mar 8 11:43:40 2010 +0100

    s4:LDB TDB index code - reintroduce accidentally removed code part
    
    This was removed by 95d726f3018ef5d249f89d56bde24b7ee0c24ecf. Sorry.

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

Summary of changes:
 source4/lib/ldb/ldb_tdb/ldb_index.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/ldb_tdb/ldb_index.c b/source4/lib/ldb/ldb_tdb/ldb_index.c
index c9c3e0c..828dca1 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_index.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_index.c
@@ -1331,7 +1331,9 @@ int ltdb_index_del_value(struct ldb_module *module, struct ldb_dn *dn,
 	}
 
 	j = (unsigned int) i;
-	memmove(&list->dn[j], &list->dn[j+1], sizeof(list->dn[0])*(list->count - (i+1)));
+	if (j != list->count - 1) {
+		memmove(&list->dn[j], &list->dn[j+1], sizeof(list->dn[0])*(list->count - (j+1)));
+	}
 	list->count--;
 	list->dn = talloc_realloc(list, list->dn, struct ldb_val, list->count);
 


-- 
Samba Shared Repository