From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 1 Dec 2016 02:42:26 +0000 (-0500)
Subject: Cache pool_inst so if binding/reconnecting fails we still have access to it
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfcad50863020fb87e7d186c6bea1996e09bf4b1;p=thirdparty%2Ffreeradius-server.git

Cache pool_inst so if binding/reconnecting fails we still have access to it
---

diff --git a/src/modules/rlm_ldap/ldap.c b/src/modules/rlm_ldap/ldap.c
index dd5754aeb8a..d01b4958369 100644
--- a/src/modules/rlm_ldap/ldap.c
+++ b/src/modules/rlm_ldap/ldap.c
@@ -831,6 +831,7 @@ ldap_rcode_t rlm_ldap_bind(rlm_ldap_t const *inst,
 			   LDAPControl **serverctrls, LDAPControl **clientctrls)
 {
 	ldap_rcode_t		status = LDAP_PROC_ERROR;
+	ldap_pool_inst_t	*pool_inst = (*pconn)->pool_inst;
 
 	int			msgid = -1;
 
@@ -922,7 +923,7 @@ ldap_rcode_t rlm_ldap_bind(rlm_ldap_t const *inst,
 				if (*pconn) {
 					ROPTIONAL(RWDEBUG, WARN, "Bind with %s to %s failed: %s. Got new socket, "
 						  "retrying...", *dn ? dn : "(anonymous)",
-						  (*pconn)->pool_inst->server, error);
+						  pool_inst->server, error);
 
 					talloc_free(extra); /* don't leak debug info */
 
@@ -938,7 +939,7 @@ ldap_rcode_t rlm_ldap_bind(rlm_ldap_t const *inst,
 			/* FALL-THROUGH */
 		default:
 			ROPTIONAL(REDEBUG, ERROR, "Bind with %s to %s failed: %s", *dn ? dn : "(anonymous)",
-				  (*pconn)->pool_inst->server, error);
+				  pool_inst->server, error);
 			LDAP_EXTRA_DEBUG();
 
 			break;