Get rid of some obsolete exampels.

ok and prodding @jmc

15 files changed, 4 insertions, 467 deletions

diff --git a/sbin/isakmpd/Makefile b/sbin/isakmpd/Makefile
index ef5cce93cd8..433e9503032 100644
--- a/sbin/isakmpd/Makefile
+++ b/sbin/isakmpd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.78 2006/07/02 13:19:00 hshoexer Exp $
+#	$OpenBSD: Makefile,v 1.79 2007/05/23 07:28:15 hshoexer Exp $
 #	$EOM: Makefile,v 1.78 2000/10/15 21:33:42 niklas Exp $
 
 #
@@ -69,10 +69,6 @@ CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes \
 # You can also use Boehm's garbage collector as a means to find leaks.
 #  # setenv GC_FIND_LEAK
 
-.if make(install)
-SUBDIR+=	samples
-.endif
-
 # Enable for DNSSEC use
 #CFLAGS+=	USE_DNSSEC
 #SRCS+=		dnssec.c
diff --git a/sbin/isakmpd/isakmpd.8 b/sbin/isakmpd/isakmpd.8
index b9c80e4b332..ffa2dcb4682 100644
--- a/sbin/isakmpd/isakmpd.8
+++ b/sbin/isakmpd/isakmpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.8,v 1.102 2007/05/07 01:50:46 joel Exp $
+.\" $OpenBSD: isakmpd.8,v 1.103 2007/05/23 07:28:15 hshoexer Exp $
 .\" $EOM: isakmpd.8,v 1.23 2000/05/02 00:30:23 niklas Exp $
 .\"
 .\" Copyright (c) 1998, 1999, 2000, 2001 Niklas Hallqvist.
@@ -761,10 +761,6 @@ has the same mode requirements as
 .It /etc/isakmpd/pubkeys/
 The directory in which trusted public keys are kept.
 The keys must be named in the fashion described above.
-.It /usr/share/ipsec/isakmpd/
-A directory containing some sample
-.Nm
-and keynote policy configuration files.
 .It /var/run/isakmpd.fifo
 The FIFO used to manually control
 .Nm isakmpd .
diff --git a/sbin/isakmpd/isakmpd.conf.5 b/sbin/isakmpd/isakmpd.conf.5
index 21667bbac56..d1a3cbc31b4 100644
--- a/sbin/isakmpd/isakmpd.conf.5
+++ b/sbin/isakmpd/isakmpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.conf.5,v 1.122 2007/03/18 22:31:40 hshoexer Exp $
+.\" $OpenBSD: isakmpd.conf.5,v 1.123 2007/05/23 07:28:15 hshoexer Exp $
 .\" $EOM: isakmpd.conf.5,v 1.57 2000/12/21 14:43:17 ho Exp $
 .\"
 .\" Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
@@ -922,10 +922,6 @@ Currently this can be:
 The default
 .Xr isakmpd 8
 configuration file.
-.It Pa /usr/share/ipsec/isakmpd/
-A directory containing some sample
-.Xr isakmpd 8
-configuration files.
 .El
 .Sh EXAMPLES
 An example of a configuration file:
diff --git a/sbin/isakmpd/isakmpd.policy.5 b/sbin/isakmpd/isakmpd.policy.5
index 7cbd9fb44ea..11e45c97a16 100644
--- a/sbin/isakmpd/isakmpd.policy.5
+++ b/sbin/isakmpd/isakmpd.policy.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.policy.5,v 1.39 2006/06/02 19:35:55 hshoexer Exp $
+.\" $OpenBSD: isakmpd.policy.5,v 1.40 2007/05/23 07:28:15 hshoexer Exp $
 .\" $EOM: isakmpd.policy.5,v 1.24 2000/11/23 12:55:25 niklas Exp $
 .\"
 .\" Copyright (c) 1999-2001, Angelos D. Keromytis.  All rights reserved.
