diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2016-06-03 04:10:41 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-06-08 11:46:32 +1000 |
commit | e6508898c3cd838324ecfe1abd0eb8cf802e7106 (patch) | |
tree | d69fef827cd60bf9f6140ed1c0dab916648c4b68 | |
parent | ab0a536066dfa32def0bd7272c096ebb5eb25b11 (diff) |
upstream commit
Add a test for ssh(1)'s config file parsing.
Upstream-Regress-ID: 558b7f4dc45cc3761cc3d3e889b9f3c5bc91e601
-rw-r--r-- | regress/Makefile | 3 | ||||
-rw-r--r-- | regress/sshcfgparse.sh | 29 |
2 files changed, 31 insertions, 1 deletions
diff --git a/regress/Makefile b/regress/Makefile index 03661e1f..08fd82db 100644 --- a/regress/Makefile +++ b/regress/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.87 2016/04/15 02:55:53 djm Exp $ +# $OpenBSD: Makefile,v 1.88 2016/06/03 04:10:41 dtucker Exp $ REGRESS_TARGETS= unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t-exec tests: prep $(REGRESS_TARGETS) @@ -54,6 +54,7 @@ LTESTS= connect \ multiplex \ reexec \ brokenkeys \ + sshcfgparse \ cfgparse \ cfgmatch \ addrmatch \ diff --git a/regress/sshcfgparse.sh b/regress/sshcfgparse.sh new file mode 100644 index 00000000..f8645d6f --- /dev/null +++ b/regress/sshcfgparse.sh @@ -0,0 +1,29 @@ +# $OpenBSD: sshcfgparse.sh,v 1.1 2016/06/03 04:10:41 dtucker Exp $ +# Placed in the Public Domain. + +tid="ssh config parse" + +verbose "reparse minimal config" +(${SSH} -G -F $OBJ/ssh_config somehost >$OBJ/ssh_config.1 && + ${SSH} -G -F $OBJ/ssh_config.1 somehost >$OBJ/ssh_config.2 && + diff $OBJ/ssh_config.1 $OBJ/ssh_config.2) || fail "reparse minimal config" + +verbose "ssh -W opts" +f=`${SSH} -GF $OBJ/ssh_config host | awk '/exitonforwardfailure/{print $2}'` +test "$f" == "no" || fail "exitonforwardfailure default" +f=`${SSH} -GF $OBJ/ssh_config -W a:1 h | awk '/exitonforwardfailure/{print $2}'` +test "$f" == "yes" || fail "exitonforwardfailure enable" +f=`${SSH} -GF $OBJ/ssh_config -W a:1 -o exitonforwardfailure=no h | \ + awk '/exitonforwardfailure/{print $2}'` +test "$f" == "no" || fail "exitonforwardfailure override" + +f=`${SSH} -GF $OBJ/ssh_config host | awk '/clearallforwardings/{print $2}'` +test "$f" == "no" || fail "clearallforwardings default" +f=`${SSH} -GF $OBJ/ssh_config -W a:1 h | awk '/clearallforwardings/{print $2}'` +test "$f" == "yes" || fail "clearallforwardings enable" +f=`${SSH} -GF $OBJ/ssh_config -W a:1 -o clearallforwardings=no h | \ + awk '/clearallforwardings/{print $2}'` +test "$f" == "no" || fail "clearallforwardings override" + +# cleanup +rm -f $OBJ/ssh_config.[012] |