From: Phil Mayers <p.mayers@imperial.ac.uk>
Date: Thu, 20 Sep 2012 16:24:55 +0000 (+0100)
Subject: we should use ldap_escape_func when escaping the URL
X-Git-Tag: release_3_0_0_beta1~1692^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf687314cdc9d2f856ba03083f7014d5db9dd385;p=thirdparty%2Ffreeradius-server.git

we should use ldap_escape_func when escaping the URL
---

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index b382286371e..92377f9f8ed 100644
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -1214,7 +1214,8 @@ static int ldap_groupcmp(void *instance, REQUEST *req,
  * Do an xlat on an LDAP URL
  */
 static size_t ldap_xlat(void *instance, REQUEST *request, const char *fmt,
-		     char *out, size_t freespace, RADIUS_ESCAPE_STRING func)
+		     char *out, size_t freespace,
+		     UNUSED RADIUS_ESCAPE_STRING func)
 {
 	char url[MAX_FILTER_STR_LEN];
 	int res;
@@ -1228,7 +1229,7 @@ static size_t ldap_xlat(void *instance, REQUEST *request, const char *fmt,
 	LDAP_CONN *conn;
 
 	DEBUG("  [%s] - ldap_xlat", inst->xlat_name);
-	if (!radius_xlat(url, sizeof(url), fmt, request, func)) {
+	if (!radius_xlat(url, sizeof(url), fmt, request, ldap_escape_func)) {
 		radlog (L_ERR, "  [%s] Unable to create LDAP URL.\n", inst->xlat_name);
 		return 0;
 	}