{
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 ) ) {
}
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 ) {
{
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 ) ) {
}
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 ) {
return 0;
}
- if ( lo != NULL ) {
+ if ( ld != NULL ) {
return -1;
}
}
#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;