tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

skip IPv6-related portions on hosts without IPv6 

with Tim Rice
This commit is contained in:
Damien Miller 2015-06-30 16:05:40 +10:00
parent 512caddf59
commit 52fb6b9b03
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
regress/cfgparse.sh
View File

@ -3,6 +3,11 @@
tid="config parse" tid="config parse"
# This is a reasonable proxy for IPv6 support.
if ! config_defined HAVE_STRUCT_IN6_ADDR ; then
SKIP_IPV6=yes
fi
# We need to use the keys generated for the regression test because sshd -T # We need to use the keys generated for the regression test because sshd -T
# will fail if we're not running with SUDO (no permissions for real keys) or # will fail if we're not running with SUDO (no permissions for real keys) or
# if we are # running tests on a system that has never had sshd installed # if we are # running tests on a system that has never had sshd installed
@ -26,9 +31,12 @@ verbose "listenaddress order"
cat > $OBJ/sshd_config.0 <<EOD cat > $OBJ/sshd_config.0 <<EOD
listenaddress 1.2.3.4:1234 listenaddress 1.2.3.4:1234
listenaddress 1.2.3.4:5678 listenaddress 1.2.3.4:5678
EOD
[ X${SKIP_IPV6} = Xyes ] || cat >> $OBJ/sshd_config.0 <<EOD
listenaddress [::1]:1234 listenaddress [::1]:1234
listenaddress [::1]:5678 listenaddress [::1]:5678
EOD EOD
# test input sets. should all result in the output above. # test input sets. should all result in the output above.
# test 1: addressfamily and port first # test 1: addressfamily and port first
cat > $OBJ/sshd_config.1 <<EOD cat > $OBJ/sshd_config.1 <<EOD
@ -37,8 +45,11 @@ addressfamily any
port 1234 port 1234
port 5678 port 5678
listenaddress 1.2.3.4 listenaddress 1.2.3.4
EOD
[ X${SKIP_IPV6} = Xyes ] || cat >> $OBJ/sshd_config.1 <<EOD
listenaddress ::1 listenaddress ::1
EOD EOD
($SUDO ${SSHD} -T -f $OBJ/sshd_config.1 | \ ($SUDO ${SSHD} -T -f $OBJ/sshd_config.1 | \
grep 'listenaddress ' >$OBJ/sshd_config.2 && grep 'listenaddress ' >$OBJ/sshd_config.2 &&
diff $OBJ/sshd_config.0 $OBJ/sshd_config.2) || \ diff $OBJ/sshd_config.0 $OBJ/sshd_config.2) || \
@ -47,11 +58,14 @@ EOD
cat > $OBJ/sshd_config.1 <<EOD cat > $OBJ/sshd_config.1 <<EOD
${SSHD_KEYS} ${SSHD_KEYS}
listenaddress 1.2.3.4 listenaddress 1.2.3.4
listenaddress ::1
port 1234 port 1234
port 5678 port 5678
addressfamily any addressfamily any
EOD EOD
[ X${SKIP_IPV6} = Xyes ] || cat >> $OBJ/sshd_config.1 <<EOD
listenaddress ::1
EOD
($SUDO ${SSHD} -T -f $OBJ/sshd_config.1 | \ ($SUDO ${SSHD} -T -f $OBJ/sshd_config.1 | \
grep 'listenaddress ' >$OBJ/sshd_config.2 && grep 'listenaddress ' >$OBJ/sshd_config.2 &&
diff $OBJ/sshd_config.0 $OBJ/sshd_config.2) || \ diff $OBJ/sshd_config.0 $OBJ/sshd_config.2) || \