diff options
| -rw-r--r-- | etc/Makefile | 5 | ||||
| -rw-r--r-- | etc/group | 1 | ||||
| -rw-r--r-- | etc/master.passwd | 1 | ||||
| -rw-r--r-- | etc/mtree/4.4BSD.dist | 13 | ||||
| -rw-r--r-- | etc/rc | 6 | ||||
| -rw-r--r-- | etc/rc.conf | 3 | ||||
| -rw-r--r-- | usr.sbin/Makefile | 6 |
7 files changed, 25 insertions, 10 deletions
diff --git a/etc/Makefile b/etc/Makefile index dd1b87401a1..21c1d02d93e 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.346 2014/03/13 10:11:01 florian Exp $ +# $OpenBSD: Makefile,v 1.347 2014/03/15 22:13:36 sthen Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -56,7 +56,7 @@ RCDAEMONS= amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd \ sensorsd slowcgi smtpd snmpd spamd sshd syslogd watchdogd \ wsmoused xdm ypbind ypldap yppasswdd ypserv kdc kadmind \ kpasswdd nfsd mountd lockd statd spamlogd sndiod \ - tftpd tftpproxy ldomd ipropd_master ipropd_slave + tftpd tftpproxy ldomd ipropd_master ipropd_slave unbound MISETS= base${OSrev}.tgz comp${OSrev}.tgz \ man${OSrev}.tgz game${OSrev}.tgz etc${OSrev}.tgz @@ -131,6 +131,7 @@ distribution-etc-root-var: distrib-dirs ${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 cd root; \ diff --git a/etc/group b/etc/group index 277be63371f..c4ceae23a30 100644 --- a/etc/group +++ b/etc/group @@ -22,6 +22,7 @@ _fingerd:*:33: _sshagnt:*:34: _x11:*:35: utmp:*:45: +_unbound:*:53: _lkm:*:61: _spamd:*:62: _radius:*:63: diff --git a/etc/master.passwd b/etc/master.passwd index 40485a1494c..ef7479eff28 100644 --- a/etc/master.passwd +++ b/etc/master.passwd @@ -10,6 +10,7 @@ _rstatd:*:30:30::0:0:rpc.rstatd:/var/empty:/sbin/nologin _rusersd:*:32:32::0:0:rpc.rusersd:/var/empty:/sbin/nologin _fingerd:*:33:33::0:0:fingerd:/var/empty:/sbin/nologin _x11:*:35:35::0:0:X Server:/var/empty:/sbin/nologin +_unbound:*:53:53::0:0:Unbound Daemon:/var/unbound:/sbin/nologin _spamd:*:62:62::0:0:Spam Daemon:/var/empty:/sbin/nologin uucp:*:66:1::0:0:UNIX-to-UNIX Copy:/var/spool/uucppublic:/sbin/nologin www:*:67:67::0:0:HTTP Server:/var/www:/sbin/nologin diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist index b9651702ae8..5379cf0c6e1 100644 --- a/etc/mtree/4.4BSD.dist +++ b/etc/mtree/4.4BSD.dist @@ -1,4 +1,4 @@ -# $OpenBSD: 4.4BSD.dist,v 1.242 2014/03/13 10:11:01 florian Exp $ +# $OpenBSD: 4.4BSD.dist,v 1.243 2014/03/15 22:13:36 sthen Exp $ /set type=dir uname=root gname=wheel mode=0755 # . @@ -1366,6 +1366,17 @@ vi.recover mode=01777 # ./var/tmp .. +# ./var/unbound +unbound + +# ./var/unbound/etc +etc uname=root gname=wheel mode=0755 +# ./var/unbound/etc +.. + +# ./var/unbound +.. + # ./www www type=dir uname=root gname=daemon mode=755 @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.422 2014/03/13 10:11:01 florian Exp $ +# $OpenBSD: rc,v 1.423 2014/03/15 22:13:36 sthen Exp $ # System startup script run by init on autoboot # or after single-user. @@ -391,8 +391,8 @@ dmesg >/var/run/dmesg.boot make_keys echo -n 'starting early daemons:' -start_daemon syslogd ldattach pflogd named nsd ntpd isakmpd iked sasyncd -start_daemon ldapd npppd +start_daemon syslogd ldattach pflogd named nsd unbound ntpd +start_daemon isakmpd iked sasyncd ldapd npppd echo '.' if [ X"${ipsec}" != X"NO" ]; then diff --git a/etc/rc.conf b/etc/rc.conf index b52cec7151f..cbea6d72c9e 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.186 2014/03/13 10:11:01 florian Exp $ +# $OpenBSD: rc.conf,v 1.187 2014/03/15 22:13:36 sthen Exp $ # DO NOT EDIT THIS FILE!! # @@ -27,6 +27,7 @@ rbootd_flags=NO # for normal use: "" sshd_flags="" # for normal use: "" named_flags=NO # for normal use: "" nsd_flags=NO # for normal use: "-c /var/nsd/etc/nsd.conf" +unbound_flags=NO # for normal use: "-c /var/unbound/etc/unbound.conf" ldattach_flags=NO # for normal use: "[options] linedisc cua-device" ntpd_flags=NO # for normal use: "" isakmpd_flags=NO # for normal use: "" diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 5dbdaf2f703..afdc2f4fa38 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.173 2014/03/13 10:09:43 florian Exp $ +# $OpenBSD: Makefile,v 1.174 2014/03/15 22:13:36 sthen Exp $ .include <bsd.own.mk> @@ -17,8 +17,8 @@ SUBDIR= ac accton acpidump adduser amd apm apmd arp \ rtsold rwhod sa sasyncd sensorsd sliplogin slowcgi slstats smtpd \ snmpctl snmpd spamdb syslogc syslogd sysmerge tcpdrop tcpdump \ tftp-proxy tftpd tokenadm tokeninit traceroute traceroute6 trpt \ - usbdevs user vipw watchdogd wsconscfg wsfontload wsmoused zdump zic \ - ztsscale + unbound usbdevs user vipw watchdogd wsconscfg wsfontload wsmoused \ + zdump zic ztsscale .if (${YP:L} == "yes") SUBDIR+=ypbind ypldap yppoll ypset ypserv |