Use %file.cat() to read test crls

diff --git a/src/tests/modules/crl/module.conf b/src/tests/modules/crl/module.conf
index ac74204e7b3a10a4062b52f58bae642440b57bc6..07325fceb70eeeed95257b16d72bbad0c2964315 100644 (file)
--- 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 dc7b7106df357dc05a2b4e60d8cbb9594050c2fc..edd55301a332284fcb246d0c5507b2948bbd3677 100644 (file)
--- 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)
 }