getbyname/getbyaddr should share mutex per ITS#563.

[openldap] / libraries / libldap / open.c

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 955733482f3b09ed237bc295214e8d70be253e48..d8b1aaeb55dcc0ccce14a7bd1650f13eaf1ebf98 100644 (file)
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -13,6 +13,7 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <limits.h>
 
 #include <ac/stdlib.h>
 
@@ -154,14 +155,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 */
-
-       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;
@@ -283,24 +283,41 @@ open_ldap_connection( LDAP *ld, Sockbuf *sb, LDAPURLDesc *srv,
 
        switch ( srv->lud_protocol ) {
                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 );
+                       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 */
                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
        if (ld->ld_options.ldo_tls_mode == LDAP_OPT_X_TLS_HARD ||