From 922be3177ef9b38cde702e2de98ab5a65efa8e24 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Fri, 11 Jul 2014 16:36:35 +0000
Subject: [PATCH] move a few more...

---
 src/etc/{ => examples}/chio.conf     |  2 +-
 src/etc/{ => examples}/dvmrpd.conf   |  2 +-
 src/etc/{ => examples}/hostapd.conf  |  2 +-
 src/etc/{ => examples}/ifstated.conf |  2 +-
 src/etc/{ => examples}/ospf6d.conf   |  2 +-
 src/etc/{ => examples}/ospfd.conf    |  2 +-
 src/etc/ldpd.conf                    | 21 ---------------------
 7 files changed, 6 insertions(+), 27 deletions(-)
 rename src/etc/{ => examples}/chio.conf (85%)
 rename src/etc/{ => examples}/dvmrpd.conf (70%)
 rename src/etc/{ => examples}/hostapd.conf (97%)
 rename src/etc/{ => examples}/ifstated.conf (96%)
 rename src/etc/{ => examples}/ospf6d.conf (86%)
 rename src/etc/{ => examples}/ospfd.conf (89%)
 delete mode 100644 src/etc/ldpd.conf

diff --git a/src/etc/chio.conf b/src/etc/examples/chio.conf
similarity index 85%
rename from src/etc/chio.conf
rename to src/etc/examples/chio.conf
index f6490593..498de28e 100644
--- a/src/etc/chio.conf
+++ b/src/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/src/etc/dvmrpd.conf b/src/etc/examples/dvmrpd.conf
similarity index 70%
rename from src/etc/dvmrpd.conf
rename to src/etc/examples/dvmrpd.conf
index 02f837b3..fbd7c217 100644
--- a/src/etc/dvmrpd.conf
+++ b/src/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/src/etc/hostapd.conf b/src/etc/examples/hostapd.conf
similarity index 97%
rename from src/etc/hostapd.conf
rename to src/etc/examples/hostapd.conf
index 2e0d8c89..c8685a18 100644
--- a/src/etc/hostapd.conf
+++ b/src/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/src/etc/ifstated.conf b/src/etc/examples/ifstated.conf
similarity index 96%
rename from src/etc/ifstated.conf
rename to src/etc/examples/ifstated.conf
index 57285e15..da2163f8 100644
--- a/src/etc/ifstated.conf
+++ b/src/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/src/etc/ospf6d.conf b/src/etc/examples/ospf6d.conf
similarity index 86%
rename from src/etc/ospf6d.conf
rename to src/etc/examples/ospf6d.conf
index 767a6988..c7248e12 100644
--- a/src/etc/ospf6d.conf
+++ b/src/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/src/etc/ospfd.conf b/src/etc/examples/ospfd.conf
similarity index 89%
rename from src/etc/ospfd.conf
rename to src/etc/examples/ospfd.conf
index 16a75479..70bdfbb2 100644
--- a/src/etc/ospfd.conf
+++ b/src/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/src/etc/ldpd.conf b/src/etc/ldpd.conf
deleted file mode 100644
index d0bfee00..00000000
--- a/src/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
-}