Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Tero Saarni
OpenLDAP
Commits
9e35884f
Commit
9e35884f
authored
Jan 31, 2019
by
Howard Chu
Committed by
Quanah Gibson-Mount
Jan 31, 2019
Browse files
ITS#8963 use BIND timeout for start_tls
Since we only support it in conjunction with Bind anyway, not as a standalone op
parent
3a5ce78d
Changes
1
Hide whitespace changes
Inline
Side-by-side
servers/slapd/back-ldap/bind.c
View file @
9e35884f
...
...
@@ -746,7 +746,7 @@ ldap_back_prepare_conn( ldapconn_t *lc, Operation *op, SlapReply *rs, ldap_back_
assert
(
li
->
li_uri_mutex_do_not_lock
==
0
);
li
->
li_uri_mutex_do_not_lock
=
1
;
rs
->
sr_err
=
ldap_back_start_tls
(
ld
,
op
->
o_protocol
,
&
is_tls
,
li
->
li_uri
,
flags
,
li
->
li_timeout
[
SLAP_OP_
EXTENDE
D
],
&
rs
->
sr_text
);
li
->
li_uri
,
flags
,
li
->
li_timeout
[
SLAP_OP_
BIN
D
],
&
rs
->
sr_text
);
li
->
li_uri_mutex_do_not_lock
=
0
;
ldap_pvt_thread_mutex_unlock
(
&
li
->
li_uri_mutex
);
if
(
rs
->
sr_err
!=
LDAP_SUCCESS
)
{
...
...
@@ -1642,7 +1642,7 @@ ldap_back_default_rebind( LDAP *ld, LDAP_CONST char *url, ber_tag_t request,
const
char
*
text
=
NULL
;
rc
=
ldap_back_start_tls
(
ld
,
0
,
&
is_tls
,
url
,
lc
->
lc_flags
,
lc
->
lc_ldapinfo
->
li_timeout
[
SLAP_OP_
EXTENDE
D
],
&
text
);
lc
->
lc_ldapinfo
->
li_timeout
[
SLAP_OP_
BIN
D
],
&
text
);
if
(
rc
!=
LDAP_SUCCESS
)
{
return
rc
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment