From 041fc50c89d75396f7b1b196ab8d0764348130cc Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Fri, 11 Jul 2014 21:20:10 +0000
Subject: [PATCH] Move more files into the examples directory...

---
 src/etc/Makefile                     | 28 +++++++++++-----------------
 src/etc/changelist                   | 28 ++++++++++++++--------------
 src/etc/{ => examples}/dhcpd.conf    |  2 +-
 src/etc/{ => examples}/iked.conf     |  2 +-
 src/etc/{ => examples}/inetd.conf    |  2 +-
 src/etc/{ => examples}/ipsec.conf    |  2 +-
 src/etc/{ => examples}/ldapd.conf    |  2 +-
 src/etc/{ => examples}/mrouted.conf  |  2 +-
 src/etc/{ => examples}/nsd.conf      |  2 +-
 src/etc/{ => examples}/rbootd.conf   |  2 +-
 src/etc/{ => examples}/relayd.conf   |  2 +-
 src/etc/{ => examples}/ripd.conf     |  2 +-
 src/etc/{ => examples}/sasyncd.conf  |  2 +-
 src/etc/{ => examples}/sensorsd.conf |  2 +-
 src/etc/{ => examples}/snmpd.conf    |  2 +-
 src/etc/{ => examples}/ypldap.conf   |  2 +-
 16 files changed, 39 insertions(+), 45 deletions(-)
 rename src/etc/{ => examples}/dhcpd.conf (91%)
 rename src/etc/{ => examples}/iked.conf (92%)
 rename src/etc/{ => examples}/inetd.conf (96%)
 rename src/etc/{ => examples}/ipsec.conf (94%)
 rename src/etc/{ => examples}/ldapd.conf (82%)
 rename src/etc/{ => examples}/mrouted.conf (95%)
 rename src/etc/{ => examples}/nsd.conf (94%)
 rename src/etc/{ => examples}/rbootd.conf (81%)
 rename src/etc/{ => examples}/relayd.conf (97%)
 rename src/etc/{ => examples}/ripd.conf (77%)
 rename src/etc/{ => examples}/sasyncd.conf (84%)
 rename src/etc/{ => examples}/sensorsd.conf (94%)
 rename src/etc/{ => examples}/snmpd.conf (92%)
 rename src/etc/{ => examples}/ypldap.conf (94%)

diff --git a/src/etc/Makefile b/src/etc/Makefile
index 89bcb728..b523ef31 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.359 2014/07/11 17:10:30 henning Exp $
+#	$OpenBSD: Makefile,v 1.360 2014/07/11 21:20:10 deraadt Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -30,18 +30,21 @@ kernels: bootblocks ${ALL_KERNELS}
 # -rw-r--r--
 BINOWN= root
 BINGRP= wheel
-BIN1=	changelist csh.cshrc csh.login csh.logout daily dhcpd.conf \
-	exports ftpusers ftpchroot gettytab group hosts hosts.lpd inetd.conf \
-	ksh.kshrc locate.rc man.conf monthly motd mrouted.conf myname \
+BIN1=	changelist csh.cshrc csh.login csh.logout daily \
+	exports ftpusers ftpchroot gettytab group hosts hosts.lpd \
+	ksh.kshrc locate.rc man.conf monthly motd myname \
 	netstart networks newsyslog.conf printcap protocols \
-	rbootd.conf rc rc.conf rc.local rc.securelevel rc.shutdown \
+	rc rc.conf rc.local rc.securelevel rc.shutdown \
 	remote rpc services shells syslog.conf weekly \
 	etc.${MACHINE}/login.conf \
 	etc.${MACHINE}/disktab dhclient.conf mailer.conf ntpd.conf \
-	moduli pf.os sensorsd.conf mixerctl.conf
+	moduli pf.os mixerctl.conf
 
-EXAMPLES=bgpd.conf chio.conf dvmrpd.conf hostapd.conf ifstated.conf ldpd.conf \
-	ospf6d.conf ospfd.conf
+EXAMPLES=bgpd.conf chio.conf dhcpd.conf dvmrpd.conf hostapd.conf \
+	ifstated.conf iked.conf inetd.conf ipsec.conf ldapd.conf ldpd.conf \
+	mrouted.conf nsd.conf ospf6d.conf ospfd.conf rbootd.conf \
+	relayd.conf ripd.conf sasyncd.conf sensorsd.conf snmpd.conf \
+	ypldap.conf
 
 .if ${MACHINE} != "aviion" 
 BIN1+=	wsconsctl.conf
@@ -111,16 +114,7 @@ distribution-etc-root-var: distrib-dirs
 	${INSTALL} -c -o root -g crontab -m 600 crontab ${DESTDIR}/var/cron/tabs/root
 	${INSTALL} -c -o root -g wheel -m 600 master.passwd ${DESTDIR}/etc
 	pwd_mkdb -p -d ${DESTDIR}/etc /etc/master.passwd
-	${INSTALL} -c -o root -g wheel -m 600 ripd.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g wheel -m 600 pf.conf ${DESTDIR}/etc
-	${INSTALL} -c -o root -g wheel -m 600 relayd.conf ${DESTDIR}/etc
-	${INSTALL} -c -o root -g wheel -m 600 iked.conf ${DESTDIR}/etc
-	${INSTALL} -c -o root -g wheel -m 600 ipsec.conf ${DESTDIR}/etc
-	${INSTALL} -c -o root -g wheel -m 600 sasyncd.conf ${DESTDIR}/etc
-	${INSTALL} -c -o root -g wheel -m 600 snmpd.conf ${DESTDIR}/etc
-	${INSTALL} -c -o root -g wheel -m 600 ldapd.conf ${DESTDIR}/etc
-	${INSTALL} -c -o root -g wheel -m 600 ypldap.conf ${DESTDIR}/etc
-	${INSTALL} -c -o root -g _nsd -m 640 nsd.conf ${DESTDIR}/var/nsd/etc
 	${INSTALL} -c -o root -g wheel -m 644 unbound.conf ${DESTDIR}/var/unbound/etc
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
 	    etc.${MACHINE}/MAKEDEV ${DESTDIR}/dev
diff --git a/src/etc/changelist b/src/etc/changelist
index b9fc5c90..c8f3c39c 100644
--- a/src/etc/changelist
+++ b/src/etc/changelist
@@ -1,4 +1,4 @@
-#	$OpenBSD: changelist,v 1.89 2014/07/11 17:10:30 henning Exp $
+#	$OpenBSD: changelist,v 1.90 2014/07/11 21:20:10 deraadt Exp $
 #
 # List of files which the security script backs up and checks
 # for modifications.
@@ -23,7 +23,7 @@
 /etc/daily.local
 /etc/defaultdomain
 /etc/dhclient.conf
-/etc/dhcpd.conf
++/etc/dhcpd.conf
 /etc/disktab
 /etc/distfile
 +/etc/dvmrpd.conf
@@ -36,20 +36,20 @@
 /etc/ftpwelcome
 /etc/gettytab
 /etc/group
-/etc/hostapd.conf
++/etc/hostapd.conf
 +/etc/hostname.*
 /etc/hosts
 /etc/hosts.lpd
 +/etc/ifstated.conf
 +/etc/iked.conf
-/etc/inetd.conf
++/etc/inetd.conf
 +/etc/ipsec.conf
 +/etc/isakmpd/isakmpd.conf
 +/etc/isakmpd/isakmpd.policy
 /etc/isakmpd/local.pub
 +/etc/isakmpd/private/local.key
 /etc/ksh.kshrc
-/etc/ldapd.conf
++/etc/ldapd.conf
 +/etc/ldpd.conf
 /etc/locate.rc
 /etc/login.conf
@@ -79,7 +79,7 @@
 /etc/monthly
 /etc/monthly.local
 /etc/motd
-/etc/mrouted.conf
++/etc/mrouted.conf
 /etc/mtree/4.4BSD.dist
 /etc/mtree/BSD.local.dist
 /etc/mtree/BSD.x11.dist
@@ -105,7 +105,7 @@
 /etc/profile
 /etc/protocols
 +/etc/pwd.db
-/etc/rbootd.conf
++/etc/rbootd.conf
 /etc/rc
 /etc/rc.conf
 /etc/rc.conf.local
@@ -113,21 +113,21 @@
 /etc/rc.local
 /etc/rc.securelevel
 /etc/rc.shutdown
-/etc/relayd.conf
++/etc/relayd.conf
 /etc/remote
 /etc/resolv.conf
 /etc/resolv.conf.tail
-/etc/ripd.conf
++/etc/ripd.conf
 +/etc/rndc.key
 /etc/rpc
-/etc/rtadvd.conf
-/etc/sasyncd.conf
-/etc/sensorsd.conf
++/etc/rtadvd.conf
++/etc/sasyncd.conf
++/etc/sensorsd.conf
 /etc/services
 /etc/shells
 /etc/slip.hosts
 /etc/slip.login
