From ae72153daaa5dc50751a35af22533a666c65eb42 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 11 Nov 2009 19:26:28 +1100 Subject: [PATCH] s4:ldb Allow ldb_msg_canonicalize to handle empty elements (These are deliberately there in DRS replication). Andrew Bartlett --- source4/lib/ldb/common/ldb_msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source4/lib/ldb/common/ldb_msg.c b/source4/lib/ldb/common/ldb_msg.c index a040043f87..161a6b1f38 100644 --- a/source4/lib/ldb/common/ldb_msg.c +++ b/source4/lib/ldb/common/ldb_msg.c @@ -526,7 +526,7 @@ struct ldb_message *ldb_msg_canonicalize(struct ldb_context *ldb, if (ldb_msg_element_compare_name(el1, el2) == 0) { el1->values = talloc_realloc(msg2->elements, el1->values, struct ldb_val, el1->num_values + el2->num_values); - if (el1->values == NULL) { + if (el1->num_values + el2->num_values > 0 && el1->values == NULL) { return NULL; } memcpy(el1->values + el1->num_values, -- 2.34.1