diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-11-11 19:26:28 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-11-12 16:34:15 +1100 |
| commit | ae72153daaa5dc50751a35af22533a666c65eb42 (patch) | |
| tree | 5fcf59a31b4fdb32b22bbdf1a0df51d9cd808a34 /source4 | |
| parent | 081d57345fad546d73f9ec97e61f59c64cefee58 (diff) | |
| download | samba-ae72153daaa5dc50751a35af22533a666c65eb42.tar.gz samba-ae72153daaa5dc50751a35af22533a666c65eb42.tar.bz2 samba-ae72153daaa5dc50751a35af22533a666c65eb42.zip | |
s4:ldb Allow ldb_msg_canonicalize to handle empty elements
(These are deliberately there in DRS replication).
Andrew Bartlett
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/ldb/common/ldb_msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, |