diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-07-13 02:13:50 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-07-13 12:14:38 +1000 |
| commit | 7449c178e943e5c4f6c8416a4e41d93b70c11c9e (patch) | |
| tree | b7504ce184e389f40a81f70f4274d682bbd059c9 | |
| parent | dbab02f9208d9baa134cec1d007054ec82b96ca9 (diff) | |
upstream: make this use ssh_proxy rather than starting/stopping a
daemon for each testcase
OpenBSD-Regress-ID: 608b7655ea65b1ba8fff5a13ce9caa60ef0c8166
| -rw-r--r-- | regress/allow-deny-users.sh | 12 |
1 files 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@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 |