Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Nadezhda Ivanova
OpenLDAP
Commits
bb6844e2
Commit
bb6844e2
authored
Mar 21, 2021
by
Howard Chu
Browse files
ITS
#7295
don't init TLS threads by default
Do it explicitly in servers
parent
7ff1f42f
Changes
4
Hide whitespace changes
Inline
Side-by-side
include/ldap_pvt.h
View file @
bb6844e2
...
...
@@ -426,7 +426,7 @@ LDAP_F (int) ldap_pvt_tls_set_option LDAP_P(( struct ldap *ld,
int
option
,
void
*
arg
));
LDAP_F
(
void
)
ldap_pvt_tls_destroy
LDAP_P
((
void
));
LDAP_F
(
int
)
ldap_pvt_tls_init
LDAP_P
((
void
));
LDAP_F
(
int
)
ldap_pvt_tls_init
LDAP_P
((
int
do_threads
));
LDAP_F
(
int
)
ldap_pvt_tls_init_def_ctx
LDAP_P
((
int
is_server
));
LDAP_F
(
int
)
ldap_pvt_tls_accept
LDAP_P
((
Sockbuf
*
sb
,
void
*
ctx_arg
));
LDAP_F
(
int
)
ldap_pvt_tls_connect
LDAP_P
((
struct
ldap
*
ld
,
Sockbuf
*
sb
,
const
char
*
host
));
...
...
libraries/libldap/tls2.c
View file @
bb6844e2
...
...
@@ -165,7 +165,7 @@ ldap_pvt_tls_destroy( void )
* Called once per implementation.
*/
static
int
tls_init
(
tls_impl
*
impl
)
tls_init
(
tls_impl
*
impl
,
int
do_threads
)
{
static
int
tls_initialized
=
0
;
...
...
@@ -177,9 +177,12 @@ tls_init(tls_impl *impl )
if
(
impl
->
ti_inited
++
)
return
0
;
if
(
do_threads
)
{
#ifdef LDAP_R_COMPILE
impl
->
ti_thr_init
();
impl
->
ti_thr_init
();
#endif
}
return
impl
->
ti_tls_init
();
}
...
...
@@ -187,9 +190,9 @@ tls_init(tls_impl *impl )
* Initialize TLS subsystem. Called once per implementation.
*/
int
ldap_pvt_tls_init
(
void
)
ldap_pvt_tls_init
(
int
do_threads
)
{
return
tls_init
(
tls_imp
);
return
tls_init
(
tls_imp
,
do_threads
);
}
/*
...
...
@@ -205,7 +208,7 @@ ldap_int_tls_init_ctx( struct ldapoptions *lo, int is_server )
if
(
lo
->
ldo_tls_ctx
)
return
0
;
tls_init
(
ti
);
tls_init
(
ti
,
0
);
if
(
is_server
&&
!
lts
.
lt_certfile
&&
!
lts
.
lt_keyfile
&&
!
lts
.
lt_cacertfile
&&
!
lts
.
lt_cacertdir
&&
...
...
@@ -1102,7 +1105,7 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv )
host
=
"localhost"
;
}
(
void
)
tls_init
(
tls_imp
);
(
void
)
tls_init
(
tls_imp
,
0
);
/*
* Use non-blocking io during SSL Handshake when a timeout is configured
...
...
servers/lloadd/main.c
View file @
bb6844e2
...
...
@@ -707,7 +707,7 @@ unhandled_option:;
}
#ifdef HAVE_TLS
rc
=
ldap_pvt_tls_init
();
rc
=
ldap_pvt_tls_init
(
1
);
if
(
rc
!=
0
)
{
Debug
(
LDAP_DEBUG_ANY
,
"main: "
"TLS init failed: %d
\n
"
,
...
...
servers/slapd/main.c
View file @
bb6844e2
...
...
@@ -858,7 +858,7 @@ unhandled_option:;
}
#ifdef HAVE_TLS
rc
=
ldap_pvt_tls_init
();
rc
=
ldap_pvt_tls_init
(
1
);
if
(
rc
!=
0
)
{
Debug
(
LDAP_DEBUG_ANY
,
"main: TLS init failed: %d
\n
"
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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