svn commit: samba r24793 - in branches/SAMBA_4_0/source:
dsdb/samdb/ldb_modules scripting/libjs
abartlet at samba.org
abartlet at samba.org
Thu Aug 30 00:25:50 GMT 2007
Author: abartlet
Date: 2007-08-30 00:25:47 +0000 (Thu, 30 Aug 2007)
New Revision: 24793
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24793
Log:
The subtree_rename module is a work of fiction. An resemblance to a
working module, live or dead, is purely co-incidental.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/subtree_rename.c
branches/SAMBA_4_0/source/scripting/libjs/provision.js
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/subtree_rename.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/subtree_rename.c 2007-08-29 20:53:09 UTC (rev 24792)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/subtree_rename.c 2007-08-30 00:25:47 UTC (rev 24793)
@@ -44,16 +44,6 @@
int finished_requests;
};
-struct subtree_rename_search_context {
- struct ldb_module *module;
- struct ldb_request *orig_req;
- struct ldb_handle *handle;
-
- struct ldb_request **down_req;
- int num_requests;
- int finished_requests;
-};
-
static struct subtree_rename_context *subtree_rename_init_handle(struct ldb_request *req,
struct ldb_module *module)
{
@@ -127,8 +117,10 @@
talloc_steal(req, newdn);
- req->handle = ac->handle;
+ talloc_steal(req, ares->message->dn);
+ talloc_free(ares);
+
ac->down_req = talloc_realloc(ac, ac->down_req,
struct ldb_request *, ac->num_requests + 1);
if (!ac->down_req) {
@@ -136,6 +128,7 @@
return LDB_ERR_OPERATIONS_ERROR;
}
ac->down_req[ac->num_requests] = req;
+ ac->num_requests++;
return ldb_next_request(ac->module, req);
@@ -176,7 +169,7 @@
ret = ldb_build_search_req(&new_req, module->ldb, req,
req->op.rename.olddn,
LDB_SCOPE_SUBTREE,
- "objectClass=*",
+ "(objectClass=*)",
attrs,
req->controls,
ac,
@@ -197,8 +190,6 @@
return ret;
}
- new_req->handle = req->handle;
-
ac->down_req = talloc_realloc(ac, ac->down_req,
struct ldb_request *, ac->num_requests + 1);
if (!ac->down_req) {
@@ -210,8 +201,8 @@
ldb_oom(ac->module->ldb);
return LDB_ERR_OPERATIONS_ERROR;
}
-
- return ldb_next_request(module, req);
+ ac->num_requests++;
+ return ldb_next_request(module, new_req);
}
static int subtree_rename_wait_none(struct ldb_handle *handle) {
Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js
===================================================================
--- branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-08-29 20:53:09 UTC (rev 24792)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-08-30 00:25:47 UTC (rev 24793)
@@ -935,7 +935,6 @@
"objectclass",
"rdn_name",
"show_deleted",
- "subtree_rename",
"partition");
subobj.MODULES_LIST = join(",", modules_list);
subobj.DOMAINDN_LDB = "users.ldb";
More information about the samba-cvs
mailing list