summaryrefslogtreecommitdiff
path: root/src/providers/ipa
diff options
context:
space:
mode:
authorSumit Bose <sbose@redhat.com>2011-01-12 11:31:24 +0100
committerStephen Gallagher <sgallagh@redhat.com>2011-01-17 07:59:54 -0500
commita530a96721d8106a6839b6b643b0abc5d7a7b9e0 (patch)
treed53aaff43201c62d8d97db5509b4506e6f3a2746 /src/providers/ipa
parentcbe7c54c2caf718bdea7ca6660ba8193d759d2d5 (diff)
downloadsssd-a530a96721d8106a6839b6b643b0abc5d7a7b9e0.tar.gz
sssd-a530a96721d8106a6839b6b643b0abc5d7a7b9e0.tar.bz2
sssd-a530a96721d8106a6839b6b643b0abc5d7a7b9e0.zip
Add timeout parameter to sdap_get_generic_send()
Diffstat (limited to 'src/providers/ipa')
-rw-r--r--src/providers/ipa/ipa_access.c53
-rw-r--r--src/providers/ipa/ipa_auth.c4
2 files changed, 34 insertions, 23 deletions
diff --git a/src/providers/ipa/ipa_access.c b/src/providers/ipa/ipa_access.c
index c66bb9c8..61caef10 100644
--- a/src/providers/ipa/ipa_access.c
+++ b/src/providers/ipa/ipa_access.c
@@ -535,14 +535,17 @@ struct tevent_req *hbac_get_service_data_send(TALLOC_CTX *memctx,
goto fail;
}
subreq = sdap_get_generic_send(state,
- hbac_ctx_ev(state->hbac_ctx),
- hbac_ctx_sdap_id_ctx(state->hbac_ctx)->opts,
- sdap_handle,
- state->services_search_base,
- LDAP_SCOPE_SUB,
- state->services_filter,
- state->services_attrs,
- NULL, 0);
+ hbac_ctx_ev(state->hbac_ctx),
+ hbac_ctx_sdap_id_ctx(state->hbac_ctx)->opts,
+ sdap_handle,
+ state->services_search_base,
+ LDAP_SCOPE_SUB,
+ state->services_filter,
+ state->services_attrs,
+ NULL, 0,
+ dp_opt_get_int(
+ hbac_ctx_sdap_id_ctx(state->hbac_ctx)->opts->basic,
+ SDAP_SEARCH_TIMEOUT));
if (subreq == NULL) {
DEBUG(1, ("sdap_get_generic_send failed.\n"));
@@ -830,13 +833,16 @@ static struct tevent_req *hbac_get_host_info_send(TALLOC_CTX *memctx,
goto fail;
}
subreq = sdap_get_generic_send(state, hbac_ctx_ev(state->hbac_ctx),
- hbac_ctx_sdap_id_ctx(state->hbac_ctx)->opts,
- sdap_handle,
- state->host_search_base,
- LDAP_SCOPE_SUB,
- state->host_filter,
- state->host_attrs,
- NULL, 0);
+ hbac_ctx_sdap_id_ctx(state->hbac_ctx)->opts,
+ sdap_handle,
+ state->host_search_base,
+ LDAP_SCOPE_SUB,
+ state->host_filter,
+ state->host_attrs,
+ NULL, 0,
+ dp_opt_get_int(
+ hbac_ctx_sdap_id_ctx(state->hbac_ctx)->opts->basic,
+ SDAP_SEARCH_TIMEOUT));
if (subreq == NULL) {
DEBUG(1, ("sdap_get_generic_send failed.\n"));
@@ -1148,13 +1154,16 @@ static struct tevent_req *hbac_get_rules_send(TALLOC_CTX *memctx,
goto fail;
}
subreq = sdap_get_generic_send(state, hbac_ctx_ev(state->hbac_ctx),
- hbac_ctx_sdap_id_ctx(state->hbac_ctx)->opts,
- sdap_handle,
- state->hbac_search_base,
- LDAP_SCOPE_SUB,
- state->hbac_filter,
- state->hbac_attrs,
- NULL, 0);
+ hbac_ctx_sdap_id_ctx(state->hbac_ctx)->opts,
+ sdap_handle,
+ state->hbac_search_base,
+ LDAP_SCOPE_SUB,
+ state->hbac_filter,
+ state->hbac_attrs,
+ NULL, 0,
+ dp_opt_get_int(
+ hbac_ctx_sdap_id_ctx(state->hbac_ctx)->opts->basic,
+ SDAP_SEARCH_TIMEOUT));
if (subreq == NULL) {
DEBUG(1, ("sdap_get_generic_send failed.\n"));
diff --git a/src/providers/ipa/ipa_auth.c b/src/providers/ipa/ipa_auth.c
index 020b63f3..eb7f2917 100644
--- a/src/providers/ipa/ipa_auth.c
+++ b/src/providers/ipa/ipa_auth.c
@@ -153,7 +153,9 @@ static void get_password_migration_flag_auth_done(struct tevent_req *subreq)
subreq = sdap_get_generic_send(state, state->ev, state->sdap_auth_ctx->opts,
state->sh, search_base, LDAP_SCOPE_SUBTREE,
- IPA_CONFIG_FILTER, attrs, NULL, 0);
+ IPA_CONFIG_FILTER, attrs, NULL, 0,
+ dp_opt_get_int(state->sdap_auth_ctx->opts->basic,
+ SDAP_SEARCH_TIMEOUT));
if (!subreq) {
tevent_req_error(req, ENOMEM);
return;