Added the functions ldap_rename2() and ldap_rename2_s() to support LDAP

[openldap] / libraries / libldap / open.c

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 53fdb9e547bce1235d471baf5104e70812c94ed8..a1db516cbb49b2ca5999d1f76e073b33fb680eb3 100644 (file)
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -24,6 +24,7 @@
 
 #include "ldap-int.h"
 
+
 /*
  * ldap_open - initialize and connect to an ldap server.  A magic cookie to
  * be used for future communication is returned on success, NULL on failure.
@@ -132,7 +133,7 @@ ldap_init( char *defhost, int defport )
 }      /* The WinSock DLL is acceptable. Proceed. */
 
 #elif HAVE_WINSOCK
-{      WSADATA wsaData
+{      WSADATA wsaData;
        if ( WSAStartup( 0x0101, &wsaData ) != 0 ) {
            return( NULL );
        }
@@ -143,7 +144,7 @@ ldap_init( char *defhost, int defport )
            WSACleanup( );
                return( NULL );
        }
-
+   
        /* copy the global options */
        memcpy(&ld->ld_options, &openldap_ldap_global_options,
                sizeof(ld->ld_options));
@@ -198,7 +199,8 @@ ldap_init( char *defhost, int defport )
        /* we'll assume we're talking version 2 for now */
        ld->ld_version = LDAP_VERSION2;
 
-       ld->ld_sb.sb_sd = -1;
+       lber_pvt_sb_init( &(ld->ld_sb) );
+
        return( ld );
 }
 
@@ -255,6 +257,8 @@ open_ldap_connection( LDAP *ld, Sockbuf *sb, char *host, int defport,
        if ( rc == -1 ) {
                return( rc );
        }
+   
+       lber_pvt_sb_set_io( sb, &lber_pvt_sb_io_tcp, NULL );
 
        if ( krbinstancep != NULL ) {
 #ifdef HAVE_KERBEROS