Fix ldap_send_initial_request() to open connection if not already

[openldap] / libraries / libldap / request.c

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 );