Author: abartlet Date: 2007-07-07 04:34:36 +0000 (Sat, 07 Jul 2007) New Revision: 23737
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23737 Log: Validate that we object to duplicate values in an add or replace. We can't ever allow duplicates, even if the client sends them Andrew Bartlett Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c branches/SAMBA_4_0/testprogs/ejs/ldap.js Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c 2007-07-06 23:07:40 UTC (rev 23736) +++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c 2007-07-07 04:34:36 UTC (rev 23737) @@ -591,7 +591,7 @@ TDB_DATA tdb_key, tdb_data; struct ldb_message *msg2; unsigned i, j; - int ret; + int ret, idx; tdb_key = ltdb_key(module, msg->dn); if (!tdb_key.dptr) { @@ -631,9 +631,9 @@ case LDB_FLAG_MOD_ADD: /* add this element to the message. fail if it already exists */ - ret = find_element(msg2, el->name); + idx = find_element(msg2, el->name); - if (ret == -1) { + if (idx == -1) { if (msg_add_element(ldb, msg2, el) != 0) { ret = LDB_ERR_OTHER; goto failed; @@ -641,17 +641,24 @@ continue; } - el2 = &msg2->elements[ret]; + el2 = &msg2->elements[idx]; - /* An attribute with this name already exists, add all - * values if they don't already exist. */ + /* An attribute with this name already exists, + * add all values if they don't already exist + * (check both the other elements to be added, + * and those already in the db). */ for (j=0;j<el->num_values;j++) { if (ldb_msg_find_val(el2, &el->values[j])) { - ldb_set_errstring(module->ldb, "Type or value exists"); + ldb_asprintf_errstring(module->ldb, "%s: value #%d already exists", el->name, j); ret = LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS; goto failed; } + if (ldb_msg_find_val(el, &el->values[j]) != &el->values[j]) { + ldb_asprintf_errstring(module->ldb, "%s: value #%d provided more than once", el->name, j); + ret = LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS; + goto failed; + } } vals = talloc_realloc(msg2->elements, el2->values, struct ldb_val, @@ -675,11 +682,19 @@ case LDB_FLAG_MOD_REPLACE: /* replace all elements of this attribute name with the elements listed. The attribute not existing is not an error */ - msg_delete_attribute(module, ldb, msg2, msg->elements[i].name); + msg_delete_attribute(module, ldb, msg2, el->name); + for (j=0;j<el->num_values;j++) { + if (ldb_msg_find_val(el, &el->values[j]) != &el->values[j]) { + ldb_asprintf_errstring(module->ldb, "%s: value #%d provided more than once", el->name, j); + ret = LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS; + goto failed; + } + } + /* add the replacement element, if not empty */ - if (msg->elements[i].num_values != 0 && - msg_add_element(ldb, msg2, &msg->elements[i]) != 0) { + if (el->num_values != 0 && + msg_add_element(ldb, msg2, el) != 0) { ret = LDB_ERR_OTHER; goto failed; } Modified: branches/SAMBA_4_0/testprogs/ejs/ldap.js =================================================================== --- branches/SAMBA_4_0/testprogs/ejs/ldap.js 2007-07-06 23:07:40 UTC (rev 23736) +++ branches/SAMBA_4_0/testprogs/ejs/ldap.js 2007-07-07 04:34:36 UTC (rev 23737) @@ -101,6 +101,21 @@ } } + ok = ldb.modify(" +dn: cn=ldaptest2computer,cn=computers," + base_dn + " +changetype: modify +replace: servicePrincipalName +servicePrincipalName: host/ldaptest2computer +servicePrincipalName: host/ldaptest2computer +servicePrincipalName: cifs/ldaptest2computer +"); + +//LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS + if (ok.error != 20) { + println("Expected error LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS, got :" + ok.errstr); + assert(ok.error == 20); + } + ok = ldb.add(" dn: cn=ldaptestuser2,cn=users," + base_dn + " objectClass: person
