Fix up NT port after thread changes

[openldap] / libraries / libldap / open.c

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 2ed9021b00fd13fe5465b9b362570ead821220f3..938739d7ebabb6b839ad737e960697c3db364287 100644 (file)
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -13,6 +13,7 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <limits.h>
 
 #include <ac/stdlib.h>
 
@@ -25,7 +26,7 @@
 
 int ldap_open_defconn( LDAP *ld )
 {
-       if (( ld->ld_defconn = ldap_new_connection( ld, ld->ld_options.ldo_defludp, 1,1,0 )) == NULL )
+       if (( ld->ld_defconn = ldap_new_connection( ld, ld->ld_options.ldo_defludp, 1,1,NULL )) == NULL )
        {
                ld->ld_errno = LDAP_SERVER_DOWN;
                return -1;
@@ -77,10 +78,17 @@ int
 ldap_create( LDAP **ldp )
 {
        LDAP                    *ld;
+       struct ldapoptions      *gopts;
 
        *ldp = NULL;
-       if( ldap_int_global_options.ldo_valid != LDAP_INITIALIZED ) {
-               ldap_int_initialize();
+       /* Get pointer to global option structure */
+       if ( (gopts = LDAP_INT_GLOBAL_OPT()) == NULL) {
+               return LDAP_NO_MEMORY;
+       }
+
+       /* Initialize the global options, if not already done. */
+       if( gopts->ldo_valid != LDAP_INITIALIZED ) {
+               ldap_int_initialize(gopts, NULL);
        }
 
        Debug( LDAP_DEBUG_TRACE, "ldap_init\n", 0, 0, 0 );
@@ -126,8 +134,7 @@ ldap_create( LDAP **ldp )
        }
    
        /* copy the global options */
-       memcpy(&ld->ld_options, &ldap_int_global_options,
-               sizeof(ld->ld_options));
+       memcpy(&ld->ld_options, gopts, sizeof(ld->ld_options));
 
        ld->ld_valid = LDAP_VALID_SESSION;
 
@@ -136,8 +143,7 @@ ldap_create( LDAP **ldp )
        ld->ld_options.ldo_sctrls = NULL;
        ld->ld_options.ldo_cctrls = NULL;
 
-       ld->ld_options.ldo_defludp =
-                       ldap_url_duplist(ldap_int_global_options.ldo_defludp);
+       ld->ld_options.ldo_defludp = ldap_url_duplist(gopts->ldo_defludp);
 
        if ( ld->ld_options.ldo_defludp == NULL ) {
                LDAP_FREE( (char*)ld );
@@ -154,17 +160,13 @@ ldap_create( LDAP **ldp )
 
        ld->ld_lberoptions = LBER_USE_DER;
 
-#if defined( STR_TRANSLATION ) && defined( LDAP_DEFAULT_CHARSET )
-       ld->ld_lberoptions |= LBER_TRANSLATE_STRINGS;
-#if LDAP_CHARSET_8859 == LDAP_DEFAULT_CHARSET
-       ldap_set_string_translators( ld, ldap_8859_to_t61, ldap_t61_to_8859 );
-#endif /* LDAP_CHARSET_8859 == LDAP_DEFAULT_CHARSET */
-#endif /* STR_TRANSLATION && LDAP_DEFAULT_CHARSET */
-
-       /* we'll assume we're talking version 2 for now */
-       ld->ld_version = LDAP_VERSION2;
-
-       ber_pvt_sb_init( &(ld->ld_sb) );
+       ld->ld_sb = ber_sockbuf_alloc( );
+       if ( ld->ld_sb == NULL ) {
+               ldap_free_urllist( ld->ld_options.ldo_defludp );
+               LDAP_FREE( (char*) ld );
+               WSACleanup( );
+               return LDAP_NO_MEMORY;
+       }
 
        *ldp = ld;
        return LDAP_SUCCESS;
@@ -255,7 +257,7 @@ ldap_start_tls ( LDAP *ld,
                        LDAP_FREE(rspoid);
                if (rspdata != NULL)
                        ber_bvfree(rspdata);
-               rc = ldap_pvt_tls_start( lc->lconn_sb, ld->ld_options.ldo_tls_ctx );
+               rc = ldap_pvt_tls_start( ld, lc->lconn_sb, ld->ld_options.ldo_tls_ctx );
                if (rc != LDAP_SUCCESS)
                        return rc;
        }
@@ -271,9 +273,6 @@ open_ldap_connection( LDAP *ld, Sockbuf *sb, LDAPURLDesc *srv,
 {
        int rc = -1;
        int port;
-#ifdef HAVE_TLS
-       int tls;
-#endif
        long addr;
 
        Debug( LDAP_DEBUG_TRACE, "open_ldap_connection\n", 0, 0, 0 );
@@ -287,49 +286,65 @@ open_ldap_connection( LDAP *ld, Sockbuf *sb, LDAPURLDesc *srv,
        if ( srv->lud_host == NULL || *srv->lud_host == 0 )
                addr = htonl( INADDR_LOOPBACK );
 
-       switch ( srv->lud_protocol ) {
+       switch ( ldap_pvt_url_scheme2proto( srv->lud_scheme ) ) {
                case LDAP_PROTO_TCP:
+                       rc = ldap_connect_to_host( ld, sb, srv->lud_host,
+                               addr, port, async );
+                       if ( rc == -1 )
+                               return rc;
+                       ber_sockbuf_add_io( sb, &ber_sockbuf_io_tcp,
+                               LBER_SBIOD_LEVEL_PROVIDER, NULL );
+                       break;
                case LDAP_PROTO_UDP:
-                       rc = ldap_connect_to_host( ld, sb, srv->lud_host, addr, port, async );
+                       rc = ldap_connect_to_host( ld, sb, srv->lud_host,
+                               addr, port, async );
+                       if ( rc == -1 )
+                               return rc;
+                       ber_sockbuf_add_io( sb, &ber_sockbuf_io_udp,
+                               LBER_SBIOD_LEVEL_PROVIDER, NULL );
                        break;
-#ifdef LDAP_PF_LOCAL
-               case LDAP_PROTO_LOCAL:
-                       rc = ldap_connect_to_path( ld, sb, srv->lud_host, async );
+               case LDAP_PROTO_IPC:
+#ifdef LDAP_PF_UNIX
+                       /* only IPC mechanism supported is PF_UNIX */
+                       rc = ldap_connect_to_path( ld, sb, srv->lud_host,
+                               async );
+                       if ( rc == -1 )
+                               return rc;
+                       ber_sockbuf_add_io( sb, &ber_sockbuf_io_fd,
+                               LBER_SBIOD_LEVEL_PROVIDER, NULL );
                        break;
-#endif /* LDAP_PF_LOCAL */
+#endif /* LDAP_PF_UNIX */
                default:
-                       rc = -1;
+                       return -1;
                        break;
        }
 
-       if ( rc == -1 ) {
-               return( rc );
-       }
-   
-       ber_pvt_sb_set_io( sb, &ber_pvt_sb_io_tcp, NULL );
+       ber_sockbuf_add_io( sb, &ber_sockbuf_io_readahead,
+               LBER_SBIOD_LEVEL_PROVIDER, NULL );
+#ifdef LDAP_DEBUG
+       ber_sockbuf_add_io( sb, &ber_sockbuf_io_debug, INT_MAX, NULL );
+#endif
 
 #ifdef HAVE_TLS
-       tls = (srv->lud_properties & LDAP_URL_USE_SSL);
-       if (tls == 0)
-               tls = (srv->lud_properties & LDAP_URL_USE_SSL_UNSPECIFIED);
-
-       if ( tls != 0 ) {
-               rc = ldap_pvt_tls_start( sb, ld->ld_options.ldo_tls_ctx );
+       if (ld->ld_options.ldo_tls_mode == LDAP_OPT_X_TLS_HARD ||
+               strcmp( srv->lud_scheme, "ldaps" ) == 0 )
+       {
+               rc = ldap_pvt_tls_start( ld, sb, ld->ld_options.ldo_tls_ctx );
                if (rc != LDAP_SUCCESS)
                        return rc;
        }
 #endif
 
        if ( krbinstancep != NULL ) {
-#ifdef HAVE_KERBEROS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
                char *c;
                if (( *krbinstancep = ldap_host_connected_to( sb )) != NULL &&
                    ( c = strchr( *krbinstancep, '.' )) != NULL ) {
                        *c = '\0';
                }
-#else /* HAVE_KERBEROS */
+#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
                *krbinstancep = NULL;
-#endif /* HAVE_KERBEROS */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
        }
 
        return( 0 );