move a few more...

7 files changed, 6 insertions, 27 deletions

diff --git a/etc/chio.conf b/etc/examples/chio.conf
index f6490593da2..498de28edf2 100644
--- a/etc/chio.conf
+++ b/etc/examples/chio.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: chio.conf,v 1.3 2007/11/01 19:41:50 jmc Exp $
+# $OpenBSD: chio.conf,v 1.1 2014/07/11 16:36:35 deraadt Exp $
 # Configuration file for chio(1).
 # Each stanza configures a changer, to enumerate the st(4) devices
 # corresponding to each ch(4) drive. This file is only required
diff --git a/etc/dvmrpd.conf b/etc/examples/dvmrpd.conf
index 02f837b3b0b..fbd7c2177e5 100644
--- a/etc/dvmrpd.conf
+++ b/etc/examples/dvmrpd.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: dvmrpd.conf,v 1.1 2006/06/01 16:38:08 norby Exp $
+#	$OpenBSD: dvmrpd.conf,v 1.1 2014/07/11 16:36:35 deraadt Exp $
 
 # macros
 #fast="10"
diff --git a/etc/hostapd.conf b/etc/examples/hostapd.conf
index 2e0d8c895c7..c8685a18362 100644
--- a/etc/hostapd.conf
+++ b/etc/examples/hostapd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: hostapd.conf,v 1.11 2007/02/27 20:53:45 david Exp $
+# $OpenBSD: hostapd.conf,v 1.1 2014/07/11 16:36:35 deraadt Exp $
 # sample hostapd configuration file
 # see hostapd.conf(5)
 
diff --git a/etc/ifstated.conf b/etc/examples/ifstated.conf
index 57285e15e6f..da2163f8e08 100644
--- a/etc/ifstated.conf
+++ b/etc/examples/ifstated.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: ifstated.conf,v 1.6 2005/02/07 06:08:10 david Exp $
+# $OpenBSD: ifstated.conf,v 1.1 2014/07/11 16:36:35 deraadt Exp $
 # This is a sample config for a pair of firewalls with two interfaces
 #
 # carp0 and carp1 have ip addresses on 192.168.3.0/24 and 192.168.6.0/24
diff --git a/etc/ospf6d.conf b/etc/examples/ospf6d.conf
index 767a6988e2e..c7248e12847 100644
--- a/etc/ospf6d.conf
+++ b/etc/examples/ospf6d.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: ospf6d.conf,v 1.2 2010/01/08 15:12:48 stsp Exp $
+# $OpenBSD: ospf6d.conf,v 1.1 2014/07/11 16:36:35 deraadt Exp $
 
 # global configuration
 # router-id 10.0.0.1
diff --git a/etc/ospfd.conf b/etc/examples/ospfd.conf
index 16a754797b3..70bdfbb2461 100644
--- a/etc/ospfd.conf
+++ b/etc/examples/ospfd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: ospfd.conf,v 1.4 2007/06/19 16:49:56 reyk Exp $
+# $OpenBSD: ospfd.conf,v 1.1 2014/07/11 16:36:35 deraadt Exp $
 
 # macros
 password="secret"
diff --git a/etc/ldpd.conf b/etc/ldpd.conf
deleted file mode 100644
index d0bfee00571..00000000000
--- a/etc/ldpd.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-#	$OpenBSD: ldpd.conf,v 1.3 2010/06/25 22:49:05 claudio Exp $
-
-# macros
-fast="2"
-
-# global configuration
-# router-id 10.0.0.1
-# lfib-update no
-
-distribution independent
-retention liberal
-advertisement unsolicited
-
-interface bge0
-
-interface vlan5 {
-	hello-interval $fast
-}
-interface vlan6 {
-	passive
-}