From: Nick Porter <nick@portercomputing.co.uk>
Date: Thu, 24 Aug 2023 10:44:53 +0000 (+0100)
Subject: Correctly escape LDAP uri in map
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4a66004242e653f974549f79a9473225d5da700;p=thirdparty%2Ffreeradius-server.git

Correctly escape LDAP uri in map
---

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index 0ed32af02f9..da1b42a7abc 100644
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -1037,12 +1037,12 @@ static unlang_action_t mod_map_proc(rlm_rcode_t *p_result, void *mod_inst, UNUSE
 	int			ldap_url_ret;
 	fr_ldap_thread_trunk_t	*ttrunk;
 
-	fr_value_box_t		*url_head = fr_value_box_list_head(url);
+	fr_value_box_t		*url_head;
 	ldap_map_ctx_t		*map_ctx;
 
-	/*
-	 *	FIXME - Maybe it can be NULL?
-	 */
+	if (fr_uri_escape(url, ldap_uri_parts, NULL) < 0) RETURN_MODULE_FAIL;
+
+	url_head = fr_value_box_list_head(url);
 	if (!url_head) {
 		REDEBUG("LDAP URL cannot be (null)");
 		RETURN_MODULE_FAIL;