New upstream release (7.8p1)

Closes: #907534

1 files changed, 8 insertions, 4 deletions

diff --git a/regress/allow-deny-users.sh b/regress/allow-deny-users.sh
index 4165111e0..5c3895122 100644
--- a/regress/allow-deny-users.sh
+++ b/regress/allow-deny-users.sh
@@ -1,6 +1,6 @@
 # Public Domain
 # Zev Weiss, 2016
-# $OpenBSD: allow-deny-users.sh,v 1.4 2017/10/20 02:13:41 djm Exp $
+# $OpenBSD: allow-deny-users.sh,v 1.5 2018/07/13 02:13:50 djm Exp $
 
 tid="AllowUsers/DenyUsers"
 
@@ -10,6 +10,8 @@ if [ "x$me" = "x" ]; then
 fi
 other="nobody"
 
+cp $OBJ/sshd_proxy $OBJ/sshd_proxy.orig
+
 test_auth()
 {
         deny="$1"
@@ -17,17 +19,19 @@ test_auth()
         should_succeed="$3"
         failmsg="$4"
 
+        cp $OBJ/sshd_proxy.orig $OBJ/sshd_proxy
+        echo DenyUsers="$deny" >> $OBJ/sshd_proxy
+        echo AllowUsers="$allow" >> $OBJ/sshd_proxy
+
         start_sshd -oDenyUsers="$deny" -oAllowUsers="$allow"
 
-        ${SSH} -F $OBJ/ssh_config "$me@somehost" true
+        ${SSH} -F $OBJ/ssh_proxy "$me@somehost" true
         status=$?
 
         if (test $status -eq 0 && ! $should_succeed) \
             || (test $status -ne 0 && $should_succeed); then
                 fail "$failmsg"
         fi
-
-        stop_sshd
 }
 
 #         DenyUsers     AllowUsers    should_succeed  failure_message