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

r811: make the ldb_modify REPLACE semantics better match LDAP (ie. no error

Browse Source 
on the attribute not existing and allow an empty replace)
(This used to be commit 1418b667d9041430786089713eafee63dd7b4a28)
This commit is contained in:
Andrew Tridgell 2004-05-22 00:52:04 +00:00 committed by Gerald (Jerry) Carter
parent b047b71b45
commit 054453b584
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -501,13 +501,12 @@ int ltdb_modify_internal(struct ldb_context *ldb, const struct ldb_message *msg)
case LDB_FLAG_MOD_REPLACE:
/* replace all elements of this attribute name with the elements
listed */
if (msg_delete_attribute(ldb, &msg2, msg->elements[i].name) != 0) {
ltdb->last_err_string = "No such attribute";
goto failed;
}
/* add the replacement element */
if (msg_add_element(ldb, &msg2, &msg->elements[i]) != 0) {
listed. The attribute not existing is not an error */
msg_delete_attribute(ldb, &msg2, msg->elements[i].name);
/* add the replacement element, if not empty */
if (msg->elements[i].num_values != 0 &&
msg_add_element(ldb, &msg2, &msg->elements[i]) != 0) {
goto failed;
}
break;