@@ -501,10 +501,6 @@ Set to the IPv4 or IPv6 address of the remote IKE daemon.
 The default
 .Xr isakmpd 8
 policy configuration file.
-.It Pa /usr/share/ipsec/isakmpd/policy
-A sample
-.Xr isakmpd 8
-policy configuration file.
 .El
 .Sh EXAMPLES
 .Bd -literal
diff --git a/sbin/isakmpd/samples/Makefile b/sbin/isakmpd/samples/Makefile
deleted file mode 100644
index 558bd23b8a7..00000000000
--- a/sbin/isakmpd/samples/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 2003/06/03 14:39:50 ho Exp $
-#	$EOM: Makefile,v 1.1 2000/05/01 20:04:53 niklas Exp $
-
-#
-# Copyright (c) 2000 Niklas Hallqvist.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-FILES=		VPN-* policy singlehost-*
-TARGETDIR=	/usr/share/ipsec/isakmpd
-
-# The mkdir below is for installation on OpenBSD pre 2.7
-install:
-	@-mkdir -p ${DESTDIR}${TARGETDIR}
-	$(INSTALL) -c -m 0444 ${FILES} ${DESTDIR}${TARGETDIR}
diff --git a/sbin/isakmpd/samples/VPN-3way-template.conf b/sbin/isakmpd/samples/VPN-3way-template.conf
deleted file mode 100644
index 1af58b56683..00000000000
--- a/sbin/isakmpd/samples/VPN-3way-template.conf
+++ /dev/null
@@ -1,91 +0,0 @@
-#	$OpenBSD: VPN-3way-template.conf,v 1.12 2005/05/28 18:38:30 ho Exp $
-#
-# A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon.
-#
-# This is a template file of a VPN setup between three nodes in
-# a fully meshed 'three-way' configuration. Suggested use is to copy
-# this file to all three nodes and then edit them accordingly.
-#
-# These nodes are initially called XXX, YYY and ZZZ.
-#
-# In pseudographics:   XXX --- YYY
-#                         \   /
-#                          ZZZ
-#
-# In cases where IP/network addresses should be defined values like
-# 192.168.XXX.nnn have been used.
-#
-
-# Incoming phase 1 negotiations are multiplexed on the source IP
-# address. In the three-way VPN, we have two possible peers.
-
-[Phase 1]
-192.168.YYY.nnn=	ISAKMP-peer-node-YYY
-192.168.ZZZ.nnn=	ISAKMP-peer-node-ZZZ
-
-# These connections are walked over after config file parsing and
-# told to the application layer so that it will inform us when
-# traffic wants to pass over them.  This means we can do on-demand
-# keying. In the three-way VPN, each node knows two connections.
-
-[Phase 2]
-Connections=		IPsec-Conn-XXX-YYY,IPsec-Conn-XXX-ZZZ
-
-# ISAKMP Phase 1 peer sections
-
-[ISAKMP-peer-node-YYY]
-Phase=			1
-Address=		192.168.YYY.nnn
-Configuration=		Default-main-mode
-Authentication=		yoursharedsecretwithYYY
-
-[ISAKMP-peer-node-ZZZ]
-Phase=			1
-Address=		192.168.ZZZ.nnn
-Configuration=		Default-main-mode
-Authentication=		yoursharedsecretwithZZZ
-
-# IPsec Phase 2 sections
-
-[IPsec-Conn-XXX-YYY]
-Phase=			2
-ISAKMP-peer=		ISAKMP-peer-node-YYY
-Configuration=		Default-quick-mode
-Local-ID=		MyNet-XXX
-Remote-ID=		OtherNet-YYY
-
-[IPsec-Conn-XXX-ZZZ]
-Phase=			2
-ISAKMP-peer=		ISAKMP-peer-node-ZZZ
-Configuration=		Default-quick-mode
-Local-ID=		MyNet-XXX
-Remote-ID=		OtherNet-ZZZ
-
-# Client ID sections
-
-[MyNet-XXX]
-ID-type=		IPV4_ADDR_SUBNET
-Network=		192.168.XXX.0
-Netmask=		255.255.255.0
-
-[OtherNet-YYY]
-ID-type=		IPV4_ADDR_SUBNET
-Network=		192.168.YYY.0
-Netmask=		255.255.255.0
-
-[OtherNet-ZZZ]
-ID-type=		IPV4_ADDR_SUBNET
-Network=		192.168.ZZZ.0
-Netmask=		255.255.255.0
-
-# Main mode description
-
-[Default-main-mode]
-EXCHANGE_TYPE=		ID_PROT
-Transforms=		AES-SHA,3DES-SHA
-
-# Quick mode description
-
-[Default-quick-mode]
-EXCHANGE_TYPE=		QUICK_MODE
-Suites=			QM-ESP-AES-SHA-PFS-SUITE
diff --git a/sbin/isakmpd/samples/VPN-default.conf b/sbin/isakmpd/samples/VPN-default.conf
deleted file mode 100644
index 49b08225022..00000000000
--- a/sbin/isakmpd/samples/VPN-default.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-#	$OpenBSD: VPN-default.conf,v 1.1 2005/05/28 18:38:30 ho Exp $
-#
-# This isakmpd configuration accepts incoming negotiations from any IKE
-# peer, such as roaming laptops.  The validity of the negotiated SAs can
-# be checked using isakmpd.policy.
-
-[Phase 1]
-Default=		any
-
-[any]
-Phase=			1
-Configuration=		Default-main-mode
-Authentication=		mekmitasdigoat
-
-[Default-main-mode]
-EXCHANGE_TYPE=		ID_PROT
-Transforms=		AES-SHA,3DES-SHA
diff --git a/sbin/isakmpd/samples/VPN-east.conf b/sbin/isakmpd/samples/VPN-east.conf
deleted file mode 100644
index 335e22cb4e5..00000000000
--- a/sbin/isakmpd/samples/VPN-east.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-#	$OpenBSD: VPN-east.conf,v 1.14 2005/05/28 18:38:30 ho Exp $
-#
-# A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon.
-#
-# The network topology of the example net is like this:
-#
-# 192.168.11.0/24 - west [.11] - 10.1.0.0/24 - [.12] east - 192.168.12.0/24
-#
-# "west" and "east" are the respective security gateways (aka VPN-nodes).
-
-[Phase 1]
-10.1.0.11=		ISAKMP-peer-west
-
-[Phase 2]
-Connections=		IPsec-east-west
-
-[ISAKMP-peer-west]
-Phase=			1
-Address=		10.1.0.11
-Configuration=		Default-main-mode
-Authentication=		mekmitasdigoat
-
-[IPsec-east-west]
-Phase=			2
-ISAKMP-peer=		ISAKMP-peer-west
-Configuration=		Default-quick-mode
-Local-ID=		Net-east
-Remote-ID=		Net-west
-
-[Net-west]
-ID-type=		IPV4_ADDR_SUBNET
-Network=		192.168.11.0
-Netmask=		255.255.255.0
-
-[Net-east]
-ID-type=		IPV4_ADDR_SUBNET
-Network=		192.168.12.0
-Netmask=		255.255.255.0
-
-[Default-main-mode]
-EXCHANGE_TYPE=		ID_PROT
-Transforms=		AES-SHA,3DES-SHA
-
-[Default-quick-mode]
-EXCHANGE_TYPE=		QUICK_MODE
-Suites=			QM-ESP-AES-SHA-PFS-SUITE
diff --git a/sbin/isakmpd/samples/VPN-west.conf b/sbin/isakmpd/samples/VPN-west.conf
deleted file mode 100644
index 70099c2c531..00000000000
--- a/sbin/isakmpd/samples/VPN-west.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-#	$OpenBSD: VPN-west.conf,v 1.16 2006/03/22 10:38:14 hshoexer Exp $
-#
-# A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon.
-#
-# The network topology of the example net is like this:
-#
-# 192.168.11.0/24 - west [.11] - 10.1.0.0/24 - [.12] east - 192.168.12.0/24
-#
-# "west" and "east" are the respective security gateways (aka VPN-nodes).
-
-[Phase 1]
-10.1.0.12=		ISAKMP-peer-east
-
-[Phase 2]
-Connections=		IPsec-west-east
-
-[ISAKMP-peer-east]
-Phase=			1
-Address=		10.1.0.12
-Configuration=		Default-main-mode
-Authentication=		mekmitasdigoat
-
-[IPsec-west-east]
-Phase=			2
-ISAKMP-peer=		ISAKMP-peer-east
-Configuration=		Default-quick-mode
-Local-ID=		Net-west
-Remote-ID=		Net-east
-
-[Net-west]
-ID-type=		IPV4_ADDR_SUBNET
-Network=		192.168.11.0
-Netmask=		255.255.255.0
-
-[Net-east]
-ID-type=		IPV4_ADDR_SUBNET
-Network=		192.168.12.0
-Netmask=		255.255.255.0
-
-[Default-main-mode]
-EXCHANGE_TYPE=		ID_PROT
-Transforms=		AES-SHA,3DES-SHA
-
-[Default-quick-mode]
-EXCHANGE_TYPE=		QUICK_MODE
-Suites=			QM-ESP-AES-SHA-PFS-SUITE
diff --git a/sbin/isakmpd/samples/policy b/sbin/isakmpd/samples/policy
deleted file mode 100644
index bfb68b7230c..00000000000
--- a/sbin/isakmpd/samples/policy
+++ /dev/null
@@ -1,9 +0,0 @@
-KeyNote-Version: 2
-Comment: This policy accepts ESP SAs from a remote that uses the right password
- 	$OpenBSD: policy,v 1.7 2005/05/28 18:38:30 ho Exp $
-Authorizer: "POLICY"
-Licensees: "passphrase:mekmitasdigoat"
-Conditions: app_domain == "IPsec policy" &&
-	    esp_present == "yes" &&
-            esp_enc_alg == "aes" &&
-            esp_auth_alg == "hmac-sha" -> "true";
diff --git a/sbin/isakmpd/samples/singlehost-east.conf b/sbin/isakmpd/samples/singlehost-east.conf
deleted file mode 100644
index 4416315e43d..00000000000
--- a/sbin/isakmpd/samples/singlehost-east.conf
+++ /dev/null
@@ -1,59 +0,0 @@
-#	$OpenBSD: singlehost-east.conf,v 1.12 2006/03/22 10:38:14 hshoexer Exp $
-#	$EOM: singlehost-east.conf,v 1.10 2000/11/23 12:24:43 niklas Exp $
-
-# A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon.
-
-[General]
-Listen-on=		10.1.0.12
-Shared-SADB=		Defined
-Policy-File=		policy
-
-[Phase 1]
-10.1.0.11=		ISAKMP-peer-west
-Default=		ISAKMP-peer-west-aggressive
-
-[Phase 2]
-Connections=		IPsec-east-west
-
-[ISAKMP-peer-west]
-Phase=			1
-Local-address=		10.1.0.12
-Address=		10.1.0.11
-Configuration=		Default-main-mode
-Authentication=		mekmitasdigoat
-
-[ISAKMP-peer-west-aggressive]
-Phase=			1
-Local-address=		10.1.0.12
-Address=		10.1.0.11
-Configuration=		Default-aggressive-mode
-Authentication=		mekmitasdigoat
-
-[IPsec-east-west]
-Phase=			2
-ISAKMP-peer=		ISAKMP-peer-west
-Configuration=		Default-quick-mode
-Local-ID=		Net-east
-Remote-ID=		Net-west
-
-[Net-west]
-ID-type=		IPV4_ADDR_SUBNET
-Network=		192.168.11.0
-Netmask=		255.255.255.0
-
-[Net-east]
-ID-type=		IPV4_ADDR_SUBNET
-Network=		192.168.12.0
-Netmask=		255.255.255.0
-
-[Default-main-mode]
-EXCHANGE_TYPE=		ID_PROT
-Transforms=		3DES-SHA
-
-[Default-aggressive-mode]
-EXCHANGE_TYPE=		AGGRESSIVE
-Transforms=		3DES-SHA-RSA
-
-[Default-quick-mode]
-EXCHANGE_TYPE=		QUICK_MODE
-Suites=			QM-ESP-AES-SHA-PFS-SUITE
diff --git a/sbin/isakmpd/samples/singlehost-east.gdb b/sbin/isakmpd/samples/singlehost-east.gdb
deleted file mode 100644
index a41df0d8ff3..00000000000
--- a/sbin/isakmpd/samples/singlehost-east.gdb
+++ /dev/null
@@ -1 +0,0 @@
-r -d -D0=99 -D1=99 -D2=99 -D3=99 -D4=99 -D5=99 -feast.fifo -c../samples/singlehost-east.conf
diff --git a/sbin/isakmpd/samples/singlehost-setup.sh b/sbin/isakmpd/samples/singlehost-setup.sh
deleted file mode 100644
index 818ce2d5578..00000000000
--- a/sbin/isakmpd/samples/singlehost-setup.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-#	$OpenBSD: singlehost-setup.sh,v 1.5 2003/08/18 09:41:40 markus Exp $
-#	$EOM: singlehost-setup.sh,v 1.3 2000/11/23 12:24:43 niklas Exp $
-
-# A script to test single-host VPNs
-
-# For the 'pf' variable
-. /etc/rc.conf
-
-# Default paths
-PFCTL=/sbin/pfctl
-ISAKMPD=/sbin/isakmpd
-
-do_routes()
-{
-    /sbin/route $1 -net 192.168.11.0/24 192.168.11.1 -iface >/dev/null
-    /sbin/route $1 -net 192.168.12.0/24 192.168.12.1 -iface >/dev/null
-    /sbin/route $1 -net 10.1.0.0/16     10.1.0.11    -iface >/dev/null
-}
-
-# Called on script exit
-cleanup () {
-    if [ "x${pf}" = "xYES" -a -f ${pf_rules} ]; then
-	${PFCTL} -R -f ${pf_rules}
-    else
-	${PFCTL} -qd
-    fi
-
-    USER=`id -p | grep ^login | cut -f2`
-    chown $USER singlehost-east.conf singlehost-west.conf policy
-    chmod 644   singlehost-east.conf singlehost-west.conf policy
-
-    [ -p east.fifo ] && echo "Q" >> east.fifo
-    [ -p west.fifo ] && echo "Q" >> west.fifo
-    rm -f east.fifo west.fifo
-
-    do_routes delete
-}
-
-# Start by initializing interfaces
-/sbin/ifconfig lo2 192.168.11.1 netmask 0xffffff00 up
-/sbin/ifconfig lo3 192.168.12.1 netmask 0xffffff00 up
-/sbin/ifconfig lo4 10.1.0.11 netmask 0xffff0000 up
-/sbin/ifconfig lo5 10.1.0.12 netmask 0xffff0000 up
-# ... and by adding the required routes
-do_routes add
-
-# Add rules
-(
-    cat <<EOF
-pass out quick on lo2 proto 50 all
-pass out quick on lo2 from 192.168.11.0/24 to any
-pass out quick on lo3 proto 50 all
-pass out quick on lo3 from 192.168.12.0/24 to any
-block out on lo2 all
-block out on lo3 all
-EOF
-    if [ "x${pf}" = "xYES" -a -f ${pf_rules} ]; then
-	cat ${pf_rules} | egrep -v '^(scrub|rdr|binat|nat)'
-    else
-	pfctl -qe >/dev/null
-    fi
-) | pfctl -R -f -
-
-trap cleanup 1 2 3 15
-
-# The configuration files needs proper owners and modes
-USER=`id -p | grep ^uid | cut -f2`
-chown $USER singlehost-east.conf singlehost-west.conf policy
-chmod 600   singlehost-east.conf singlehost-west.conf policy
-
-# Start the daemons
-rm -f east.fifo west.fifo
-${ISAKMPD} -c singlehost-east.conf -f east.fifo "$@"
-${ISAKMPD} -c singlehost-west.conf -f west.fifo "$@"
-
-# Give them some time to negotiate their stuff...
-SECS=3
-echo "Waiting $SECS seconds..."
-sleep $SECS
-echo "Running 'ping', using the tunnel..."
-ping -I 192.168.11.1 -c 5 192.168.12.1
-
-cleanup
diff --git a/sbin/isakmpd/samples/singlehost-west.conf b/sbin/isakmpd/samples/singlehost-west.conf
deleted file mode 100644
index 243934a0248..00000000000
--- a/sbin/isakmpd/samples/singlehost-west.conf
+++ /dev/null
@@ -1,59 +0,0 @@
-#	$OpenBSD: singlehost-west.conf,v 1.13 2006/03/22 10:38:14 hshoexer Exp $
-#	$EOM: singlehost-west.conf,v 1.10 2000/11/23 12:24:43 niklas Exp $
-
-# A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon.
-
-[General]
-Listen-on=		10.1.0.11
-Shared-SADB=		Defined
-Policy-File=		policy
-
-[Phase 1]
-10.1.0.12=		ISAKMP-peer-east
-Default=		ISAKMP-peer-east-aggressive
-
-[Phase 2]
-Connections=		IPsec-west-east
-
-[ISAKMP-peer-east]
-Phase=			1
-Local-address=		10.1.0.11
-Address=		10.1.0.12
-Configuration=		Default-main-mode
-Authentication=		mekmitasdigoat
-
-[ISAKMP-peer-east-aggressive]
-Phase=			1
-Local-address=		10.1.0.11
-Address=		10.1.0.12
-Configuration=		Default-aggressive-mode
-Authentication=		mekmitasdigoat
-
-[IPsec-west-east]
-Phase=			2
-ISAKMP-peer=		ISAKMP-peer-east
-Configuration=		Default-quick-mode
-Local-ID=		Net-west
-Remote-ID=		Net-east
-
-[Net-west]
-ID-type=		IPV4_ADDR_SUBNET
-Network=		192.168.11.0
-Netmask=		255.255.255.0
-
-[Net-east]
-ID-type=		IPV4_ADDR_SUBNET
-Network=		192.168.12.0
-Netmask=		255.255.255.0
-
-[Default-main-mode]
-EXCHANGE_TYPE=		ID_PROT
-Transforms=		3DES-SHA
-
-[Default-aggressive-mode]
-EXCHANGE_TYPE=		AGGRESSIVE
-Transforms=		3DES-SHA-RSA
-
-[Default-quick-mode]
-EXCHANGE_TYPE=		QUICK_MODE
-Suites=			QM-ESP-AES-SHA-PFS-SUITE
diff --git a/sbin/isakmpd/samples/singlehost-west.gdb b/sbin/isakmpd/samples/singlehost-west.gdb
deleted file mode 100644
index 5315e46c792..00000000000
--- a/sbin/isakmpd/samples/singlehost-west.gdb
+++ /dev/null
@@ -1 +0,0 @@
-r -d -D0=99 -D1=99 -D2=99 -D3=99 -D4=99 -D5=99 -fwest.fifo -c../samples/singlehost-west.conf