diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-06-07 14:29:43 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-06-08 00:31:38 +1000 |
commit | 57379dbd013ad32ee3f9989bf5f5741065428360 (patch) | |
tree | 28ae756b59a6d4df171c90c8f45f7acfebda35d2 | |
parent | 6d41815e202fbd6182c79780b6cc90e1ec1c9981 (diff) |
upstream: test the correct configuration option name
OpenBSD-Regress-ID: 492279ea9f65657f97a970e0e7c7fd0b339fee23
-rw-r--r-- | regress/forward-control.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/regress/forward-control.sh b/regress/forward-control.sh index c22ca223d..3b1f69a71 100644 --- a/regress/forward-control.sh +++ b/regress/forward-control.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: forward-control.sh,v 1.6 2018/06/06 18:25:33 djm Exp $ | 1 | # $OpenBSD: forward-control.sh,v 1.7 2018/06/07 14:29:43 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="sshd control of local and remote forwarding" | 4 | tid="sshd control of local and remote forwarding" |
@@ -210,20 +210,20 @@ rperm_tests() { | |||
210 | cp ${OBJ}/authorized_keys_${USER}.bak ${OBJ}/authorized_keys_${USER} | 210 | cp ${OBJ}/authorized_keys_${USER}.bak ${OBJ}/authorized_keys_${USER} |
211 | _prefix="AllowTcpForwarding=$_tcpfwd" | 211 | _prefix="AllowTcpForwarding=$_tcpfwd" |
212 | 212 | ||
213 | # PermitRemoteOpen via sshd_config that doesn't match | 213 | # PermitListen via sshd_config that doesn't match |
214 | ( cat ${OBJ}/sshd_proxy.bak ; | 214 | ( cat ${OBJ}/sshd_proxy.bak ; |
215 | echo "AllowTcpForwarding $_tcpfwd" ; | 215 | echo "AllowTcpForwarding $_tcpfwd" ; |
216 | echo "PermitRemoteOpen $_badfwd1 $_badfwd2" ) \ | 216 | echo "PermitListen $_badfwd1 $_badfwd2" ) \ |
217 | > ${OBJ}/sshd_proxy | 217 | > ${OBJ}/sshd_proxy |
218 | check_lfwd $_nopermit_lfwd "$_prefix, !PermitRemoteOpen" | 218 | check_lfwd $_nopermit_lfwd "$_prefix, !PermitListen" |
219 | check_rfwd $_nopermit_rfwd "$_prefix, !PermitRemoteOpen" | 219 | check_rfwd $_nopermit_rfwd "$_prefix, !PermitListen" |
220 | # PermitRemoteOpen via sshd_config that does match | 220 | # PermitListen via sshd_config that does match |
221 | ( cat ${OBJ}/sshd_proxy.bak ; | 221 | ( cat ${OBJ}/sshd_proxy.bak ; |
222 | echo "AllowTcpForwarding $_tcpfwd" ; | 222 | echo "AllowTcpForwarding $_tcpfwd" ; |
223 | echo "PermitRemoteOpen $_badfwd1 $_goodfwd $_badfwd2" ) \ | 223 | echo "PermitListen $_badfwd1 $_goodfwd $_badfwd2" ) \ |
224 | > ${OBJ}/sshd_proxy | 224 | > ${OBJ}/sshd_proxy |
225 | check_lfwd $_plain_lfwd "$_prefix, PermitRemoteOpen" | 225 | check_lfwd $_plain_lfwd "$_prefix, PermitListen" |
226 | check_rfwd $_plain_rfwd "$_prefix, PermitRemoteOpen" | 226 | check_rfwd $_plain_rfwd "$_prefix, PermitListen" |
227 | } | 227 | } |
228 | 228 | ||
229 | # permit-remote-open none mismatch match | 229 | # permit-remote-open none mismatch match |