diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-01-29 10:59:14 +1100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-01-29 10:59:14 +1100 |
commit | 9cc90f67b3fc4a16a2029a1cb1d98286ae598966 (patch) | |
tree | 7d579b4a7b377035907ae1fc3206d5f2573303ff /source4/dsdb/samdb/ldb_modules/extended_dn.c | |
parent | c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67 (diff) | |
parent | 87e933d886daa2abc30761e307be35170bbb6aeb (diff) | |
download | samba-9cc90f67b3fc4a16a2029a1cb1d98286ae598966.tar.gz samba-9cc90f67b3fc4a16a2029a1cb1d98286ae598966.tar.bz2 samba-9cc90f67b3fc4a16a2029a1cb1d98286ae598966.zip |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 81a0a7967b8f659f1f35a7a25de469725417ab43)
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/extended_dn.c')
-rw-r--r-- | source4/dsdb/samdb/ldb_modules/extended_dn.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn.c b/source4/dsdb/samdb/ldb_modules/extended_dn.c index b62e806398..802f86570b 100644 --- a/source4/dsdb/samdb/ldb_modules/extended_dn.c +++ b/source4/dsdb/samdb/ldb_modules/extended_dn.c @@ -256,6 +256,7 @@ static int extended_search(struct ldb_module *module, struct ldb_request *req) ac = talloc(req, struct extended_context); if (ac == NULL) { + ldb_oom(module->ldb); return LDB_ERR_OPERATIONS_ERROR; } @@ -273,6 +274,7 @@ static int extended_search(struct ldb_module *module, struct ldb_request *req) down_req = talloc_zero(req, struct ldb_request); if (down_req == NULL) { + ldb_oom(module->ldb); return LDB_ERR_OPERATIONS_ERROR; } @@ -291,8 +293,10 @@ static int extended_search(struct ldb_module *module, struct ldb_request *req) } if (ac->remove_guid || ac->remove_sid) { new_attrs = copy_attrs(down_req, req->op.search.attrs); - if (new_attrs == NULL) + if (new_attrs == NULL) { + ldb_oom(module->ldb); return LDB_ERR_OPERATIONS_ERROR; + } if (ac->remove_guid) { if (!add_attrs(down_req, &new_attrs, "objectGUID")) @@ -339,6 +343,7 @@ static int extended_init(struct ldb_module *module) req = talloc(module, struct ldb_request); if (req == NULL) { + ldb_oom(module->ldb); return LDB_ERR_OPERATIONS_ERROR; } |