diff options
| author | Simo Sorce <idra@samba.org> | 2006-05-30 00:33:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:08:43 -0500 |
| commit | 2d19dca9c80a5e3990296dde67163fce36ac883d (patch) | |
| tree | 203044c26f00783154c8c5171f9b5a088bf46d38 /source4/lib/ldb/common | |
| parent | 0c7b82e5f6063de4114de21cf854ac67346e31f6 (diff) | |
| download | samba-2d19dca9c80a5e3990296dde67163fce36ac883d.tar.gz samba-2d19dca9c80a5e3990296dde67163fce36ac883d.tar.bz2 samba-2d19dca9c80a5e3990296dde67163fce36ac883d.zip | |
r15944: rename LDB_ASYNC_ADD -> LDB_ADD, LDB_ASYNC_MODIFY -> LDB_MODIFY, etc...
(This used to be commit 55d97ef88f377ef1dbf7b1774a15cf9035e2f320)
Diffstat (limited to 'source4/lib/ldb/common')
| -rw-r--r-- | source4/lib/ldb/common/ldb.c | 20 | ||||
| -rw-r--r-- | source4/lib/ldb/common/ldb_modules.c | 10 |
2 files changed, 15 insertions, 15 deletions
diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c index 5fbaf54920..53b4e51ff3 100644 --- a/source4/lib/ldb/common/ldb.c +++ b/source4/lib/ldb/common/ldb.c @@ -285,23 +285,23 @@ int ldb_request(struct ldb_context *ldb, struct ldb_request *req) /* 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 @@ int ldb_search(struct ldb_context *ldb, 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 @@ int ldb_add(struct ldb_context *ldb, 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 @@ int ldb_modify(struct ldb_context *ldb, 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 @@ int ldb_delete(struct ldb_context *ldb, const struct ldb_dn *dn) 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 @@ int ldb_rename(struct ldb_context *ldb, const struct ldb_dn *olddn, const struct 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; diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c index 4ce404d096..6f36bdc5e9 100644 --- a/source4/lib/ldb/common/ldb_modules.c +++ b/source4/lib/ldb/common/ldb_modules.c @@ -351,19 +351,19 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[]) 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: |