summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2010-06-20 12:49:04 +0200
committerMatthias Dieter Wallnöfer <mdw@samba.org>2010-06-20 18:52:30 +0200
commitfbd09029581d2f9b6c6f0c2410d768d501f4b75c (patch)
tree292739e8ad021dbd9f81d75b8108cf9d0c686a71
parent87d0f636320b3b6818c1703d99b94648f00d0af7 (diff)
downloadsamba-fbd09029581d2f9b6c6f0c2410d768d501f4b75c.tar.gz
samba-fbd09029581d2f9b6c6f0c2410d768d501f4b75c.tar.bz2
samba-fbd09029581d2f9b6c6f0c2410d768d501f4b75c.zip
s4:subtree_delete LDB module - now do support tree delete operations
-rw-r--r--source4/dsdb/samdb/ldb_modules/subtree_delete.c54
1 files changed, 45 insertions, 9 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/subtree_delete.c b/source4/dsdb/samdb/ldb_modules/subtree_delete.c
index a2734375aa..a29de8e910 100644
--- a/source4/dsdb/samdb/ldb_modules/subtree_delete.c
+++ b/source4/dsdb/samdb/ldb_modules/subtree_delete.c
@@ -39,8 +39,10 @@
static int subtree_delete(struct ldb_module *module, struct ldb_request *req)
{
static const char * const attrs[] = { NULL };
- int ret;
struct ldb_result *res = NULL;
+ uint32_t flags;
+ unsigned int i;
+ int ret;
if (ldb_dn_is_special(req->op.del.dn)) {
/* do not manipulate our control entries */
@@ -56,20 +58,54 @@ static int subtree_delete(struct ldb_module *module, struct ldb_request *req)
return ret;
}
if (res->count > 0) {
- ldb_asprintf_errstring(ldb_module_get_ctx(module),
- "Cannot delete %s, not a leaf node "
- "(has %d children)\n",
- ldb_dn_get_linearized(req->op.del.dn),
- res->count);
- talloc_free(res);
- return LDB_ERR_NOT_ALLOWED_ON_NON_LEAF;
+ if (ldb_request_get_control(req, LDB_CONTROL_TREE_DELETE_OID) == NULL) {
+ ldb_asprintf_errstring(ldb_module_get_ctx(module),
+ "Cannot delete %s, not a leaf node "
+ "(has %d children)\n",
+ ldb_dn_get_linearized(req->op.del.dn),
+ res->count);
+ talloc_free(res);
+ return LDB_ERR_NOT_ALLOWED_ON_NON_LEAF;
+ }
+
+ /* we need to start from the top since other LDB modules could
+ * enforce constraints (eg "objectclass" and "samldb" do so). */
+ flags = DSDB_FLAG_TOP_MODULE | DSDB_TREE_DELETE;
+ if (ldb_request_get_control(req, LDB_CONTROL_RELAX_OID) != NULL) {
+ flags |= DSDB_MODIFY_RELAX;
+ }
+
+ for (i = 0; i < res->count; i++) {
+ ret = dsdb_module_del(module, res->msgs[i]->dn, flags);
+ if (ret != LDB_SUCCESS) {
+ return ret;
+ }
+ }
}
talloc_free(res);
return ldb_next_request(module, req);
}
+static int subtree_delete_init(struct ldb_module *module)
+{
+ struct ldb_context *ldb;
+ int ret;
+
+ ldb = ldb_module_get_ctx(module);
+
+ ret = ldb_mod_register_control(module, LDB_CONTROL_TREE_DELETE_OID);
+ if (ret != LDB_SUCCESS) {
+ ldb_debug(ldb, LDB_DEBUG_ERROR,
+ "subtree_delete: Unable to register control with rootdse!\n");
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+
+ return ldb_next_init(module);
+}
+
_PUBLIC_ const struct ldb_module_ops ldb_subtree_delete_module_ops = {
.name = "subtree_delete",
- .del = subtree_delete,
+ .init_context = subtree_delete_init,
+ .del = subtree_delete
};