mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-18 11:05:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix TLS bug

Browse Source
This commit is contained in:
Kurt Zeilenga 2001-08-02 04:20:37 +00:00
parent eb122892a8
commit bc22713855
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libraries/libldap/tls.c
View File

@ -809,13 +809,8 @@ ldap_pvt_tls_get_option( LDAP *ld, int option, void *arg )
{
struct ldapoptions *lo;
/* Get pointer to global option structure */
lo = LDAP_INT_GLOBAL_OPT();
if (NULL == lo) {
return LDAP_NO_MEMORY;
}
if(ld != NULL) {
if( ld != NULL ) {
assert( LDAP_VALID( ld ) );
if( !LDAP_VALID( ld ) ) {
@ -823,6 +818,13 @@ ldap_pvt_tls_get_option( LDAP *ld, int option, void *arg )
}
lo = &ld->ld_options;
} else {
/* Get pointer to global option structure */
lo = LDAP_INT_GLOBAL_OPT();
if( lo == NULL ) {
return LDAP_NO_MEMORY;
}
}
switch( option ) {
@ -868,13 +870,7 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
{
struct ldapoptions *lo;
/* Get pointer to global option structure */
lo = LDAP_INT_GLOBAL_OPT();
if (NULL == lo) {
return LDAP_NO_MEMORY;
}
if(ld != NULL) {
if( ld != NULL ) {
assert( LDAP_VALID( ld ) );
if( !LDAP_VALID( ld ) ) {
@ -882,6 +878,13 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
}
lo = &ld->ld_options;
} else {
/* Get pointer to global option structure */
lo = LDAP_INT_GLOBAL_OPT();
if( lo == NULL ) {
return LDAP_NO_MEMORY;
}
}
switch( option ) {
@ -910,7 +913,7 @@ ldap_pvt_tls_set_option( LDAP *ld, int option, void *arg )
return 0;
}
if ( lo != NULL ) {
if ( ld != NULL ) {
return -1;
}

17
servers/slapd/main.c
View File

@ -358,10 +358,21 @@ int main( int argc, char **argv )
}
#ifdef HAVE_TLS
ldap_pvt_tls_init();
rc = ldap_pvt_tls_init();
if( rc != 0) {
Debug( LDAP_DEBUG_ANY,
"main: TLS init failed: %d\n",
0, 0, 0 );
rc = 1;
SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
goto destroy;
}
if (ldap_pvt_tls_init_def_ctx() != 0)
{
rc = ldap_pvt_tls_init_def_ctx();
if( rc != 0) {
Debug( LDAP_DEBUG_ANY,
"main: TLS init def ctx failed: %d\n",
0, 0, 0 );
rc = 1;
SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
goto destroy;