Merge remote branch 'origin/mdb.master'

[openldap] / libraries / libldap / os-local.c

diff --git a/libraries/libldap/os-local.c b/libraries/libldap/os-local.c
index f6114373f575147251bb9a37a4117839612ee4a3..7f1f83100261afd615a09b55dfbbef5efad50abe 100644 (file)
--- a/libraries/libldap/os-local.c
+++ b/libraries/libldap/os-local.c
@@ -328,11 +328,6 @@ ldap_connect_to_path(LDAP *ld, Sockbuf *sb, LDAPURLDesc *srv, int async)
 
        oslocal_debug(ld, "ldap_connect_to_path\n",0,0,0);
 
-       s = ldap_pvt_socket( ld );
-       if ( s == AC_SOCKET_INVALID ) {
-               return -1;
-       }
-
        if ( path == NULL || path[0] == '\0' ) {
                path = LDAPI_SOCK;
        } else {
@@ -342,6 +337,11 @@ ldap_connect_to_path(LDAP *ld, Sockbuf *sb, LDAPURLDesc *srv, int async)
                }
        }
 
+       s = ldap_pvt_socket( ld );
+       if ( s == AC_SOCKET_INVALID ) {
+               return -1;
+       }
+
        oslocal_debug(ld, "ldap_connect_to_path: Trying %s\n", path, 0, 0);
 
        memset( &server, '\0', sizeof(server) );
@@ -351,10 +351,7 @@ ldap_connect_to_path(LDAP *ld, Sockbuf *sb, LDAPURLDesc *srv, int async)
        rc = ldap_pvt_connect(ld, s, &server, async);
 
        if (rc == 0) {
-               int err;
-               err = ldap_int_connect_cbs( ld, sb, &s, srv, (struct sockaddr *)&server );
-               if ( err )
-                       rc = err;
+               rc = ldap_int_connect_cbs( ld, sb, &s, srv, (struct sockaddr *)&server );
        }
        if ( rc ) {
                ldap_pvt_close_socket(ld, s);