diff --git a/source/lib/ldb/ldb_tdb/ldb_index.c b/source/lib/ldb/ldb_tdb/ldb_index.c
index 6c21ae29861..76e17cdfd53 100644
--- a/source/lib/ldb/ldb_tdb/ldb_index.c
+++ b/source/lib/ldb/ldb_tdb/ldb_index.c
@@ -590,6 +590,14 @@ static int ltdb_index_add1_add(struct ldb_context *ldb,
 			       char *dn)
 {
 	struct ldb_val *v2;
+	int i;
+
+	/* for multi-valued attributes we can end up with repeats */
+	for (i=0;i<msg->elements[idx].num_values;i++) {
+		if (strcmp(dn, msg->elements[idx].values[i].data) == 0) {
+			return 0;
+		}
+	}
 
 	v2 = realloc_p(msg->elements[idx].values,
 		       struct ldb_val, 
diff --git a/source/lib/ldb/ldb_tdb/ldb_search.c b/source/lib/ldb/ldb_tdb/ldb_search.c
index 70590302124..1dce8f83a29 100644
--- a/source/lib/ldb/ldb_tdb/ldb_search.c
+++ b/source/lib/ldb/ldb_tdb/ldb_search.c
@@ -204,12 +204,18 @@ static struct ldb_message *ltdb_pull_attrs(struct ldb_context *ldb,
 
 /*
   see if a ldb_val is a wildcard
+  return 1 if yes, 0 if no
 */
 int ltdb_has_wildcard(struct ldb_context *ldb, const char *attr_name, 
 		      const struct ldb_val *val)
 {
 	int flags;
 
+	/* all attribute types recognise the "*" wildcard */
+	if (val->length == 1 && strncmp((char *)val->data, "*", 1) == 0) {
+		return 1;
+	}
+
 	if (strpbrk(val->data, "*?") == NULL) {
 		return 0;
 	}