summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2006-05-29 11:57:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:08:41 -0500
commit03703a58d7fe441ec5dcbe1814cea3f55544de55 (patch)
treeafe4aa0781f0d90c919caa00718a7234d062ab1f
parent279e9166defca334d27bdde7805760a7de1f169f (diff)
downloadsamba-03703a58d7fe441ec5dcbe1814cea3f55544de55.tar.gz
samba-03703a58d7fe441ec5dcbe1814cea3f55544de55.tar.bz2
samba-03703a58d7fe441ec5dcbe1814cea3f55544de55.zip
r15932: Remove per request creds
They have never benn used and make little sense too imo (This used to be commit f0c1d08d50f8a3e25650ac85b178ec7a43e433d9)
-rw-r--r--source4/dsdb/samdb/ldb_modules/extended_dn.c2
-rw-r--r--source4/dsdb/samdb/ldb_modules/kludge_acl.c1
-rw-r--r--source4/dsdb/samdb/ldb_modules/password_hash.c2
-rw-r--r--source4/dsdb/samdb/ldb_modules/rootdse.c1
-rw-r--r--source4/lib/ldb/common/ldb.c5
-rw-r--r--source4/lib/ldb/include/ldb.h3
-rw-r--r--source4/lib/ldb/modules/asq.c4
-rw-r--r--source4/lib/ldb/modules/operational.c1
-rw-r--r--source4/lib/ldb/modules/paged_results.c2
-rw-r--r--source4/lib/ldb/modules/sort.c2
-rw-r--r--source4/lib/ldb/tools/ldbsearch.c1
11 files changed, 0 insertions, 24 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn.c b/source4/dsdb/samdb/ldb_modules/extended_dn.c
index 520ffde32d..8ca82b2670 100644
--- a/source4/dsdb/samdb/ldb_modules/extended_dn.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn.c
@@ -371,8 +371,6 @@ static int extended_search_async(struct ldb_module *module, struct ldb_request *
return LDB_ERR_OPERATIONS_ERROR;
}
- down_req->creds = req->creds;
-
down_req->async.context = ac;
down_req->async.callback = extended_async_callback;
down_req->async.timeout = req->async.timeout;
diff --git a/source4/dsdb/samdb/ldb_modules/kludge_acl.c b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
index d6929bd732..23d96ba2b7 100644
--- a/source4/dsdb/samdb/ldb_modules/kludge_acl.c
+++ b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
@@ -209,7 +209,6 @@ static int kludge_acl_search_async(struct ldb_module *module, struct ldb_request
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 = kludge_acl_async_callback;
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index 0be0fff0ff..bdf1bcc27a 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -1175,7 +1175,6 @@ static int build_domain_data_request(struct ph_async_context *ac,
}
ac->dom_req->op.search.attrs = attrs;
ac->dom_req->controls = NULL;
- ac->dom_req->creds = ac->orig_req->creds;
ac->dom_req->async.context = ac;
ac->dom_req->async.callback = get_domain_data_callback;
ac->dom_req->async.timeout = ac->orig_req->async.timeout;
@@ -1507,7 +1506,6 @@ static int password_hash_mod_async_search_self(struct ldb_async_handle *h) {
}
ac->search_req->op.search.attrs = NULL;
ac->search_req->controls = NULL;
- ac->search_req->creds = ac->orig_req->creds;
ac->search_req->async.context = ac;
ac->search_req->async.callback = get_self_callback;
ac->search_req->async.timeout = ac->orig_req->async.timeout;
diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c
index 892a98db12..7e408264ec 100644
--- a/source4/dsdb/samdb/ldb_modules/rootdse.c
+++ b/source4/dsdb/samdb/ldb_modules/rootdse.c
@@ -232,7 +232,6 @@ static int rootdse_search_async(struct ldb_module *module, struct ldb_request *r
}
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 = rootdse_async_callback;
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 */