From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 26 Jan 2024 02:04:04 +0000 (-0600)
Subject: Various fixes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaada7db26f0ffde4290b47f19e4249df91e3a22;p=thirdparty%2Ffreeradius-server.git

Various fixes
---

diff --git a/src/lib/curl/base.c b/src/lib/curl/base.c
index ad184d054b3..b222e787c67 100644
--- a/src/lib/curl/base.c
+++ b/src/lib/curl/base.c
@@ -22,6 +22,7 @@
  * @copyright 2020 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
 #include <freeradius-devel/curl/base.h>
+#include <freeradius-devel/curl/xlat.h>
 #ifdef WITH_TLS
 #include <freeradius-devel/tls/base.h>
 #endif
@@ -30,7 +31,6 @@
 #include <freeradius-devel/unlang/xlat_func.h>
 
 #include "attrs.h"
-#include "xlat.h"
 
 fr_dict_attr_t const *attr_tls_certificate;
 static fr_dict_t const *dict_freeradius; /*internal dictionary for server*/
@@ -281,10 +281,10 @@ static int fr_curl_init(void)
 		xlat_t *xlat;
 
 		xlat = xlat_func_register(NULL, "uri.escape", fr_curl_xlat_uri_escape, FR_TYPE_STRING);
-		xlat_func_args_set(xlat, &fr_curl_xlat_uri_args);
+		xlat_func_args_set(xlat, fr_curl_xlat_uri_args);
 		xlat_func_safe_for_set(xlat, fr_curl_xlat_uri_escape);
 		xlat = xlat_func_register(NULL, "uri.unescape", fr_curl_xlat_uri_unescape, FR_TYPE_STRING);
-		xlat_func_args_set(xlat, &fr_curl_xlat_uri_args);
+		xlat_func_args_set(xlat, fr_curl_xlat_uri_args);
 	}
 
 	return 0;
diff --git a/src/lib/curl/xlat.c b/src/lib/curl/xlat.c
index 5e80f4b064d..63f79b23d54 100644
--- a/src/lib/curl/xlat.c
+++ b/src/lib/curl/xlat.c
@@ -25,6 +25,7 @@
 #include <freeradius-devel/util/value.h>
 #include <freeradius-devel/unlang/xlat.h>
 #include <freeradius-devel/curl/base.h>
+#include <freeradius-devel/curl/xlat.h>
 
 #include "base.h"
 
diff --git a/src/lib/curl/xlat.h b/src/lib/curl/xlat.h
index 16ad2e24b60..b08a2abbc8b 100644
--- a/src/lib/curl/xlat.h
+++ b/src/lib/curl/xlat.h
@@ -30,7 +30,7 @@ extern "C" {
 #include <curl/curl.h>
 #include <freeradius-devel/unlang/xlat.h>
 
-extern xlat_arg_parser_t const fr_curl_xlat_uri_args;
+extern xlat_arg_parser_t const fr_curl_xlat_uri_args[];
 
 xlat_action_t		fr_curl_xlat_uri_escape(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out,
 						UNUSED xlat_ctx_t const *xctx, UNUSED request_t *request,
diff --git a/src/modules/rlm_rest/rlm_rest.c b/src/modules/rlm_rest/rlm_rest.c
index 48742b76f0d..aa7992e0cc6 100644
--- a/src/modules/rlm_rest/rlm_rest.c
+++ b/src/modules/rlm_rest/rlm_rest.c
@@ -26,6 +26,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/curl/base.h>
+#include <freeradius-devel/curl/xlat.h>
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/cf_parse.h>
 #include <freeradius-devel/server/cf_util.h>