From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 11 Dec 2012 14:08:06 +0000 (+0000)
Subject: Pass msg_id into ldap_result
X-Git-Tag: release_3_0_0_beta1~1379
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=482167ec52f5c6bfe402117e876a6eff994db615;p=thirdparty%2Ffreeradius-server.git

Pass msg_id into ldap_result
---

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index 5931bd1ffbe..dd1b6b2fa95 100644
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -375,7 +375,7 @@ static int ldap_bind_wrapper(LDAP_CONN **pconn, const char *user,
 
 redo:
 	msg_id = ldap_bind(conn->handle, user, password,
-			       LDAP_AUTH_SIMPLE);
+			   LDAP_AUTH_SIMPLE);
 	if (msg_id < 0) {
 	get_error:
 		ldap_get_option(conn->handle, LDAP_OPT_ERROR_NUMBER,
@@ -415,7 +415,7 @@ redo:
 
 	tv.tv_sec = inst->timeout;
 	tv.tv_usec = 0;
-	rcode = ldap_result(conn->handle, ldap_errno, 1, &tv, &result);
+	rcode = ldap_result(conn->handle, msg_id, 1, &tv, &result);
 	if (rcode < 0) goto get_error;
 
 	if (rcode == 0) {