From 660cea10b2cdc11f13ba99c89b1bbb368a4d9ff2 Mon Sep 17 00:00:00 2001
From: "djm@openbsd.org" <djm@openbsd.org>
Date: Tue, 8 Jun 2021 06:52:43 +0000
Subject: [PATCH] upstream: sprinkle some "# comment" at end of configuration
 lines

to test comment handling

OpenBSD-Regress-ID: cb82fbf40bda5c257a9f742c63b1798e5a8fdda7
---
 regress/cfginclude.sh     | 24 ++++++++++++------------
 regress/cfgmatch.sh       |  8 ++++----
 regress/servcfginclude.sh |  8 ++++----
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/regress/cfginclude.sh b/regress/cfginclude.sh
index 2fc39ce45..f5b492f17 100644
--- a/regress/cfginclude.sh
+++ b/regress/cfginclude.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: cfginclude.sh,v 1.2 2016/05/03 15:30:46 dtucker Exp $
+#	$OpenBSD: cfginclude.sh,v 1.3 2021/06/08 06:52:43 djm Exp $
 #	Placed in the Public Domain.
 
 tid="config include"
@@ -10,7 +10,7 @@ cat > $OBJ/ssh_config.i << _EOF
 Match host a
 	Hostname aa
 
-Match host b
+Match host b # comment
 	Hostname bb
 	Include $OBJ/ssh_config.i.*
 
@@ -19,10 +19,10 @@ Match host c
 	Hostname cc
 
 Match host m
-	Include $OBJ/ssh_config.i.*
+	Include $OBJ/ssh_config.i.* # comment
 
 Host d
-	Hostname dd
+	Hostname dd # comment
 
 Host e
 	Hostname ee
@@ -47,17 +47,17 @@ Match host a
 Match host b
 	Hostname bbb
 
-Match host c
+Match host c # comment
 	Hostname ccc
 
-Host d
+Host d # comment
 	Hostname ddd
 
 Host e
 	Hostname eee
 
 Host f
-	Hostname fff
+	Hostname fff # comment
 _EOF
 
 cat > $OBJ/ssh_config.i.2 << _EOF
@@ -142,7 +142,7 @@ trial a aa
 
 # cleanup
 rm -f $OBJ/ssh_config.i $OBJ/ssh_config.i.* $OBJ/ssh_config.out
-#	$OpenBSD: cfginclude.sh,v 1.2 2016/05/03 15:30:46 dtucker Exp $
+#	$OpenBSD: cfginclude.sh,v 1.3 2021/06/08 06:52:43 djm Exp $
 #	Placed in the Public Domain.
 
 tid="config include"
@@ -185,11 +185,11 @@ cat > $OBJ/ssh_config.i.1 << _EOF
 Match host a
 	Hostname aaa
 
-Match host b
+Match host b # comment
 	Hostname bbb
 
 Match host c
-	Hostname ccc
+	Hostname ccc # comment
 
 Host d
 	Hostname ddd
@@ -220,8 +220,8 @@ Host e
 Host f
 	Hostname ffff
 
-Match all
-	Hostname xxxx
+Match all # comment
+	Hostname xxxx # comment
 _EOF
 
 trial() {
diff --git a/regress/cfgmatch.sh b/regress/cfgmatch.sh
index 6620c84ed..05a666855 100644
--- a/regress/cfgmatch.sh
+++ b/regress/cfgmatch.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: cfgmatch.sh,v 1.12 2019/04/18 18:57:16 dtucker Exp $
+#	$OpenBSD: cfgmatch.sh,v 1.13 2021/06/08 06:52:43 djm Exp $
 #	Placed in the Public Domain.
 
 tid="sshd_config match"
@@ -39,16 +39,16 @@ stop_client()
 }
 
 cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
-echo "PermitOpen 127.0.0.1:1" >>$OBJ/sshd_config
+echo "PermitOpen 127.0.0.1:1 # comment" >>$OBJ/sshd_config
 echo "Match Address 127.0.0.1" >>$OBJ/sshd_config
 echo "PermitOpen 127.0.0.1:2 127.0.0.1:3 127.0.0.1:$PORT" >>$OBJ/sshd_config
 
 grep -v AuthorizedKeysFile $OBJ/sshd_proxy_bak > $OBJ/sshd_proxy
-echo "AuthorizedKeysFile /dev/null" >>$OBJ/sshd_proxy
+echo "AuthorizedKeysFile /dev/null # comment" >>$OBJ/sshd_proxy
 echo "PermitOpen 127.0.0.1:1" >>$OBJ/sshd_proxy
 echo "Match user $USER" >>$OBJ/sshd_proxy
 echo "AuthorizedKeysFile /dev/null $OBJ/authorized_keys_%u" >>$OBJ/sshd_proxy
-echo "Match Address 127.0.0.1" >>$OBJ/sshd_proxy
+echo "Match Address 127.0.0.1 # comment" >>$OBJ/sshd_proxy
 echo "PermitOpen 127.0.0.1:2 127.0.0.1:3 127.0.0.1:$PORT" >>$OBJ/sshd_proxy
 
 ${SUDO} ${SSHD} -f $OBJ/sshd_config -T >/dev/null || \
diff --git a/regress/servcfginclude.sh b/regress/servcfginclude.sh
index b6a9a248f..518a703d1 100644
--- a/regress/servcfginclude.sh
+++ b/regress/servcfginclude.sh
@@ -9,17 +9,17 @@ Match host a
 
 Match host b
 	Banner /bb
-	Include $OBJ/sshd_config.i.*
+	Include $OBJ/sshd_config.i.* # comment
 
 Match host c
-	Include $OBJ/sshd_config.i.*
+	Include $OBJ/sshd_config.i.* # comment
 	Banner /cc
 
 Match host m
 	Include $OBJ/sshd_config.i.*
 
 Match Host d
-	Banner /dd
+	Banner /dd # comment
 
 Match Host e
 	Banner /ee
@@ -64,7 +64,7 @@ Match host a
 Match host b
 	Banner /bbbb
 
-Match host c
+Match host c # comment
 	Banner /cccc
 
 Match Host d