sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

r9771: - Prevent ldb crash when a invalid DN is added

Browse Source 
- Don't silently drop records with empty attributes

tridge/simo: Could you please verify this patch is correct?
(This used to be commit 505c9b1d3d39475da141d3b3c156a7e5ba06790c)
This commit is contained in:
Jelmer Vernooij 2005-08-30 00:43:26 +00:00 committed by Gerald (Jerry) Carter
parent 7be4cf8c1d
commit c0293aa715
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/lib/ldb/common/ldb_attributes.c
View File

@ -66,7 +66,7 @@ static int ldb_default_copy(struct ldb_context *ldb,
{
*out = ldb_val_dup(mem_ctx, in);
if (out->length == 0) {
if (out->data == NULL && in->data != NULL) {
return -1;
}

6
source4/lib/ldb/common/ldb_ldif.c
View File

@ -590,6 +590,12 @@ struct ldb_ldif *ldb_ldif_read(struct ldb_context *ldb,
msg->dn = ldb_dn_explode(msg, value.data);
if (msg->dn == NULL) {
ldb_debug(ldb, LDB_DEBUG_ERROR, "Error: Unable to parse dn '%s'\n",
value.data);
goto failed;
}
while (next_attr(ldif, &s, &attr, &value) == 0) {
const struct ldb_attrib_handler *h;
struct ldb_message_element *el;

2
source4/lib/ldb/common/ldb_msg.c
View File

@ -99,7 +99,7 @@ struct ldb_val ldb_val_dup(void *mem_ctx, const struct ldb_val *v)
{
struct ldb_val v2;
v2.length = v->length;
if (v->length == 0) {
if (v->data == NULL) {
v2.data = NULL;
return v2;
}