svn commit: samba r15944 - in branches/SAMBA_4_0/source:
dsdb/samdb/ldb_modules ldap_server lib/ldb/common
lib/ldb/include lib/ldb/ldb_ildap lib/ldb/modules
lib/ldb/tools nbt_server/wins
idra at samba.org
idra at samba.org
Tue May 30 00:33:55 GMT 2006
Author: idra
Date: 2006-05-30 00:33:52 +0000 (Tue, 30 May 2006)
New Revision: 15944
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15944
Log:
rename LDB_ASYNC_ADD -> LDB_ADD, LDB_ASYNC_MODIFY -> LDB_MODIFY, etc...
Modified:
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c
branches/SAMBA_4_0/source/ldap_server/ldap_backend.c
branches/SAMBA_4_0/source/lib/ldb/common/ldb.c
branches/SAMBA_4_0/source/lib/ldb/common/ldb_modules.c
branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
branches/SAMBA_4_0/source/lib/ldb/ldb_ildap/ldb_ildap.c
branches/SAMBA_4_0/source/lib/ldb/modules/asq.c
branches/SAMBA_4_0/source/lib/ldb/modules/rdn_name.c
branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c
branches/SAMBA_4_0/source/nbt_server/wins/wins_ldb.c
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c 2006-05-29 23:54:53 UTC (rev 15943)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c 2006-05-30 00:33:52 UTC (rev 15944)
@@ -488,7 +488,7 @@
ldb_debug(ac->module->ldb, LDB_DEBUG_ERROR, "Out of Memory!\n");
return LDB_ERR_OPERATIONS_ERROR;
}
- ac->dom_req->operation = LDB_ASYNC_SEARCH;
+ ac->dom_req->operation = LDB_SEARCH;
ac->dom_req->op.search.base = NULL;
ac->dom_req->op.search.scope = LDB_SCOPE_SUBTREE;
@@ -828,7 +828,7 @@
return LDB_ERR_OPERATIONS_ERROR;
}
- ac->search_req->operation = LDB_ASYNC_SEARCH;
+ ac->search_req->operation = LDB_SEARCH;
ac->search_req->op.search.base = ac->orig_req->op.mod.message->dn;
ac->search_req->op.search.scope = LDB_SCOPE_BASE;
ac->search_req->op.search.tree = ldb_parse_tree(ac->module->ldb, NULL);
Modified: branches/SAMBA_4_0/source/ldap_server/ldap_backend.c
===================================================================
--- branches/SAMBA_4_0/source/ldap_server/ldap_backend.c 2006-05-29 23:54:53 UTC (rev 15943)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_backend.c 2006-05-30 00:33:52 UTC (rev 15944)
@@ -237,7 +237,7 @@
res = talloc_zero(local_ctx, struct ldb_result);
NT_STATUS_HAVE_NO_MEMORY(res);
- lreq->operation = LDB_ASYNC_SEARCH;
+ lreq->operation = LDB_SEARCH;
lreq->op.search.base = basedn;
lreq->op.search.scope = scope;
lreq->op.search.tree = req->tree;
Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb.c 2006-05-29 23:54:53 UTC (rev 15943)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb.c 2006-05-30 00:33:52 UTC (rev 15944)
@@ -285,23 +285,23 @@
/* call the first module in the chain */
switch (req->operation) {
- case LDB_ASYNC_SEARCH:
+ case LDB_SEARCH:
FIRST_OP(ldb, search);
ret = module->ops->search(module, req);
break;
- case LDB_ASYNC_ADD:
+ case LDB_ADD:
FIRST_OP(ldb, add);
ret = module->ops->add(module, req);
break;
- case LDB_ASYNC_MODIFY:
+ case LDB_MODIFY:
FIRST_OP(ldb, modify);
ret = module->ops->modify(module, req);
break;
- case LDB_ASYNC_DELETE:
+ case LDB_DELETE:
FIRST_OP(ldb, del);
ret = module->ops->del(module, req);
break;
- case LDB_ASYNC_RENAME:
+ case LDB_RENAME:
FIRST_OP(ldb, rename);
ret = module->ops->rename(module, req);
break;
@@ -408,7 +408,7 @@
return LDB_ERR_OPERATIONS_ERROR;
}
- req->operation = LDB_ASYNC_SEARCH;
+ req->operation = LDB_SEARCH;
req->op.search.base = base;
req->op.search.scope = scope;
@@ -486,7 +486,7 @@
return LDB_ERR_OPERATIONS_ERROR;
}
- req->operation = LDB_ASYNC_ADD;
+ req->operation = LDB_ADD;
req->op.add.message = message;
req->controls = NULL;
req->async.context = NULL;
@@ -518,7 +518,7 @@
return LDB_ERR_OPERATIONS_ERROR;
}
- req->operation = LDB_ASYNC_MODIFY;
+ req->operation = LDB_MODIFY;
req->op.add.message = message;
req->controls = NULL;
req->async.context = NULL;
@@ -547,7 +547,7 @@
return LDB_ERR_OPERATIONS_ERROR;
}
- req->operation = LDB_ASYNC_DELETE;
+ req->operation = LDB_DELETE;
req->op.del.dn = dn;
req->controls = NULL;
req->async.context = NULL;
@@ -575,7 +575,7 @@
return LDB_ERR_OPERATIONS_ERROR;
}
- req->operation = LDB_ASYNC_RENAME;
+ req->operation = LDB_RENAME;
req->op.rename.olddn = olddn;
req->op.rename.newdn = newdn;
req->controls = NULL;
Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_modules.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb_modules.c 2006-05-29 23:54:53 UTC (rev 15943)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_modules.c 2006-05-30 00:33:52 UTC (rev 15944)
@@ -351,19 +351,19 @@
int ldb_next_request(struct ldb_module *module, struct ldb_request *request)
{
switch (request->operation) {
- case LDB_ASYNC_SEARCH:
+ case LDB_SEARCH:
FIND_OP(module, search);
return module->ops->search(module, request);
- case LDB_ASYNC_ADD:
+ case LDB_ADD:
FIND_OP(module, add);
return module->ops->add(module, request);
- case LDB_ASYNC_MODIFY:
+ case LDB_MODIFY:
FIND_OP(module, modify);
return module->ops->modify(module, request);
- case LDB_ASYNC_DELETE:
+ case LDB_DELETE:
FIND_OP(module, del);
return module->ops->del(module, request);
- case LDB_ASYNC_RENAME:
+ case LDB_RENAME:
FIND_OP(module, rename);
return module->ops->rename(module, request);
default:
Modified: branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/include/ldb.h 2006-05-29 23:54:53 UTC (rev 15943)
+++ branches/SAMBA_4_0/source/lib/ldb/include/ldb.h 2006-05-30 00:33:52 UTC (rev 15944)
@@ -562,11 +562,11 @@
};
enum ldb_request_type {
- LDB_ASYNC_SEARCH,
- LDB_ASYNC_ADD,
- LDB_ASYNC_MODIFY,
- LDB_ASYNC_DELETE,
- LDB_ASYNC_RENAME,
+ LDB_SEARCH,
+ LDB_ADD,
+ LDB_MODIFY,
+ LDB_DELETE,
+ LDB_RENAME,
LDB_REQ_REGISTER
};
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_ildap/ldb_ildap.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_ildap/ldb_ildap.c 2006-05-29 23:54:53 UTC (rev 15943)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_ildap/ldb_ildap.c 2006-05-30 00:33:52 UTC (rev 15944)
@@ -744,7 +744,7 @@
ildb->rootDSE = NULL;
- req->operation = LDB_ASYNC_SEARCH;
+ req->operation = LDB_SEARCH;
req->op.search.base = ldb_dn_new(req);
req->op.search.scope = LDB_SCOPE_BASE;
req->op.search.tree = ldb_parse_tree(req, "dn=dc=rootDSE");
Modified: branches/SAMBA_4_0/source/lib/ldb/modules/asq.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/modules/asq.c 2006-05-29 23:54:53 UTC (rev 15943)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/asq.c 2006-05-30 00:33:52 UTC (rev 15944)
@@ -312,7 +312,7 @@
ac->reqs[i] = talloc_zero(ac->reqs, struct ldb_request);
if (ac->reqs[i] == NULL)
return LDB_ERR_OPERATIONS_ERROR;
- ac->reqs[i]->operation = LDB_ASYNC_SEARCH;
+ ac->reqs[i]->operation = LDB_SEARCH;
ac->reqs[i]->op.search.base = ldb_dn_explode(ac->reqs[i], (const char *)el->values[i].data);
if (ac->reqs[i]->op.search.base == NULL) {
ac->asq_ret = ASQ_CTRL_INVALID_ATTRIBUTE_SYNTAX;
Modified: branches/SAMBA_4_0/source/lib/ldb/modules/rdn_name.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/modules/rdn_name.c 2006-05-29 23:54:53 UTC (rev 15943)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/rdn_name.c 2006-05-30 00:33:52 UTC (rev 15944)
@@ -202,7 +202,7 @@
ac->mod_req = talloc_zero(ac, struct ldb_request);
- ac->mod_req->operation = LDB_ASYNC_MODIFY;
+ ac->mod_req->operation = LDB_MODIFY;
ac->mod_req->op.mod.message = msg = ldb_msg_new(ac->mod_req);
if (msg == NULL) {
return LDB_ERR_OPERATIONS_ERROR;
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c 2006-05-29 23:54:53 UTC (rev 15943)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c 2006-05-30 00:33:52 UTC (rev 15944)
@@ -217,7 +217,7 @@
actx->entries = 0;
actx->refs = 0;
- req->operation = LDB_ASYNC_SEARCH;
+ req->operation = LDB_SEARCH;
req->op.search.base = basedn;
req->op.search.scope = options->scope;
req->op.search.tree = ldb_parse_tree(ldb, expression);
Modified: branches/SAMBA_4_0/source/nbt_server/wins/wins_ldb.c
===================================================================
--- branches/SAMBA_4_0/source/nbt_server/wins/wins_ldb.c 2006-05-29 23:54:53 UTC (rev 15943)
+++ branches/SAMBA_4_0/source/nbt_server/wins/wins_ldb.c 2006-05-30 00:33:52 UTC (rev 15944)
@@ -45,11 +45,11 @@
char *error = NULL;
switch (req->operation) {
- case LDB_ASYNC_ADD:
+ case LDB_ADD:
msg = req->op.add.message;
break;
- case LDB_ASYNC_MODIFY:
+ case LDB_MODIFY:
msg = req->op.mod.message;
break;
More information about the samba-cvs
mailing list