upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-28 10:39:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#4072 ldap_pvt_tls_init_def_ctx() returns LDAP_NO_SUPPORT if not

Browse source 
sufficiently configured. Update slapd/slurpd to act appropriately.
This commit is contained in:
Howard Chu 2005-10-09 19:55:39 +00:00
parent 2ea5a66be2
commit f54bc26357
4 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/libldap/tls.c
View file

@ -203,6 +203,12 @@ ldap_pvt_tls_init_def_ctx( void )
char *certfile = tls_opt_certfile;
char *keyfile = tls_opt_keyfile;
#ifdef LDAP_R_COMPILE
ldap_pvt_thread_mutex_lock( &tls_def_ctx_mutex );
#endif
if (( !cacertfile && !cacertdir ) || !certfile || !keyfile )
return LDAP_NOT_SUPPORTED;
#ifdef HAVE_EBCDIC
/* This ASCII/EBCDIC handling is a real pain! */
if ( ciphersuite ) {
@ -226,10 +232,6 @@ ldap_pvt_tls_init_def_ctx( void )
__atoe( keyfile );
}
#endif
#ifdef LDAP_R_COMPILE
ldap_pvt_thread_mutex_lock( &tls_def_ctx_mutex );
#endif
if ( tls_def_ctx == NULL ) {
int i;
tls_def_ctx = SSL_CTX_new( SSLv23_method() );

3
servers/slapd/extended.c
View file

@ -69,9 +69,6 @@ static struct {
{ &slap_EXOP_CANCEL, SLAP_EXOP_HIDE, cancel_extop },
{ &slap_EXOP_WHOAMI, 0, whoami_extop },
{ &slap_EXOP_MODIFY_PASSWD, SLAP_EXOP_WRITES, passwd_extop },
#ifdef HAVE_TLS
{ &slap_EXOP_START_TLS, 0, starttls_extop },
#endif
{ NULL, 0, NULL }
};

11
servers/slapd/main.c
View file

@ -669,7 +669,12 @@ unhandled_option:;
ldap_pvt_tls_set_option( NULL, LDAP_OPT_X_TLS_CTX, NULL );
rc = ldap_pvt_tls_init_def_ctx();
if( rc != 0) {
if( rc == 0) {
ldap_pvt_tls_get_option( NULL, LDAP_OPT_X_TLS_CTX, &slap_tls_ctx );
/* Restore previous ctx */
ldap_pvt_tls_set_option( NULL, LDAP_OPT_X_TLS_CTX, def_ctx );
load_extop( &slap_EXOP_START_TLS, 0, starttls_extop );
} else if ( rc != LDAP_NOT_SUPPORTED ) {
Debug( LDAP_DEBUG_ANY,
"main: TLS init def ctx failed: %d\n",
rc, 0, 0 );
@ -677,10 +682,6 @@ unhandled_option:;
SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
goto destroy;
}
/* Retrieve slapd's own ctx */
ldap_pvt_tls_get_option( NULL, LDAP_OPT_X_TLS_CTX, &slap_tls_ctx );
/* Restore previous ctx */
ldap_pvt_tls_set_option( NULL, LDAP_OPT_X_TLS_CTX, def_ctx );
}
#endif

18
servers/slurpd/main.c
View file

@ -156,10 +156,20 @@ int main( int argc, char **argv )
#ifdef HAVE_TLS
if( ldap_pvt_tls_init() || ldap_pvt_tls_init_def_ctx() ) {
fprintf( stderr, "TLS Initialization failed.\n" );
SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
rc = 1;
goto stop;
rc = 0;
/* See if we actually need TLS */
for ( i=0; i < sglob->num_replicas; i++ ) {
if ( sglob->replicas[i]->ri_tls || ( sglob->replicas[i]->ri_uri &&
!strncmp( sglob->replicas[i]->ri_uri, "ldaps:", 6 ))) {
rc = 1;
break;
}
}
if ( rc ) {
fprintf( stderr, "TLS Initialization failed.\n" );
SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
goto stop;
}
}
#endif