diff options
| author | tobhe <tobhe@cvs.openbsd.org> | 2020-08-30 18:31:50 +0000 |
|---|---|---|
| committer | tobhe <tobhe@cvs.openbsd.org> | 2020-08-30 18:31:50 +0000 |
| commit | cb3708bc51e9dbf1ba94bd98fe55e98400a8cab2 (patch) | |
| tree | 6e7294dea63e357d9d42a1eb969e8bc6654d9777 /regress/sbin | |
| parent | bcbbb1624b4ad746b1563be617ebdc7bfa1ba912 (diff) | |
Allow multiple global options.
Diffstat (limited to 'regress/sbin')
| -rw-r--r-- | regress/sbin/iked/live/Makefile | 17 | ||||
| -rw-r--r-- | regress/sbin/iked/live/iked.in | 1 |
2 files changed, 8 insertions, 10 deletions
diff --git a/regress/sbin/iked/live/Makefile b/regress/sbin/iked/live/Makefile index b82f73f44ed..439c1118fe6 100644 --- a/regress/sbin/iked/live/Makefile +++ b/regress/sbin/iked/live/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2020/08/29 20:04:14 tobhe Exp $ +# $OpenBSD: Makefile,v 1.15 2020/08/30 18:31:49 tobhe Exp $ # Copyright (c) 2020 Tobias Heider <tobhe@openbsd.org> # @@ -93,31 +93,30 @@ SETUP_CONFIGS = \ if [[ "$$flowtype" = "ipcomp" ]]; then \ ipcomp="ipcomp"; \ fi; \ - configstr=""; \ + global=""; \ if [ "$$fragmentation" = true ]; then \ - configstr="set fragmentation"; \ + global="$${global}set fragmentation\n"; \ fi; \ - configstr=""; \ if [ "$$singleikesa" = true ]; then \ - configstr="set enforcesingleikesa"; \ + global="$${global}set enforcesingleikesa\n"; \ fi; \ - echo "FRAGMENTATION=\"$$configstr\"" > $@_left.conf; \ - echo "TMODE=\"$$tmode\"" >> $@_left.conf; \ + echo "TMODE=\"$$tmode\"" > $@_left.conf; \ echo "LOCAL_ADDR=\"${LEFT_ADDR}\"" >> $@_left.conf; \ echo "PEER_ADDR=\"${RIGHT_ADDR}\"" >> $@_left.conf; \ echo "IPCOMP=\"$$ipcomp\"" >> $@_left.conf; \ echo "SRCID=\"$$leftid\"" >> $@_left.conf; \ echo "AUTH=\"$$authstr\"" >> $@_left.conf; \ + echo "$$global" >> $@_left.conf; \ cat ${.CURDIR}/iked.in >> $@_left.conf; \ chmod 0600 $@_left.conf; \ echo "cd /tmp\nput $@_left.conf test.conf" | sftp -q ${LEFT_SSH}; \ - echo "FRAGMENTATION=\"$$configstr\"" > $@_right.conf; \ - echo "TMODE=\"$$tmode\"" >> $@_right.conf; \ + echo "TMODE=\"$$tmode\"" > $@_right.conf; \ echo "LOCAL_ADDR=\"${RIGHT_ADDR}\"" >> $@_right.conf; \ echo "PEER_ADDR=\"${LEFT_ADDR}\"" >> $@_right.conf; \ echo "IPCOMP=\"$$ipcomp\"" >> $@_right.conf; \ echo "SRCID=\"$$rightid\"" >> $@_right.conf; \ echo "AUTH=\"$$authstr\"" >> $@_right.conf; \ + echo "$$global" >> $@_right.conf; \ cat ${.CURDIR}/iked.in >> $@_right.conf; \ chmod 0600 $@_right.conf; \ echo "cd /tmp\nput $@_right.conf test.conf" | sftp -q ${RIGHT_SSH} diff --git a/regress/sbin/iked/live/iked.in b/regress/sbin/iked/live/iked.in index ba1040e34a1..e93f93b3819 100644 --- a/regress/sbin/iked/live/iked.in +++ b/regress/sbin/iked/live/iked.in @@ -1,4 +1,3 @@ -$FRAGMENTATION ikev2 "test" active $IPCOMP $TMODE esp from $LOCAL_ADDR to $PEER_ADDR \ peer $PEER_ADDR \ srcid $SRCID \ |