From: Terry Burton <tez@terryburton.co.uk>
Date: Thu, 19 Mar 2020 17:17:10 +0000 (+0000)
Subject: raduat fixes (#3323)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=145d38da81669eaeca7df17def6c8fa674e7c3b7;p=thirdparty%2Ffreeradius-server.git

raduat fixes (#3323)

* raduat: Use the given instance of radclient

* raduat: Use the given DICTPATH
---

diff --git a/scripts/raduat b/scripts/raduat
index 2a9819b8b87..d194f97670d 100755
--- 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