From: dtucker <dtucker@openbsd.org>
Date: Tue, 8 Jun 2021 07:05:27 +0000 (+0000)
Subject: Add testcases from bz#3319 for IPQoS and TunnelDevice being overridden
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4373d11768ba5bcdf7980a3fe858aef4f2c9ed10;p=openbsd

Add testcases from bz#3319 for IPQoS and TunnelDevice being overridden
on the command line.
---

diff --git a/regress/usr.bin/ssh/sshcfgparse.sh b/regress/usr.bin/ssh/sshcfgparse.sh
index 40b3f01e42c..504853d32db 100644
--- a/regress/usr.bin/ssh/sshcfgparse.sh
+++ b/regress/usr.bin/ssh/sshcfgparse.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: sshcfgparse.sh,v 1.8 2021/06/08 06:51:47 djm Exp $
+#	$OpenBSD: sshcfgparse.sh,v 1.9 2021/06/08 07:05:27 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="ssh config parse"
@@ -104,5 +104,16 @@ expect_result_present "$f" "yes"
 f=`${SSH} -GF none '-oforwardagent=SSH_AUTH_SOCK.forward' host | awk '/^forwardagent /{print$2}'`
 expect_result_present "$f" "SSH_AUTH_SOCK.forward"
 
+verbose "command line override"
+cat >$OBJ/ssh_config.0 <<EOD
+Host *
+    IPQoS af21 cs1
+    TunnelDevice 1:2
+EOD
+f=`${SSH} -GF $OBJ/ssh_config.0 -oipqos=cs1 host | awk '/^ipqos /{print$2}'`
+expect_result_present "$f" "cs1"
+f=`${SSH} -GF $OBJ/ssh_config.0 -otunneldevice=3:4 host | awk '/^tunneldevice /{print$2}'`
+expect_result_present "$f" "3:4"
+
 # cleanup
 rm -f $OBJ/ssh_config.[012]