ITS#9305 libldap: don't mask ld_errno if set during connect failure

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 6dad331ecd0241c2f44b2d4e02d08e7975270b7a..c504a0df140182d4761781c908292f2783b786ba 100644 (file)
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -43,7 +43,8 @@ int ldap_open_defconn( LDAP *ld )
                &ld->ld_options.ldo_defludp, 1, 1, NULL, 0, 0 );
 
        if( ld->ld_defconn == NULL ) {
-               ld->ld_errno = LDAP_SERVER_DOWN;
+               if ( !ld->ld_errno )
+                       ld->ld_errno = LDAP_SERVER_DOWN;
                return -1;
        }
 

diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index 6bc22a65b25a652b46a95428f7b4ed0d7ea24eef..9d8adc77ffbda77d6a0c5875c686653a0436ff1c 100644 (file)
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -509,7 +509,8 @@ ldap_new_connection( LDAP *ld, LDAPURLDesc **srvlist, int use_ldsb,
                                ber_sockbuf_free( lc->lconn_sb );
                        }
                        LDAP_FREE( (char *)lc );
-                       ld->ld_errno = LDAP_SERVER_DOWN;
+                       if ( !ld->ld_errno )
+                               ld->ld_errno = LDAP_SERVER_DOWN;
                        return( NULL );
                }