sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-10-21 03:33:16 +03:00
Code Activity

r15782: More fixes for async cases

Browse Source 
(This used to be commit 3c9434e264)
This commit is contained in:
Simo Sorce
2006-05-21 20:06:01 +00:00
committed by Gerald (Jerry) Carter
parent 03f520fd12
commit e2112ba3b7
3 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
source4/dsdb/samdb/ldb_modules/samldb.c
View File

@@ -625,6 +625,20 @@ 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) {
@@ -762,13 +776,16 @@ static int samldb_add(struct ldb_module *module, struct ldb_request *req)
return ldb_next_request(module, req);
}
/* is user or computer? add all relevant missing objects */
if ((samldb_find_attribute(msg, "objectclass", "user") != NULL) ||
(samldb_find_attribute(msg, "objectclass", "computer") != NULL)) {
ret = samldb_fill_user_or_computer_object(module, msg, &msg2);
if (ret) {
return ret;
}
/* is user or computer? Skip if not */
if ((samldb_find_attribute(msg, "objectclass", "user") == NULL) &&
(samldb_find_attribute(msg, "objectclass", "computer") == NULL)) {
return ldb_next_request(module, req);
}
/* add all relevant missing objects */
ret = samldb_fill_user_or_computer_object(module, msg, &msg2);
if (ret) {
return ret;
}
/* is group? add all relevant missing objects */
@@ -830,13 +847,16 @@ static int samldb_add_async(struct ldb_module *module, struct ldb_request *req)
return LDB_ERR_OPERATIONS_ERROR;
}
/* is user or computer? add all relevant missing objects */
if ((samldb_find_attribute(msg, "objectclass", "user") != NULL) ||
(samldb_find_attribute(msg, "objectclass", "computer") != NULL)) {
ret = samldb_fill_user_or_computer_object(module, msg, &msg2);
if (ret) {
return ret;
}
/* is user or computer? Skip if not */
if ((samldb_find_attribute(msg, "objectclass", "user") == NULL) &&
(samldb_find_attribute(msg, "objectclass", "computer") == NULL)) {
return ldb_next_request(module, req);
}
/* add all relevant missing objects */
ret = samldb_fill_user_or_computer_object(module, msg, &msg2);
if (ret) {
return ret;
}
/* is group? add all relevant missing objects */