sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

s4:ldb Fix check made conditional by mistake

Browse Source
This commit is contained in:
Simo Sorce 2010-01-30 02:57:33 -05:00
parent df7be036d7
commit 772d808ac8
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source4/lib/ldb/ldb_tdb/ldb_tdb.c
View File

@ -659,6 +659,13 @@ int ltdb_modify_internal(struct ldb_module *module,
switch (msg->elements[i].flags & LDB_FLAG_MOD_MASK) { switch (msg->elements[i].flags & LDB_FLAG_MOD_MASK) {
case LDB_FLAG_MOD_ADD: case LDB_FLAG_MOD_ADD:
if (el->num_values == 0) {
ldb_asprintf_errstring(ldb, "attribute %s on %s specified, but with 0 values (illigal)",
el->name, ldb_dn_get_linearized(msg2->dn));
ret = LDB_ERR_CONSTRAINT_VIOLATION;
goto done;
}
/* make a copy of the array so that a permissive /* make a copy of the array so that a permissive
* control can remove duplicates without changing the * control can remove duplicates without changing the
* original values, but do not copy data as we do not * original values, but do not copy data as we do not
@ -673,16 +680,13 @@ int ltdb_modify_internal(struct ldb_module *module,
el->name = msg->elements[i].name; el->name = msg->elements[i].name;
el->num_values = msg->elements[i].num_values; el->num_values = msg->elements[i].num_values;
el->values = talloc_array(el, struct ldb_val, el->num_values); el->values = talloc_array(el, struct ldb_val, el->num_values);
if (el->values == NULL) {
ret = LDB_ERR_OTHER;
goto done;
}
for (j = 0; j < el->num_values; j++) { for (j = 0; j < el->num_values; j++) {
el->values[j] = msg->elements[i].values[j]; el->values[j] = msg->elements[i].values[j];
} }
if (el->num_values == 0) {
ldb_asprintf_errstring(ldb, "attribute %s on %s specified, but with 0 values (illigal)",
el->name, ldb_dn_get_linearized(msg2->dn));
ret = LDB_ERR_CONSTRAINT_VIOLATION;
goto done;
}
} }
if (a && a->flags & LDB_ATTR_FLAG_SINGLE_VALUE) { if (a && a->flags & LDB_ATTR_FLAG_SINGLE_VALUE) {