Sync with 2.x

[openldap] / libraries / libldap / open.c

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 6f68e25c5055e425efb711b433a48214e0135cf8..904fb0af087478e275a370a040f07fe70ed5fdc3 100644 (file)
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -252,25 +252,33 @@ ldap_int_open_connection(
        char *sasl_host = NULL;
        int sasl_ssf = 0;
 #endif
+       char *host;
        int port;
        long addr;
 
        Debug( LDAP_DEBUG_TRACE, "ldap_int_open_connection\n", 0, 0, 0 );
 
-       port = srv->lud_port;
-       if (port == 0)
-               port = ld->ld_options.ldo_defport;
-       port = htons( (short) port );
-
-       addr = 0;
-       if ( srv->lud_host == NULL || *srv->lud_host == 0 )
-               addr = htonl( INADDR_LOOPBACK );
-
        switch ( ldap_pvt_url_scheme2proto( srv->lud_scheme ) ) {
                case LDAP_PROTO_TCP:
+                       port = htons( (short) srv->lud_port );
+
+                       addr = 0;
+                       if ( srv->lud_host == NULL || *srv->lud_host == 0 ) {
+                               host = NULL;
+                               addr = htonl( INADDR_LOOPBACK );
+                       } else {
+                               host = srv->lud_host;
+                       }
+
                        rc = ldap_connect_to_host( ld, conn->lconn_sb, 0,
-                               srv->lud_host, addr, port, async );
+                               host, addr, port, async );
+
                        if ( rc == -1 ) return rc;
+
+#ifdef LDAP_DEBUG
+                       ber_sockbuf_add_io( conn->lconn_sb, &ber_sockbuf_io_debug,
+                               LBER_SBIOD_LEVEL_PROVIDER, (void *)"tcp_" );
+#endif
                        ber_sockbuf_add_io( conn->lconn_sb, &ber_sockbuf_io_tcp,
                                LBER_SBIOD_LEVEL_PROVIDER, NULL );
 
@@ -281,9 +289,14 @@ ldap_int_open_connection(
                case LDAP_PROTO_IPC:
 #ifdef LDAP_PF_LOCAL
                        /* only IPC mechanism supported is PF_LOCAL (PF_UNIX) */
-                       rc = ldap_connect_to_path( ld, conn->lconn_sb, 0,
+                       rc = ldap_connect_to_path( ld, conn->lconn_sb,
                                srv->lud_host, async );
                        if ( rc == -1 ) return rc;
+
+#ifdef LDAP_DEBUG
+                       ber_sockbuf_add_io( conn->lconn_sb, &ber_sockbuf_io_debug,
+                               LBER_SBIOD_LEVEL_PROVIDER, (void *)"ipc_" );
+#endif
                        ber_sockbuf_add_io( conn->lconn_sb, &ber_sockbuf_io_fd,
                                LBER_SBIOD_LEVEL_PROVIDER, NULL );
 
@@ -306,37 +319,96 @@ ldap_int_open_connection(
 
        ber_sockbuf_add_io( conn->lconn_sb, &ber_sockbuf_io_readahead,
                LBER_SBIOD_LEVEL_PROVIDER, NULL );
+
 #ifdef LDAP_DEBUG
        ber_sockbuf_add_io( conn->lconn_sb, &ber_sockbuf_io_debug,
-               INT_MAX, NULL );
+               INT_MAX, (void *)"ldap_" );
 #endif
 
 #ifdef HAVE_TLS
        if (ld->ld_options.ldo_tls_mode == LDAP_OPT_X_TLS_HARD ||
                strcmp( srv->lud_scheme, "ldaps" ) == 0 )
        {
+               LDAPConn        *savedefconn = ld->ld_defconn;
+               ++conn->lconn_refcnt;   /* avoid premature free */
+               ld->ld_defconn = conn;
+
                rc = ldap_pvt_tls_start( ld, conn->lconn_sb,
                        ld->ld_options.ldo_tls_ctx );
 
+               ld->ld_defconn = savedefconn;
+               --conn->lconn_refcnt;
+
                if (rc != LDAP_SUCCESS) {
                        return -1;
                }
        }
 #endif
 
-       if ( conn->lconn_krbinstance != NULL ) {
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
+       if ( conn->lconn_krbinstance == NULL ) {
                char *c;
-               conn->lconn_krbinstance = ldap_host_connected_to( conn->sb );
+               conn->lconn_krbinstance = ldap_host_connected_to( conn->lconn_sb );
 
                if( conn->lconn_krbinstance != NULL && 
                    ( c = strchr( conn->lconn_krbinstance, '.' )) != NULL ) {
                        *c = '\0';
                }
-#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
-               conn->lconn_krbinstance = NULL;
-#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
        }
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
 
        return( 0 );
 }
+
+
+int ldap_open_internal_connection( LDAP **ldp, ber_socket_t *fdp )
+{
+       int rc;
+       LDAPConn *c;
+       LDAPRequest *lr;
+
+       rc = ldap_create( ldp );
+       if( rc != LDAP_SUCCESS ) {
+               *ldp = NULL;
+               return( rc );
+       }
+
+       /* Make it appear that a search request, msgid 0, was sent */
+       lr = (LDAPRequest *)LDAP_CALLOC( 1, sizeof( LDAPRequest ));
+       if( lr == NULL ) {
+               ldap_unbind( *ldp );
+               *ldp = NULL;
+               return( LDAP_NO_MEMORY );
+       }
+       memset(lr, 0, sizeof( LDAPRequest ));
+       lr->lr_msgid = 0;
+       lr->lr_status = LDAP_REQST_INPROGRESS;
+       lr->lr_res_errno = LDAP_SUCCESS;
+       (*ldp)->ld_requests = lr;
+
+       /* Attach the passed socket as the *LDAP's connection */
+       c = ldap_new_connection( *ldp, NULL, 1, 0, NULL);
+       if( c == NULL ) {
+               ldap_unbind( *ldp );
+               *ldp = NULL;
+               return( LDAP_NO_MEMORY );
+       }
+       ber_sockbuf_ctrl( c->lconn_sb, LBER_SB_OPT_SET_FD, fdp );
+#ifdef LDAP_DEBUG
+       ber_sockbuf_add_io( c->lconn_sb, &ber_sockbuf_io_debug,
+               LBER_SBIOD_LEVEL_PROVIDER, (void *)"int_" );
+#endif
+       ber_sockbuf_add_io( c->lconn_sb, &ber_sockbuf_io_tcp,
+         LBER_SBIOD_LEVEL_PROVIDER, NULL );
+       (*ldp)->ld_defconn = c;
+
+       /* Add the connection to the *LDAP's select pool */
+       ldap_mark_select_read( *ldp, c->lconn_sb );
+       ldap_mark_select_write( *ldp, c->lconn_sb );
+
+       /* Make this connection an LDAP V3 protocol connection */
+       rc = LDAP_VERSION3;
+       ldap_set_option( *ldp, LDAP_OPT_PROTOCOL_VERSION, &rc );
+
+       return( LDAP_SUCCESS );
+}