diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-11-07 11:27:26 +0100 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-11-07 11:10:23 +0000 |
| commit | 786a76720c10c01a9636c6cf892cce42d05d647d (patch) | |
| tree | e9ea0c6a8e73bf133e219d23a1497ede0066b9e3 /source4/dsdb/samdb/ldb_modules/util.c | |
| parent | d6d5f80348c949c2b4984b9f211d1fff02b50948 (diff) | |
| download | samba-786a76720c10c01a9636c6cf892cce42d05d647d.tar.gz samba-786a76720c10c01a9636c6cf892cce42d05d647d.tar.bz2 samba-786a76720c10c01a9636c6cf892cce42d05d647d.zip | |
s4:ldb_modules/util.c - "dsdb_get_single_valued_attr" - support the attribute fetch also on LDB add operations
We've to completely ignore the flags in that case.
Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Sun Nov 7 11:10:23 UTC 2010 on sn-devel-104
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/util.c')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/util.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/util.c b/source4/dsdb/samdb/ldb_modules/util.c index 7d6fcc47ad..07a3d0ad07 100644 --- a/source4/dsdb/samdb/ldb_modules/util.c +++ b/source4/dsdb/samdb/ldb_modules/util.c @@ -1118,7 +1118,8 @@ void dsdb_req_chain_debug(struct ldb_request *req, int level) * enhanced (no other modifications as deletions, variations). */ struct ldb_message_element *dsdb_get_single_valued_attr(struct ldb_message *msg, - const char *attr_name) + const char *attr_name, + enum ldb_request_type operation) { struct ldb_message_element *el = NULL; unsigned int i; @@ -1129,9 +1130,12 @@ struct ldb_message_element *dsdb_get_single_valued_attr(struct ldb_message *msg, * If "el" is NULL afterwards then that means there was no interesting * change entry. */ for (i = 0; i < msg->num_elements; i++) { - if ((ldb_attr_cmp(msg->elements[i].name, attr_name) == 0) && - (LDB_FLAG_MOD_TYPE(msg->elements[i].flags) - != LDB_FLAG_MOD_DELETE)) { + if (ldb_attr_cmp(msg->elements[i].name, attr_name) == 0) { + if ((operation == LDB_MODIFY) && + (LDB_FLAG_MOD_TYPE(msg->elements[i].flags) + == LDB_FLAG_MOD_DELETE)) { + continue; + } el = &msg->elements[i]; } } |