raduat fixes (#3323)

* raduat: Use the given instance of radclient

* raduat: Use the given DICTPATH

diff --git a/scripts/raduat b/scripts/raduat
index 2a9819b8b87018a672ea8e7c09df18e8ca3154de..d194f97670dbc31236c49e23aa93bcc12453a62f 100755 (executable)
--- a/scripts/raduat
+++ b/scripts/raduat
@@ -318,12 +318,13 @@ if [ ! -z "$file_args" ]; then
        args+=" -t \"$timeout\""
        args+=" -r \"$retries\""
        args+=" -p \"$parallel\""
+       args+=" -D \"$DICTPATH\""
        args+=" \"$target\""
        args+=" auto"
        args+=" \"$secret\""
 
-       DEBUG "Executing: radclient $args"
-       eval radclient $args; ret=$?
+       DEBUG "Executing: $RADCLIENT $args"
+       eval $RADCLIENT $args; ret=$?
        INFO "(Parallelised tests)"
        INFO ""
 
@@ -347,12 +348,13 @@ if [ ! -z "$serial_file_args" ]; then
        args+=" -t \"$timeout\""
        args+=" -r \"$retries\""
        args+=" -p 1"
+       args+=" -D \"$DICTPATH\""
        args+=" \"$target\""
        args+=" auto"
        args+=" \"$secret\""
 
-       DEBUG "Executing: radclient $args"
-       eval radclient $args; ret=$?
+       DEBUG "Executing: $RADCLIENT $args"
+       eval $RADCLIENT $args; ret=$?
        INFO "(Serialised tests)"
 
        if [ $ret -ne 0 ]; then