diff options
| author | Tim Potter <tpot@samba.org> | 2006-06-08 03:57:57 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:08:58 -0500 |
| commit | 7d7e43d94f26aa6c82b5553ab34d088a33bc99a6 (patch) | |
| tree | 285f41bbd1841cf0d536b6a26f86d89fb81633e5 /source4/lib/ldb/modules | |
| parent | 43e9053d95dda36fc43710ac58db9dfff8e6ca03 (diff) | |
| download | samba-7d7e43d94f26aa6c82b5553ab34d088a33bc99a6.tar.gz samba-7d7e43d94f26aa6c82b5553ab34d088a33bc99a6.tar.bz2 samba-7d7e43d94f26aa6c82b5553ab34d088a33bc99a6.zip | |
r16090: Fix standalone build after the rename of enum ldb_request_type in
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 d44ee8c43bd8f6f978330a8ded8bf30ffad494d6)
Diffstat (limited to 'source4/lib/ldb/modules')
| -rw-r--r-- | source4/lib/ldb/modules/ldb_map.c | 18 | ||||
| -rw-r--r-- | source4/lib/ldb/modules/schema.c | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/source4/lib/ldb/modules/ldb_map.c b/source4/lib/ldb/modules/ldb_map.c index ecb49de440..4a21defc2b 100644 --- a/source4/lib/ldb/modules/ldb_map.c +++ b/source4/lib/ldb/modules/ldb_map.c @@ -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: diff --git a/source4/lib/ldb/modules/schema.c b/source4/lib/ldb/modules/schema.c index 73b07023da..556a35060d 100644 --- a/source4/lib/ldb/modules/schema.c +++ b/source4/lib/ldb/modules/schema.c @@ -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: |