From 03703a58d7fe441ec5dcbe1814cea3f55544de55 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Mon, 29 May 2006 11:57:09 +0000 Subject: r15932: Remove per request creds They have never benn used and make little sense too imo (This used to be commit f0c1d08d50f8a3e25650ac85b178ec7a43e433d9) --- source4/lib/ldb/common/ldb.c | 5 ----- source4/lib/ldb/include/ldb.h | 3 --- source4/lib/ldb/modules/asq.c | 4 ---- source4/lib/ldb/modules/operational.c | 1 - source4/lib/ldb/modules/paged_results.c | 2 -- source4/lib/ldb/modules/sort.c | 2 -- source4/lib/ldb/tools/ldbsearch.c | 1 - 7 files changed, 18 deletions(-) (limited to 'source4/lib') diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c index f348001456..28b9728d0a 100644 --- a/source4/lib/ldb/common/ldb.c +++ b/source4/lib/ldb/common/ldb.c @@ -444,7 +444,6 @@ int ldb_search(struct ldb_context *ldb, req->op.search.attrs = attrs; req->controls = NULL; - req->creds = NULL; req->async.context = res; req->async.callback = ldb_search_callback; req->async.timeout = 600; /* 10 minutes */ @@ -512,7 +511,6 @@ int ldb_add(struct ldb_context *ldb, req->operation = LDB_ASYNC_ADD; req->op.add.message = message; req->controls = NULL; - req->creds = NULL; req->async.context = NULL; req->async.callback = NULL; req->async.timeout = 600; /* 10 minutes */ @@ -545,7 +543,6 @@ int ldb_modify(struct ldb_context *ldb, req->operation = LDB_ASYNC_MODIFY; req->op.add.message = message; req->controls = NULL; - req->creds = NULL; req->async.context = NULL; req->async.callback = NULL; req->async.timeout = 600; /* 10 minutes */ @@ -575,7 +572,6 @@ int ldb_delete(struct ldb_context *ldb, const struct ldb_dn *dn) req->operation = LDB_ASYNC_DELETE; req->op.del.dn = dn; req->controls = NULL; - req->creds = NULL; req->async.context = NULL; req->async.callback = NULL; req->async.timeout = 600; /* 10 minutes */ @@ -605,7 +601,6 @@ int ldb_rename(struct ldb_context *ldb, const struct ldb_dn *olddn, const struct req->op.rename.olddn = olddn; req->op.rename.newdn = newdn; req->controls = NULL; - req->creds = NULL; req->async.context = NULL; req->async.callback = NULL; req->async.timeout = 600; /* 10 minutes */ diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h index 9f0613feaa..8f21aec046 100644 --- a/source4/lib/ldb/include/ldb.h +++ b/source4/lib/ldb/include/ldb.h @@ -561,8 +561,6 @@ struct ldb_control { void *data; }; -struct ldb_credentials; - enum ldb_request_type { LDB_REQ_SEARCH, LDB_REQ_ADD, @@ -659,7 +657,6 @@ struct ldb_request { } op; struct ldb_control **controls; - struct ldb_credentials *creds; struct { void *context; diff --git a/source4/lib/ldb/modules/asq.c b/source4/lib/ldb/modules/asq.c index 3a29d3f266..884616abdd 100644 --- a/source4/lib/ldb/modules/asq.c +++ b/source4/lib/ldb/modules/asq.c @@ -117,7 +117,6 @@ static int asq_search_sync(struct ldb_module *module, struct ldb_control *contro return LDB_ERR_OPERATIONS_ERROR; base_attrs[1] = NULL; base_req->op.search.attrs = (const char * const *)base_attrs; - base_req->creds = req->creds; ret = ldb_request(module->ldb, base_req); @@ -154,7 +153,6 @@ static int asq_search_sync(struct ldb_module *module, struct ldb_control *contro exp_req->op.search.scope = LDB_SCOPE_BASE; exp_req->op.search.tree = req->op.search.tree; exp_req->op.search.attrs = req->op.search.attrs; - exp_req->creds = req->creds; ret = ldb_request(module->ldb, exp_req); @@ -416,7 +414,6 @@ static int asq_search(struct ldb_module *module, struct ldb_request *req) return LDB_ERR_OPERATIONS_ERROR; base_attrs[1] = NULL; ac->base_req->op.search.attrs = (const char * const *)base_attrs; - ac->base_req->creds = req->creds; ac->base_req->async.context = ac; ac->base_req->async.callback = asq_base_callback; @@ -470,7 +467,6 @@ static int asq_async_requests(struct ldb_async_handle *handle) { ac->reqs[i]->op.search.scope = LDB_SCOPE_BASE; ac->reqs[i]->op.search.tree = ac->base_req->op.search.tree; ac->reqs[i]->op.search.attrs = ac->req_attrs; - ac->reqs[i]->creds = ac->base_req->creds; ac->reqs[i]->async.context = ac; ac->reqs[i]->async.callback = asq_reqs_callback; diff --git a/source4/lib/ldb/modules/operational.c b/source4/lib/ldb/modules/operational.c index b47adf0652..084105fd85 100644 --- a/source4/lib/ldb/modules/operational.c +++ b/source4/lib/ldb/modules/operational.c @@ -485,7 +485,6 @@ static int operational_search(struct ldb_module *module, struct ldb_request *req else down_req->op.search.attrs = req->op.search.attrs; down_req->controls = req->controls; - down_req->creds = req->creds; down_req->async.context = ac; down_req->async.callback = operational_async_callback; diff --git a/source4/lib/ldb/modules/paged_results.c b/source4/lib/ldb/modules/paged_results.c index fab1ca5ac1..71b99184a1 100644 --- a/source4/lib/ldb/modules/paged_results.c +++ b/source4/lib/ldb/modules/paged_results.c @@ -431,8 +431,6 @@ static int paged_search(struct ldb_module *module, struct ldb_request *req) return LDB_ERR_OPERATIONS_ERROR; } - ac->store->req->creds = req->creds; - ac->store->req->async.context = ac; ac->store->req->async.callback = paged_search_async_callback; ac->store->req->async.timeout = req->async.timeout; diff --git a/source4/lib/ldb/modules/sort.c b/source4/lib/ldb/modules/sort.c index 9f03100dd0..6905417e95 100644 --- a/source4/lib/ldb/modules/sort.c +++ b/source4/lib/ldb/modules/sort.c @@ -424,8 +424,6 @@ static int server_sort_search_async(struct ldb_module *module, struct ldb_reques return LDB_ERR_OPERATIONS_ERROR; } - ac->req->creds = req->creds; - ac->req->async.context = ac; ac->req->async.callback = server_sort_search_async_callback; ac->req->async.timeout = req->async.timeout; diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c index ba65df49e8..3378ade244 100644 --- a/source4/lib/ldb/tools/ldbsearch.c +++ b/source4/lib/ldb/tools/ldbsearch.c @@ -224,7 +224,6 @@ static int do_search(struct ldb_context *ldb, if (req->op.search.tree == NULL) return -1; req->op.search.attrs = attrs; req->controls = actx->req_ctrls; - req->creds = NULL; req->async.context = actx; req->async.callback = &search_callback; req->async.timeout = 3600; /* TODO: make this settable by command line */ -- cgit