sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

r16090: Fix standalone build after the rename of enum ldb_request_type in

Browse Source 
r15944.

Hey idra I think a better rename would be to keep the LDB_REQ suffix
here to remain consistent with the other enums (e.g ldb_reply_type,
ldb_async_wait_type and ldb_async_state).
(This used to be commit d44ee8c43b)
This commit is contained in:
Tim Potter
2006-06-08 03:57:57 +00:00
committed by Gerald (Jerry) Carter
parent 43e9053d95
commit 7d7e43d94f
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
View File

@ -1990,7 +1990,7 @@ static int lsql_request(struct ldb_module *module, struct ldb_request *req)
switch (req->operation) {
case LDB_REQ_SEARCH:
case LDB_SEARCH:
return lsql_search_bytree(module,
req->op.search.base,
req->op.search.scope,
@ -1998,21 +1998,21 @@ static int lsql_request(struct ldb_module *module, struct ldb_request *req)
req->op.search.attrs,
&req->op.search.res);
case LDB_REQ_ADD:
case LDB_ADD:
return lsql_add(module, req->op.add.message);
case LDB_REQ_MODIFY:
case LDB_MODIFY:
return lsql_modify(module, req->op.mod.message);
case LDB_REQ_DELETE:
case LDB_DELETE:
return lsql_delete(module, req->op.del.dn);
case LDB_REQ_RENAME:
case LDB_RENAME:
return lsql_rename(module,
req->op.rename.olddn,
req->op.rename.newdn);
case LDB_ASYNC_SEARCH:
case LDB_SEARCH:
return lsql_search_async(module,
req->op.search.base,
req->op.search.scope,
@ -2022,28 +2022,28 @@ static int lsql_request(struct ldb_module *module, struct ldb_request *req)
req->async.callback,
&req->async.handle);
/*
case LDB_ASYNC_ADD:
case LDB_ADD:
return lsql_add_async(module,
req->op.add.message,
req->async.context,
req->async.callback,
&req->async.handle);
case LDB_ASYNC_MODIFY:
case LDB_MODIFY:
return lsql_modify_async(module,
req->op.mod.message,
req->async.context,
req->async.callback,
&req->async.handle);
*/
case LDB_ASYNC_DELETE:
case LDB_DELETE:
return lsql_delete_async(module,
req->op.del.dn,
req->async.context,
req->async.callback,
&req->async.handle);
case LDB_ASYNC_RENAME:
case LDB_RENAME:
return lsql_rename_async(module,
req->op.rename.olddn,
req->op.rename.newdn,

18
source4/lib/ldb/modules/ldb_map.c
View File

@ -812,7 +812,7 @@ static int map_search_mp(struct ldb_module *module, struct ldb_request *req)
new_base = map_local_dn(module, module, base);
memset((char *)&(new_req), 0, sizeof(new_req));
new_req.operation = LDB_REQ_SEARCH;
new_req.operation = LDB_SEARCH;
new_req.op.search.base = new_base;
new_req.op.search.scope = scope;
new_req.op.search.tree = new_tree;
@ -857,7 +857,7 @@ static int map_search_mp(struct ldb_module *module, struct ldb_request *req)
/* Merge with additional data from fallback database */
memset((char *)&(mergereq), 0, sizeof(mergereq)); /* zero off the request structure */
mergereq.operation = LDB_REQ_SEARCH;
mergereq.operation = LDB_SEARCH;
mergereq.op.search.base = merged->dn;
mergereq.op.search.scope = LDB_SCOPE_BASE;
mergereq.op.search.tree = ldb_parse_tree(module, "");
@ -1266,10 +1266,10 @@ static int map_modify(struct ldb_module *module, struct ldb_request *req)
fb_ret = ldb_next_request(module, req);
if (fb_ret == -1) {
ldb_msg_add_string(fb, "isMapped", "TRUE");
req->operation = LDB_REQ_ADD;
req->operation = LDB_ADD;
req->op.add.message = fb;
fb_ret = ldb_next_request(module, req);
req->operation = LDB_REQ_MODIFY;
req->operation = LDB_MODIFY;
}
req->op.mod.message = msg;
} else fb_ret = 0;
@ -1289,19 +1289,19 @@ static int map_request(struct ldb_module *module, struct ldb_request *req)
{
switch (req->operation) {
case LDB_REQ_SEARCH:
case LDB_SEARCH:
return map_search_bytree(module, req);
case LDB_REQ_ADD:
case LDB_ADD:
return map_add(module, req);
case LDB_REQ_MODIFY:
case LDB_MODIFY:
return map_modify(module, req);
case LDB_REQ_DELETE:
case LDB_DELETE:
return map_delete(module, req);
case LDB_REQ_RENAME:
case LDB_RENAME:
return map_rename(module, req);
default:

4
source4/lib/ldb/modules/schema.c
View File

@ -465,10 +465,10 @@ static int schema_request(struct ldb_module *module, struct ldb_request *req)
{
switch (req->operation) {
case LDB_REQ_ADD:
case LDB_ADD:
return schema_add(module, req);
case LDB_REQ_MODIFY:
case LDB_MODIFY:
return schema_modify(module, req);
default: