From 626b2965bc875b42cd9ed8d53a49a31329e73fab Mon Sep 17 00:00:00 2001
From: jakob <>
Date: Fri, 1 Oct 2010 20:51:32 +0000
Subject: [PATCH] start nsd(8); ok deraadt

---
 src/etc/rc      | 10 +++++++++-
 src/etc/rc.conf |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/etc/rc b/src/etc/rc
index 3cc9a906..487663a2 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.341 2010/09/06 17:10:19 naddy Exp $
+#	$OpenBSD: rc,v 1.342 2010/10/01 20:51:32 jakob Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -340,6 +340,10 @@ if [ X"${named_flags}" != X"NO" ]; then
 	rm -f /var/named/dev/log
 	syslogd_flags="${syslogd_flags} -a /var/named/dev/log"
 fi
+if [ X"${nsd_flags}" != X"NO" ]; then
+	rm -f /var/nsd/dev/log
+	syslogd_flags="${syslogd_flags} -a /var/nsd/dev/log"
+fi
 if [ -d /var/empty ]; then
 	rm -f /var/empty/dev/log
 	mkdir -p -m 0555 /var/empty/dev
@@ -371,6 +375,10 @@ if [ X"${named_flags}" != X"NO" ]; then
 	echo 'starting named';		named $named_flags
 fi
 
+if [ X"${nsd_flags}" != X"NO" ]; then
+	echo 'starting nsd';		nsd $nsd_flags
+fi
+
 if [ ! -f /etc/isakmpd/private/local.key ]; then
 	echo -n "openssl: generating new isakmpd/iked RSA key... "
 	if /usr/sbin/openssl genrsa -out /etc/isakmpd/private/local.key 2048 \
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index e19742b0..8074ceed 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.139 2010/07/29 13:55:48 jmc Exp $
+#	$OpenBSD: rc.conf,v 1.140 2010/10/01 20:51:32 jakob Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 ldpd_flags=NO		# for normal use: ""
@@ -16,6 +16,7 @@ bootparamd_flags=NO	# for normal use: ""
 rbootd_flags=NO		# for normal use: ""
 sshd_flags=""		# for normal use: ""
 named_flags=NO		# for normal use: ""
+nsd_flags=NO		# for normal use: ""
 rdate_flags=NO		# for normal use: [RFC868-host] or [-n RFC2030-host]
 timed_flags=NO		# for normal use: ""
 ldattach_flags=NO	# for normal use: "[options] linedisc cua-device"