From 971b71d45d3fb5666862562b949f9aeff8d7f941 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 31 Jan 2011 20:21:47 +0000
Subject: [PATCH] ITS#6813
---
CHANGES | 1 +
libraries/libldap/os-ip.c | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/CHANGES b/CHANGES
index 6d5a823182..03e90817ff 100644
--- 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 d8d601e814..dd270374fd 100644
--- 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;
}
--
GitLab