diff options
| author | Jakub Hrozek <jhrozek@redhat.com> | 2015-03-10 13:05:22 +0100 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-03-23 08:33:57 +0100 |
| commit | 7a62712d6961d4afcb6b4a4fd7e92c6738f73b6e (patch) | |
| tree | 9fbe96a516af1165a68249f3eb45e54a28a7f4f9 | |
| parent | f0072e2b102f3b553533402d4ae42b1989b0370e (diff) | |
| download | sssd-7a62712d6961d4afcb6b4a4fd7e92c6738f73b6e.tar.gz sssd-7a62712d6961d4afcb6b4a4fd7e92c6738f73b6e.tar.xz sssd-7a62712d6961d4afcb6b4a4fd7e92c6738f73b6e.zip | |
SDAP: Make StartTLS bind configurable with ldap_opt_timeout
Related:
https://fedorahosted.org/sssd/ticket/1501
Reviewed-by: Pavel Reichl <preichl@redhat.com>
| -rw-r--r-- | src/man/sssd-ldap.5.xml | 5 | ||||
| -rw-r--r-- | src/providers/ldap/sdap_async_connection.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml index a93e6dfe7..6088a1286 100644 --- a/src/man/sssd-ldap.5.xml +++ b/src/man/sssd-ldap.5.xml @@ -1236,8 +1236,9 @@ calls to synchronous LDAP APIs will abort if no response is received. Also controls the timeout when communicating with the KDC in case of SASL - bind, the timeout of an LDAP bind operation and - password change extended operation. + bind, the timeout of an LDAP bind operation, + password change extended operation and the + StartTLS operation. </para> <para> Default: 6 diff --git a/src/providers/ldap/sdap_async_connection.c b/src/providers/ldap/sdap_async_connection.c index ded371098..bffe787c9 100644 --- a/src/providers/ldap/sdap_async_connection.c +++ b/src/providers/ldap/sdap_async_connection.c @@ -314,9 +314,10 @@ static void sdap_sys_connect_done(struct tevent_req *subreq) ret = sdap_set_connected(state->sh, state->ev); if (ret) goto fail; - /* FIXME: get timeouts from configuration, for now 5 secs. */ ret = sdap_op_add(state, state->ev, state->sh, msgid, - sdap_connect_done, req, 5, &state->op); + sdap_connect_done, req, + dp_opt_get_int(state->opts->basic, SDAP_OPT_TIMEOUT), + &state->op); if (ret) { DEBUG(SSSDBG_CRIT_FAILURE, "Failed to set up operation!\n"); goto fail; |