diff options
author | Simo Sorce <ssorce@redhat.com> | 2009-10-01 07:10:11 -0400 |
---|---|---|
committer | Stephen Gallagher <sgallagh@redhat.com> | 2009-10-01 08:53:14 -0400 |
commit | 4e0314ecad0fb649bcc2d6384a84ae818ef7c972 (patch) | |
tree | 332b033ebe0f48485ba4a62e89c3e42355e376d7 /server/providers/ldap/sdap_async.c | |
parent | f24c2dd7cc8414ea0a5c8c4ae7766ca71554480f (diff) | |
download | sssd-4e0314ecad0fb649bcc2d6384a84ae818ef7c972.tar.gz sssd-4e0314ecad0fb649bcc2d6384a84ae818ef7c972.tar.xz sssd-4e0314ecad0fb649bcc2d6384a84ae818ef7c972.zip |
Fix long timeout on ldap operation
Always use the network timeout defined in the options.
But raise defaults to 60 seconds or enumerations can easily fail.
Diffstat (limited to 'server/providers/ldap/sdap_async.c')
-rw-r--r-- | server/providers/ldap/sdap_async.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/server/providers/ldap/sdap_async.c b/server/providers/ldap/sdap_async.c index 471cff6d4..c3ca53ed1 100644 --- a/server/providers/ldap/sdap_async.c +++ b/server/providers/ldap/sdap_async.c @@ -1907,7 +1907,10 @@ static void sdap_get_users_transaction(struct tevent_req *subreq) /* FIXME: get timeouts from configuration, for now 10 minutes */ ret = sdap_op_add(state, state->ev, state->sh, msgid, - sdap_get_users_done, req, 600, &state->op); + sdap_get_users_done, req, + sdap_go_get_int(state->opts->basic, + SDAP_NETWORK_TIMEOUT), + &state->op); if (ret) { DEBUG(1, ("Failed to set up operation!\n")); tevent_req_error(req, ret); @@ -2131,7 +2134,10 @@ static void sdap_get_groups_transaction(struct tevent_req *subreq) /* FIXME: get timeouts from configuration, for now 10 minutes */ ret = sdap_op_add(state, state->ev, state->sh, msgid, - sdap_get_groups_done, req, 600, &state->op); + sdap_get_groups_done, req, + sdap_go_get_int(state->opts->basic, + SDAP_NETWORK_TIMEOUT), + &state->op); if (ret) { DEBUG(1, ("Failed to set up operation!\n")); tevent_req_error(req, ret); @@ -2463,7 +2469,10 @@ static void sdap_get_initgr_transaction(struct tevent_req *subreq) /* FIXME: get timeouts from configuration, for now 10 minutes */ ret = sdap_op_add(state, state->ev, state->sh, msgid, - sdap_get_initgr_done, req, 600, &state->op); + sdap_get_initgr_done, req, + sdap_go_get_int(state->opts->basic, + SDAP_NETWORK_TIMEOUT), + &state->op); if (ret) { DEBUG(1, ("Failed to set up operation!\n")); tevent_req_error(req, ret); |