From 3d9250981c932719545280673bb392d6d17a9c0c Mon Sep 17 00:00:00 2001 From: Nick Porter Date: Sat, 21 Jun 2025 18:15:31 +0100 Subject: [PATCH] Use %file.cat() to read test crls --- src/tests/modules/crl/module.conf | 6 +----- src/tests/modules/crl/policy.conf | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/tests/modules/crl/module.conf b/src/tests/modules/crl/module.conf index ac74204e7b..07325fceb7 100644 --- a/src/tests/modules/crl/module.conf +++ b/src/tests/modules/crl/module.conf @@ -1,7 +1,7 @@ crl { source { dynamic { - http = %exec_bin('/bin/cat', "$ENV{MODULE_TEST_DIR}/ca.crl") + http = %file.cat("$ENV{MODULE_TEST_DIR}/ca.crl", 16384) } } ca_file = raddb/certs/rsa/ca.pem @@ -9,10 +9,6 @@ crl { force_expiry = 5s } -exec exec_bin { - xlat_read_binary = yes -} - linelog cacnf { destination = file file { diff --git a/src/tests/modules/crl/policy.conf b/src/tests/modules/crl/policy.conf index dc7b7106df..edd55301a3 100644 --- a/src/tests/modules/crl/policy.conf +++ b/src/tests/modules/crl/policy.conf @@ -5,13 +5,13 @@ prepare_cnf { string cnf - cnf = %exec_bin('/bin/cat', "$ENV{top_srcdir}raddb/certs/client.cnf") + cnf = %file.cat("$ENV{top_srcdir}raddb/certs/client.cnf", 16384) cnf := %str.subst(cnf, 'user', "user%{clientno}") cnf := %str.subst(cnf, ' ./', " $ENV{top_srcdir}raddb/certs/") %file.rm("$ENV{MODULE_TEST_DIR}/client%{clientno}.cnf") %clientcnf(cnf) - cnf = %exec_bin('/bin/cat', "$ENV{top_srcdir}raddb/certs/ca.cnf") + cnf = %file.cat("$ENV{top_srcdir}raddb/certs/ca.cnf", 16384) %file.rm("$ENV{MODULE_TEST_DIR}/ca%{clientno}.cnf") %cacnf(cnf) } -- 2.47.3