-/etc/snmpd.conf
++/etc/snmpd.conf
 +/etc/spwd.db
 /etc/ssh/ssh_config
 +/etc/ssh/ssh_host_dsa_key
@@ -150,7 +150,7 @@
 /etc/weekly
 /etc/weekly.local
 /etc/wsconsctl.conf
-/etc/ypldap.conf
++/etc/ypldap.conf
 /root/.Xdefaults
 /root/.cshrc
 /root/.login
diff --git a/src/etc/dhcpd.conf b/src/etc/examples/dhcpd.conf
similarity index 91%
rename from src/etc/dhcpd.conf
rename to src/etc/examples/dhcpd.conf
index b795c394..c839086e 100644
--- a/src/etc/dhcpd.conf
+++ b/src/etc/examples/dhcpd.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: dhcpd.conf,v 1.2 2008/10/03 11:41:21 sthen Exp $
+#	$OpenBSD: dhcpd.conf,v 1.1 2014/07/11 21:20:10 deraadt Exp $
 #
 # DHCP server options.
 # See dhcpd.conf(5) and dhcpd(8) for more information.
diff --git a/src/etc/iked.conf b/src/etc/examples/iked.conf
similarity index 92%
rename from src/etc/iked.conf
rename to src/etc/examples/iked.conf
index c61c08e6..6c859660 100644
--- a/src/etc/iked.conf
+++ b/src/etc/examples/iked.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: iked.conf,v 1.3 2013/03/05 14:52:02 sobrado Exp $
+# $OpenBSD: iked.conf,v 1.1 2014/07/11 21:20:10 deraadt Exp $
 #
 # See iked.conf(5) for syntax and examples.
 
diff --git a/src/etc/inetd.conf b/src/etc/examples/inetd.conf
similarity index 96%
rename from src/etc/inetd.conf
rename to src/etc/examples/inetd.conf
index 3c28d6ff..1b6239d6 100644
--- a/src/etc/inetd.conf
+++ b/src/etc/examples/inetd.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: inetd.conf,v 1.67 2014/04/21 12:35:25 okan Exp $
+#	$OpenBSD: inetd.conf,v 1.1 2014/07/11 21:20:10 deraadt Exp $
 #
 # Internet server configuration database
 #
diff --git a/src/etc/ipsec.conf b/src/etc/examples/ipsec.conf
similarity index 94%
rename from src/etc/ipsec.conf
rename to src/etc/examples/ipsec.conf
index c0b27d11..8f991d38 100644
--- a/src/etc/ipsec.conf
+++ b/src/etc/examples/ipsec.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: ipsec.conf,v 1.5 2006/09/14 15:10:43 hshoexer Exp $
+#	$OpenBSD: ipsec.conf,v 1.1 2014/07/11 21:20:10 deraadt Exp $
 #
 # See ipsec.conf(5) for syntax and examples.
 
diff --git a/src/etc/ldapd.conf b/src/etc/examples/ldapd.conf
similarity index 82%
rename from src/etc/ldapd.conf
rename to src/etc/examples/ldapd.conf
index 9dd339c8..1bc6aa46 100644
--- a/src/etc/ldapd.conf
+++ b/src/etc/examples/ldapd.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: ldapd.conf,v 1.2 2010/06/29 02:50:22 martinh Exp $
+#	$OpenBSD: ldapd.conf,v 1.1 2014/07/11 21:20:10 deraadt Exp $
 
 schema "/etc/ldap/core.schema"
 schema "/etc/ldap/inetorgperson.schema"
diff --git a/src/etc/mrouted.conf b/src/etc/examples/mrouted.conf
similarity index 95%
rename from src/etc/mrouted.conf
rename to src/etc/examples/mrouted.conf
index ddffe6ce..60c54cec 100644
--- a/src/etc/mrouted.conf
+++ b/src/etc/examples/mrouted.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: mrouted.conf,v 1.7 2003/02/26 23:15:20 millert Exp $
+#	$OpenBSD: mrouted.conf,v 1.1 2014/07/11 21:20:10 deraadt Exp $
 #
 #   This is the configuration file for "mrouted", an IP multicast router.
 #   mrouted looks for it in "/etc/mrouted.conf".
