ITS#6813

diff --git a/CHANGES b/CHANGES
index 6d5a823182d935aa0b58708cbe5a50bf31caeb47..03e90817ff2d9c046041f4c594604259a78a81ef 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -38,6 +38,7 @@ OpenLDAP 2.4.24 Engineering
        Fixed libldap url parsing with NULL host (ITS#6653)
        Fixed libldap ldap_open_internal_connection (ITS#6788)
        Fixed libldap sync checking for BER errors (ITS#6738)   
+       Fixed libldap variable usage (ITS#6813)
        Fixed libldap MozNSS default cipher suites (ITS#6790)
        Fixed libldap MozNSS cert usage types/values (ITS#6791)
        Fixed libldap MozNSS restart module after fork() (ITS#6802)

diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index d8d601e8142a6d2fe4e9e476f8a5aa521945478e..dd270374fd44b6f8369f6ad0cd7d7d0090e30497 100644 (file)
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -723,9 +723,9 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
                        async);
    
                if ( (rc == 0) || (rc == -2) ) {
-                       i = ldap_int_connect_cbs( ld, sb, &s, srv, (struct sockaddr *)&sin );
-                       if ( i )
-                               rc = i;
+                       int err = ldap_int_connect_cbs( ld, sb, &s, srv, (struct sockaddr *)&sin );
+                       if ( err )
+                               rc = err;
                        else
                                break;
                }