1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-19 21:57:57 +03:00

r15789: hmm, damn, testing uncovcer all your bugs :-)

(This used to be commit 977982c884da15d1e9f5fe19d24cd4169ecbb0c5)
This commit is contained in:
Simo Sorce 2006-05-21 23:58:09 +00:00 committed by Gerald (Jerry) Carter
parent efa3803335
commit d51f4fb2c7

@ -625,20 +625,6 @@ static int samldb_fill_user_or_computer_object(struct ldb_module *module, const
return LDB_ERR_OPERATIONS_ERROR;
}
/* make sure we also add person, organizationalPerson and top */
if ( ! samldb_find_or_add_attribute(module, msg2, "objectclass", "person", "person")) {
talloc_free(mem_ctx);
return LDB_ERR_OPERATIONS_ERROR;
}
if ( ! samldb_find_or_add_attribute(module, msg2, "objectclass", "organizationalPerson", "organizationalPerson")) {
talloc_free(mem_ctx);
return LDB_ERR_OPERATIONS_ERROR;
}
if ( ! samldb_find_or_add_attribute(module, msg2, "objectclass", "top", "top")) {
talloc_free(mem_ctx);
return LDB_ERR_OPERATIONS_ERROR;
}
/* meddle with objectclass */
if (ldb_msg_find_element(msg2, "samAccountName") == NULL) {
@ -841,8 +827,8 @@ static int samldb_add_async(struct ldb_module *module, struct ldb_request *req)
}
/* is user or computer? */
if ((samldb_find_attribute(msg, "objectclass", "user") == NULL) &&
(samldb_find_attribute(msg, "objectclass", "computer") == NULL)) {
if ((samldb_find_attribute(msg, "objectclass", "user") != NULL) ||
(samldb_find_attribute(msg, "objectclass", "computer") != NULL)) {
/* add all relevant missing objects */
ret = samldb_fill_user_or_computer_object(module, msg, &msg2);
if (ret) {