From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 6 Jan 2026 17:24:50 +0000 (-0500)
Subject: minor cleanups
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8314bb5024430b9b7704441ff9a3e323764befab;p=thirdparty%2Ffreeradius-server.git

minor cleanups

* don't run commands which are known to fail when '-p' is passed
  on the command line

* when multiple files are passed on the command-line, print out
  only the one file which had an error
---

diff --git a/src/bin/unit_test_attribute.c b/src/bin/unit_test_attribute.c
index 2f00f192f2f..befc34142ef 100644
--- a/src/bin/unit_test_attribute.c
+++ b/src/bin/unit_test_attribute.c
@@ -280,6 +280,8 @@ static dl_loader_t	*dl_loader = NULL;
 
 static fr_event_list_t	*el = NULL;
 
+static bool		allow_purify = false;
+
 static char const	*write_filename = NULL;
 static FILE		*write_fp = NULL;
 
@@ -3131,6 +3133,11 @@ static size_t command_xlat_normalise(command_result_t *result, command_file_ctx_
 	size_t			input_len = strlen(in), escaped_len;
 	fr_sbuff_parse_rules_t	p_rules = { .escapes = &fr_value_unescape_double };
 
+	if (allow_purify) {
+		fr_strerror_printf_push_head("ERROR cannot run 'xlat' when running with command-line argument '-p'");
+		RETURN_OK_WITH_ERROR();
+	}
+
 	slen = xlat_tokenize(cc->tmp_ctx, &head, &FR_SBUFF_IN(in, input_len), &p_rules,
 			     &(tmpl_rules_t) {
 				     .attr = {
@@ -3335,6 +3342,11 @@ static size_t command_xlat_argv(command_result_t *result, command_file_ctx_t *cc
 	size_t		input_len = strlen(in);
 	char		buff[1024];
 
+	if (allow_purify) {
+		fr_strerror_printf_push_head("ERROR cannot run 'xlat_argv' when running with command-line argument '-p'");
+		RETURN_OK_WITH_ERROR();
+	}
+
 	slen = xlat_tokenize_argv(cc->tmp_ctx, &head, &FR_SBUFF_IN(in, input_len),
 				  NULL, NULL,
 				  &(tmpl_rules_t) {
@@ -4162,10 +4174,10 @@ int main(int argc, char *argv[])
 	bool			do_features = false;
 	bool			do_commands = false;
 	bool			do_usage = false;
-	bool			allow_purify = false;
 	xlat_t			*xlat;
 	char			*p;
 	char const		*error_str = NULL, *fail_str = NULL;
+	char			*fail_file = "";
 
 	/*
 	 *	Must be called first, so the handler is called last
@@ -4518,7 +4530,12 @@ int main(int argc, char *argv[])
 			talloc_free(file);
 			fr_dlist_talloc_free(&lines);
 
-			if ((ret != 0) || exit_now) break;
+			if (exit_now) break;
+
+			if (ret != EXIT_SUCCESS) {
+				fail_file = argv[i];
+				break;
+			}
 		}
 
 		if (write_fp) {
@@ -4595,7 +4612,7 @@ do { \
 		 *	Print any command needed to run the test from the command line.
 		 */
 		p = getenv("UNIT_TEST_ATTRIBUTE");
-		if (p) printf("%s\n", p);
+		if (p) printf("%s %s\n", p, fail_file);
 	}