Fix ldap_send_initial_request() to open connection if not already

openned (by ldap_open()).  This allows ldap_init() to function
properly!

diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index eac2d1206480aac24a0914b1644c1ba63330097e..01c47fe645606ed8aeb05ac8ab4256e097c9ef52 100644 (file)
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -122,8 +122,8 @@ main( int argc, char **argv )
        (void) SIGNAL( SIGPIPE, SIG_IGN );
 #endif
 
-    if (( ld = ldap_open( ldaphost, ldapport )) == NULL ) {
-       perror( "ldap_open" );
+    if (( ld = ldap_init( ldaphost, ldapport )) == NULL ) {
+       perror( "ldap_init" );
        exit( 1 );
     }
 

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 5b18950dc768353381487579a66ed88ebb821f21..4b5ac118ab3d2d16aedbf7cd03cc7e6d7f44881c 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -184,8 +184,8 @@ main( int argc, char **argv )
 #endif
 
     if ( !not ) {
-       if (( ld = ldap_open( ldaphost, ldapport )) == NULL ) {
-           perror( "ldap_open" );
+       if (( ld = ldap_init( ldaphost, ldapport )) == NULL ) {
+           perror( "ldap_init" );
            exit( 1 );
        }
 

diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index 267cc780cf1024fd7fd538911e9e234a7473a9c8..6319f68b48e83218028d1fe62f20c72b5285244e 100644 (file)
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -146,8 +146,8 @@ main(int argc, char **argv)
        (void) SIGNAL( SIGPIPE, SIG_IGN );
 #endif
 
-    if (( ld = ldap_open( ldaphost, ldapport )) == NULL ) {
-       perror( "ldap_open" );
+    if (( ld = ldap_init( ldaphost, ldapport )) == NULL ) {
+       perror( "ldap_init" );
        exit( 1 );
     }
 

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index d6e079a25c50e1dac40a993f1a104c53136e06e7..b8ef876c6cd725ae9af9e7326c3e5187b165faa3 100644 (file)
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -568,9 +568,9 @@ main (int argc, char *argv[])
 #endif
 
        /* connect to server */
-       if ((ld = ldap_open (ldaphost, ldapport)) == NULL)
+       if ((ld = ldap_init (ldaphost, ldapport)) == NULL)
        {
-               perror (ldaphost);
+               perror ("ldap_init");
                exit (1);
        }
 

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 87a5543013c430e6213d2e42fd9d15ea2dd9e910..dc1a319dd6c02b6af2f116463ec21c3438c7e653 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -254,10 +254,6 @@ main( int argc, char **argv )
        }
     }
 
-    if ( verbose ) {
-       printf( "ldap_open( %s, %d )\n", ldaphost, ldapport );
-    }
-
        if ( debug ) {
                lber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &debug );
                ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &debug );
@@ -268,8 +264,12 @@ main( int argc, char **argv )
        (void) SIGNAL( SIGPIPE, SIG_IGN );
 #endif
 
-    if (( ld = ldap_open( ldaphost, ldapport )) == NULL ) {
-       perror( ldaphost );
+    if ( verbose ) {
+       printf( "ldap_init( %s, %d )\n", ldaphost, ldapport );
+    }
+
+    if (( ld = ldap_init( ldaphost, ldapport )) == NULL ) {
+       perror( "ldap_init" );
        exit( 1 );
     }
 

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 913c07fcfed5b091a48ccb14c70ed8f80071c78a..5792b92e0a5a6a41efc5308b776ef08e36eaaa26 100644 (file)
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -48,13 +48,11 @@ ldap_open( char *host, int port )
                return( NULL );
        }
 
-       /* we'll assume we're talking version 2 for now */
-       ld->ld_version = LDAP_VERSION2;
-
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
        if (( srv = (LDAPServer *)calloc( 1, sizeof( LDAPServer ))) ==
            NULL || ( ld->ld_defhost != NULL && ( srv->lsrv_host =
            strdup( ld->ld_defhost )) == NULL )) {
+               if(srv != NULL) free( (char*) srv );
                ldap_ld_free( ld, 0 );
                return( NULL );
        }
@@ -195,6 +193,10 @@ ldap_init( char *defhost, int defport )
 #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;
+
+       ld->ld_sb.sb_sd = -1;
        return( ld );
 }
 

diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index 7ea8e32393bba1709127cb912064b9f41e95cedc..6dfa9d1718cc9a7c70e168675e4ce0e097aa2e57 100644 (file)
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -75,12 +75,54 @@ ldap_send_initial_request( LDAP *ld, unsigned long msgtype, char *dn,
        BerElement *ber )
 {
 #if defined( LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS ) || defined( LDAP_API_FEATURE_X_OPENLDAP_V2_DNS )
-       LDAPServer      *servers;
+       LDAPServer      *servers, *srv;
 #endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS || LDAP_API_FEATURE_X_OPENLDAP_V2_DNS */
 
        Debug( LDAP_DEBUG_TRACE, "ldap_send_initial_request\n", 0, 0, 0 );
 
+       if ( ld->ld_sb.sb_sd == -1 ) {
+               /* not connected yet */
+
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
+               if (( srv = (LDAPServer *)calloc( 1, sizeof( LDAPServer ))) ==
+                   NULL || ( ld->ld_defhost != NULL && ( srv->lsrv_host =
+                   strdup( ld->ld_defhost )) == NULL ))
+               {
+                       if (srv != NULL) free( srv );
+                       ld->ld_errno = LDAP_NO_MEMORY;
+                       return( -1 );
+               }
+
+               srv->lsrv_port = ld->ld_defport;
+
+               if (( ld->ld_defconn = ldap_new_connection( ld, &srv, 1,1,0 ))
+                       == NULL )
+               {
+                       if ( ld->ld_defhost != NULL ) free( srv->lsrv_host );
+                       free( (char *)srv );
+                       ld->ld_errno = LDAP_SERVER_DOWN;
+                       return( -1 );
+               }
+               ++ld->ld_defconn->lconn_refcnt; /* so it never gets closed/freed */
+
+#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
+               if ( open_ldap_connection( ld, &ld->ld_sb, ld->ld_defhost,
+                   ld->ld_defport, &ld->ld_host, 0 ) < 0 )
+               {
+                       ldap_ld_free( ld, 0 );
+                       ld->ld_errno = LDAP_SERVER_DOWN;
+                       return( -1 );
+               }
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
+
+               Debug( LDAP_DEBUG_TRACE,
+                       "ldap_delayed_open successful, ld_host is %s\n",
+                       ( ld->ld_host == NULL ) ? "(null)" : ld->ld_host, 0, 0 );
+       }
+
+
 #if !defined( LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS ) && !defined( LDAP_API_FEATURE_X_OPENLDAP_V2_DNS )
+
        if ( ber_flush( &ld->ld_sb, ber, 1 ) != 0 ) {
                ld->ld_errno = LDAP_SERVER_DOWN;
                return( -1 );