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)

diff --git a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c b/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
index defd6fbbbc1bbbde457e58ad0ef8356123cfa317..c9b453587ec9a98fe33993d6fd0fd6652b59ad15 100644 (file)
--- a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
+++ b/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
@@ -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,

diff --git a/source4/lib/ldb/modules/ldb_map.c b/source4/lib/ldb/modules/ldb_map.c
index ecb49de4404e7908cb2e1d2e8fe62085fe73f7ad..4a21defc2b1620a8c8ab77db085bdc2a49cd3584 100644 (file)
--- 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 73b07023da5f1fed7ed657a06870e8cec7a05b49..556a35060d05364e579f09196aed3a96f9870e4a 100644 (file)
--- 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: