diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2021-06-07 00:00:50 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-06-08 17:17:24 +1000 |
| commit | 9018bd821fca17e26e92f7a7e51d9b24cd62f2db (patch) | |
| tree | 9bfebaa269343d7c1731d81833c27635a719d09e /regress/allow-deny-users.sh | |
| parent | a10f929d1ce80640129fc5b6bc1acd9bf689169e (diff) | |
| download | openssh-git-9018bd821fca17e26e92f7a7e51d9b24cd62f2db.tar.gz | |
upstream: prepare for stricter sshd_config parsing that will refuse
a config that has {Allow,Deny}{Users,Groups} on a line with no subsequent
arguments. Such lines are permitted but are nonsensical noops ATM
OpenBSD-Regress-ID: ef65463fcbc0bd044e27f3fe400ea56eb4b8f650
Diffstat (limited to 'regress/allow-deny-users.sh')
| -rw-r--r-- | regress/allow-deny-users.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/regress/allow-deny-users.sh b/regress/allow-deny-users.sh index 5c389512..6c053eef 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.5 2018/07/13 02:13:50 djm Exp $ +# $OpenBSD: allow-deny-users.sh,v 1.6 2021/06/07 00:00:50 djm Exp $ tid="AllowUsers/DenyUsers" @@ -20,10 +20,8 @@ test_auth() 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" + test -z "$deny" || echo DenyUsers="$deny" >> $OBJ/sshd_proxy + test -z "$allow" || echo AllowUsers="$allow" >> $OBJ/sshd_proxy ${SSH} -F $OBJ/ssh_proxy "$me@somehost" true status=$? |