From cf687314cdc9d2f856ba03083f7014d5db9dd385 Mon Sep 17 00:00:00 2001
From: Phil Mayers
Date: Thu, 20 Sep 2012 17:24:55 +0100
Subject: [PATCH] we should use ldap_escape_func when escaping the URL
---
src/modules/rlm_ldap/rlm_ldap.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
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;
}
--
2.47.3