Merging debian version 3.2.5+dfsg-2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 7 insertions, 4 deletions

diff --git a/debian/tests/clients b/debian/tests/clients
index aeda754..d705e01 100644
--- a/debian/tests/clients
+++ b/debian/tests/clients
@@ -23,7 +23,7 @@ for client in "${VERSION_CLIENTS[@]}"; do
     fi
 done
 
-ALONE_CLIENTS=('radlast')
+ALONE_CLIENTS=('radsecret')
 for client in "${ALONE_CLIENTS[@]}"; do
     RET=$($client 2>&1 > /dev/null)
 
diff --git a/debian/tests/rlm_python3-data/ubuntu_example.py.mods-config b/debian/tests/rlm_python3-data/ubuntu_example.py.mods-config
index 5b6330f..7788559 100644
--- a/debian/tests/rlm_python3-data/ubuntu_example.py.mods-config
+++ b/debian/tests/rlm_python3-data/ubuntu_example.py.mods-config
@@ -2,6 +2,9 @@
 
 import radiusd
 
+def get_attribute(p, attribute):
+  return [x[1] for x in p if x[0] == attribute][0]
+
 def instantiate(p):
   radiusd.radlog(radiusd.L_INFO, '*** example.py instantiate ***')
   return radiusd.RLM_MODULE_OK
@@ -9,8 +12,8 @@ def instantiate(p):
 def authorize(p):
   radiusd.radlog(radiusd.L_INFO, '*** example.py authorize ***')
   # whatever password was supplied
-  config = ( ('Cleartext-Password', p[1][1]), )
-  if p[0][1] == "ubuntu":
+  config = ( ('Cleartext-Password', get_attribute(p, 'User-Password')), )
+  if get_attribute(p, 'User-Name') == "ubuntu":
       msg = "Hello ubuntu!"
       status = radiusd.RLM_MODULE_OK
       reply = ( ('Reply-Message', msg), )
diff --git a/debian/tests/rlm_python3-test b/debian/tests/rlm_python3-test
index ddf0982..12e775d 100644
--- a/debian/tests/rlm_python3-test
+++ b/debian/tests/rlm_python3-test
@@ -18,7 +18,7 @@ ln -sf /etc/freeradius/3.0/mods-available/python3 \
     /etc/freeradius/3.0/mods-enabled
 
 # restart
-systemctl restart freeradius.service
+service freeradius restart
 
 echo "Test that \"ubuntu\" can login with any password"
 result=0