[openssh-commits] [openssh] 02/02: upstream: make this use ssh_proxy rather than starting/stopping a

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 7449c178e943e5c4f6c8416a4e41d93b70c11c9e
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Fri Jul 13 02:13:50 2018 +0000

    upstream: make this use ssh_proxy rather than starting/stopping a
    
    daemon for each testcase
    
    OpenBSD-Regress-ID: 608b7655ea65b1ba8fff5a13ce9caa60ef0c8166
---
 regress/allow-deny-users.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/regress/allow-deny-users.sh b/regress/allow-deny-users.sh
index 4165111e..5c389512 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 at somehost" true
+	${SSH} -F $OBJ/ssh_proxy "$me at 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

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.