diff --git a/src/etc/nsd.conf b/src/etc/examples/nsd.conf
similarity index 94%
rename from src/etc/nsd.conf
rename to src/etc/examples/nsd.conf
index cd688ad7..0d96e6dd 100644
--- a/src/etc/nsd.conf
+++ b/src/etc/examples/nsd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: nsd.conf,v 1.6 2013/11/26 12:54:42 sthen Exp $
+# $OpenBSD: nsd.conf,v 1.1 2014/07/11 21:20:10 deraadt Exp $
 
 server:
 	hide-version: yes
diff --git a/src/etc/rbootd.conf b/src/etc/examples/rbootd.conf
similarity index 81%
rename from src/etc/rbootd.conf
rename to src/etc/examples/rbootd.conf
index 43817e15..308f3905 100644
--- a/src/etc/rbootd.conf
+++ b/src/etc/examples/rbootd.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: rbootd.conf,v 1.5 2005/02/07 06:08:10 david Exp $
+#	$OpenBSD: rbootd.conf,v 1.1 2014/07/11 21:20:10 deraadt Exp $
 #
 #	Configuration file for rbootd server.
 #
diff --git a/src/etc/relayd.conf b/src/etc/examples/relayd.conf
similarity index 97%
rename from src/etc/relayd.conf
rename to src/etc/examples/relayd.conf
index 65db90dc..efb9dc4a 100644
--- a/src/etc/relayd.conf
+++ b/src/etc/examples/relayd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: relayd.conf,v 1.15 2014/07/09 16:43:30 reyk Exp $
+# $OpenBSD: relayd.conf,v 1.1 2014/07/11 21:20:10 deraadt Exp $
 #
 # Macros
 #
diff --git a/src/etc/ripd.conf b/src/etc/examples/ripd.conf
similarity index 77%
rename from src/etc/ripd.conf
rename to src/etc/examples/ripd.conf
index 8a0398eb..c5756ce1 100644
--- a/src/etc/ripd.conf
+++ b/src/etc/examples/ripd.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: ripd.conf,v 1.3 2006/10/24 16:33:21 david Exp $
+#	$OpenBSD: ripd.conf,v 1.1 2014/07/11 21:20:10 deraadt Exp $
 
 fib-update yes
 redistribute static
diff --git a/src/etc/sasyncd.conf b/src/etc/examples/sasyncd.conf
similarity index 84%
rename from src/etc/sasyncd.conf
rename to src/etc/examples/sasyncd.conf
index d8363f3a..4551c3e3 100644
--- a/src/etc/sasyncd.conf
+++ b/src/etc/examples/sasyncd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: sasyncd.conf,v 1.1 2007/02/22 16:55:32 henning Exp $
+# $OpenBSD: sasyncd.conf,v 1.1 2014/07/11 21:20:10 deraadt Exp $
 # sample sasyncd configuration file
 # see sasyncd.conf(5)
 
diff --git a/src/etc/sensorsd.conf b/src/etc/examples/sensorsd.conf
similarity index 94%
rename from src/etc/sensorsd.conf
rename to src/etc/examples/sensorsd.conf
index 2bffbbec..fc71e131 100644
--- a/src/etc/sensorsd.conf
+++ b/src/etc/examples/sensorsd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: sensorsd.conf,v 1.9 2011/01/19 06:18:05 david Exp $
+# $OpenBSD: sensorsd.conf,v 1.1 2014/07/11 21:20:10 deraadt Exp $
 
 #
 # Sample sensorsd.conf file. See sensorsd.conf(5) for details.
diff --git a/src/etc/snmpd.conf b/src/etc/examples/snmpd.conf
similarity index 92%
rename from src/etc/snmpd.conf
rename to src/etc/examples/snmpd.conf
index 9bbf5823..0781f780 100644
--- a/src/etc/snmpd.conf
+++ b/src/etc/examples/snmpd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: snmpd.conf,v 1.3 2012/09/18 09:57:49 reyk Exp $
+# $OpenBSD: snmpd.conf,v 1.1 2014/07/11 21:20:10 deraadt Exp $
 
 listen_addr="127.0.0.1"
 
diff --git a/src/etc/ypldap.conf b/src/etc/examples/ypldap.conf
similarity index 94%
rename from src/etc/ypldap.conf
rename to src/etc/examples/ypldap.conf
index 231cbc3f..ebc387e9 100644
--- a/src/etc/ypldap.conf
+++ b/src/etc/examples/ypldap.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: ypldap.conf,v 1.4 2012/04/30 12:16:43 ajacoutot Exp $
+# $OpenBSD: ypldap.conf,v 1.1 2014/07/11 21:20:10 deraadt Exp $
 
 domain		"example.com"
 interval	60