Added ldap_pvt_sasl_bind() prototype to ldap_pvt.h. This

[openldap] / libraries / libldap / open.c

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 43c7b80a92fe9fd6b3a9adf414badc2d8bf64eee..2ed9021b00fd13fe5465b9b362570ead821220f3 100644 (file)
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -287,7 +287,21 @@ open_ldap_connection( LDAP *ld, Sockbuf *sb, LDAPURLDesc *srv,
        if ( srv->lud_host == NULL || *srv->lud_host == 0 )
                addr = htonl( INADDR_LOOPBACK );
 
-       rc = ldap_connect_to_host( ld, sb, srv->lud_host, addr, port, async );
+       switch ( srv->lud_protocol ) {
+               case LDAP_PROTO_TCP:
+               case LDAP_PROTO_UDP:
+                       rc = ldap_connect_to_host( ld, sb, srv->lud_host, addr, port, async );
+                       break;
+#ifdef LDAP_PF_LOCAL
+               case LDAP_PROTO_LOCAL:
+                       rc = ldap_connect_to_path( ld, sb, srv->lud_host, async );
+                       break;
+#endif /* LDAP_PF_LOCAL */
+               default:
+                       rc = -1;
+                       break;
+       }
+
        if ( rc == -1 ) {
                return( rc );
        }
@@ -295,9 +309,10 @@ open_ldap_connection( LDAP *ld, Sockbuf *sb, LDAPURLDesc *srv,
        ber_pvt_sb_set_io( sb, &ber_pvt_sb_io_tcp, NULL );
 
 #ifdef HAVE_TLS
-       tls = srv->lud_ldaps;
-       if (tls == -1)
-               tls = ld->ld_options.ldo_tls_mode;
+       tls = (srv->lud_properties & LDAP_URL_USE_SSL);
+       if (tls == 0)
+               tls = (srv->lud_properties & LDAP_URL_USE_SSL_UNSPECIFIED);
+
        if ( tls != 0 ) {
                rc = ldap_pvt_tls_start( sb, ld->ld_options.ldo_tls_ctx );
                if (rc != LDAP_SUCCESS)