Permalink
Browse files

Merge r257694 from head:

  Remove remnants of BIND from /etc, since there is no BIND in base now.

  Sorry, that would break users running head and BIND from ports, since
  ports rely on these scripts. The ports will be fixed soon.

Approved by:	re (kib)
  • Loading branch information...
1 parent fa658a0 commit 233591315f07c0bb620f209d3812b059d73c37e0 @glebius glebius committed Nov 14, 2013
@@ -137,10 +137,6 @@ daily_status_mail_rejects_enable="YES" # Check mail rejects
daily_status_mail_rejects_logs=3 # How many logs to check
daily_status_mail_rejects_shorten="NO" # Shorten output
-# 470.status-named
-daily_status_named_enable="YES"
-daily_status_named_usedns="YES" # DNS lookups are ok
-
# 480.status-ntpd
daily_status_ntpd_enable="NO" # Check NTP status
View
@@ -260,6 +260,7 @@ hostapd_enable="NO" # Run hostap daemon.
syslogd_enable="YES" # Run syslog daemon (or NO).
syslogd_program="/usr/sbin/syslogd" # path to syslogd, if you want a different one.
syslogd_flags="-s" # Flags to syslogd (if enabled).
+altlog_proglist="" # List of chrooted applicatioins in /var
inetd_enable="NO" # Run the network daemon dispatcher (YES/NO).
inetd_program="/usr/sbin/inetd" # path to inetd, if you want a different one.
inetd_flags="-wW -C 60" # Optional flags to inetd
@@ -271,23 +272,6 @@ hastd_program="/sbin/hastd" # path to hastd, if you want a different one.
hastd_flags="" # Optional flags to hastd.
ctld_enable="NO" # CAM Target Layer / iSCSI target daemon.
local_unbound_enable="NO" # local caching resolver
-#
-# named. It may be possible to run named in a sandbox, man security for
-# details.
-#
-named_enable="NO" # Run named, the DNS server (or NO).
-named_program="/usr/sbin/named" # Path to named, if you want a different one.
-named_conf="/etc/namedb/named.conf" # Path to the configuration file
-#named_flags="" # Use this for flags OTHER than -u and -c
-named_uid="bind" # User to run named as
-named_chrootdir="/var/named" # Chroot directory (or "" not to auto-chroot it)
-named_chroot_autoupdate="YES" # Automatically install/update chrooted
- # components of named. See /etc/rc.d/named.
-named_symlink_enable="YES" # Symlink the chrooted pid file
-named_wait="NO" # Wait for working name service before exiting
-named_wait_host="localhost" # Hostname to check if named_wait is enabled
-named_auto_forward="NO" # Set up forwarders from /etc/resolv.conf
-named_auto_forward_only="NO" # Do "forward only" instead of "forward first"
#
# kerberos. Do not run the admin daemons on slave servers
View
@@ -35,7 +35,7 @@ UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile
# When upgrading to a new FreeBSD release, files which match MergeChanges
# will have any local changes merged into the version from the new release.
-MergeChanges /etc/ /var/named/etc/ /boot/device.hints
+MergeChanges /etc/ /boot/device.hints
### Default configuration options:
View
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-SUBDIR= master
-
-FILES= named.conf named.root
-
-NO_OBJ=
-FILESDIR= /etc/namedb
-FILESMODE= 644
-
-.include <bsd.prog.mk>
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-FILES= empty.db localhost-forward.db localhost-reverse.db
-
-NO_OBJ=
-FILESDIR= /etc/namedb/master
-FILESMODE= 644
-
-.include <bsd.prog.mk>
View
@@ -1,11 +0,0 @@
-
-; $FreeBSD$
-
-$TTL 3h
-@ SOA @ nobody.localhost. 42 1d 12h 1w 3h
- ; Serial, Refresh, Retry, Expire, Neg. cache TTL
-
-@ NS @
-
-; Silence a BIND warning
-@ A 127.0.0.1
@@ -1,11 +0,0 @@
-
-; $FreeBSD$
-
-$TTL 3h
-localhost. SOA localhost. nobody.localhost. 42 1d 12h 1w 3h
- ; Serial, Refresh, Retry, Expire, Neg. cache TTL
-
- NS localhost.
-
- A 127.0.0.1
- AAAA ::1
@@ -1,13 +0,0 @@
-
-; $FreeBSD$
-
-$TTL 3h
-@ SOA localhost. nobody.localhost. 42 1d 12h 1w 3h
- ; Serial, Refresh, Retry, Expire, Neg. cache TTL
-
- NS localhost.
-
-1.0.0 PTR localhost.
-
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 PTR localhost.
-
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,92 +0,0 @@
-;
-; $FreeBSD$
-;
-
-; This file holds the information on root name servers needed to
-; initialize cache of Internet domain name servers
-; (e.g. reference this file in the "cache . <file>"
-; configuration file of BIND domain name servers).
-;
-; This file is made available by InterNIC
-; under anonymous FTP as
-; file /domain/named.cache
-; on server FTP.INTERNIC.NET
-; -OR- RS.INTERNIC.NET
-;
-; last update: Jan 3, 2013
-; related version of root zone: 2013010300
-;
-; formerly NS.INTERNIC.NET
-;
-. 3600000 IN NS A.ROOT-SERVERS.NET.
-A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4
-A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:BA3E::2:30
-;
-; FORMERLY NS1.ISI.EDU
-;
-. 3600000 NS B.ROOT-SERVERS.NET.
-B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201
-;
-; FORMERLY C.PSI.NET
-;
-. 3600000 NS C.ROOT-SERVERS.NET.
-C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12
-;
-; FORMERLY TERP.UMD.EDU
-;
-. 3600000 NS D.ROOT-SERVERS.NET.
-D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13
-D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2D::D
-;
-; FORMERLY NS.NASA.GOV
-;
-. 3600000 NS E.ROOT-SERVERS.NET.
-E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10
-;
-; FORMERLY NS.ISC.ORG
-;
-. 3600000 NS F.ROOT-SERVERS.NET.
-F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241
-F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2F::F
-;
-; FORMERLY NS.NIC.DDN.MIL
-;
-. 3600000 NS G.ROOT-SERVERS.NET.
-G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4
-;
-; FORMERLY AOS.ARL.ARMY.MIL
-;
-. 3600000 NS H.ROOT-SERVERS.NET.
-H.ROOT-SERVERS.NET. 3600000 A 128.63.2.53
-H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::803F:235
-;
-; FORMERLY NIC.NORDU.NET
-;
-. 3600000 NS I.ROOT-SERVERS.NET.
-I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17
-I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FE::53
-;
-; OPERATED BY VERISIGN, INC.
-;
-. 3600000 NS J.ROOT-SERVERS.NET.
-J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30
-J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:C27::2:30
-;
-; OPERATED BY RIPE NCC
-;
-. 3600000 NS K.ROOT-SERVERS.NET.
-K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129
-K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FD::1
-;
-; OPERATED BY ICANN
-;
-. 3600000 NS L.ROOT-SERVERS.NET.
-L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42
-L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:3::42
-;
-; OPERATED BY WIDE
-;
-. 3600000 NS M.ROOT-SERVERS.NET.
-M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33
-M.ROOT-SERVERS.NET. 3600000 AAAA 2001:DC3::35
-; End of File
@@ -1,62 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# If there is a global system configuration file, suck it in.
-#
-if [ -r /etc/defaults/periodic.conf ]
-then
- . /etc/defaults/periodic.conf
- source_periodic_confs
-fi
-
-catmsgs() {
- find /var/log -name 'messages.*' -mtime -2 |
- sort -t. -r -n -k 2,2 |
- while read f
- do
- case $f in
- *.gz) zcat -f $f;;
- *.bz2) bzcat -f $f;;
- esac
- done
- [ -f /var/log/messages ] && cat /var/log/messages
-}
-
-case "$daily_status_named_enable" in
- [Yy][Ee][Ss])
- echo
- echo 'Checking for denied zone transfers (AXFR and IXFR):'
-
- start=`date -v-1d '+%b %e'`
- rc=$(catmsgs |
- fgrep -E "^$start.*named\[[[:digit:]]+\]: transfer of .*failed .*: REFUSED" |
- sed -e "s/.*transfer of \'\(.*\)\/IN\' from \(.*\)#[0-9]*: .*/\1 from \2/" |
- sort -f | uniq -ic | (
- usedns=0
- case "$daily_status_named_usedns" in
- '') ;;
- [yY][eE][sS]) usedns=1 ;;
- esac
-
- while read line ;do
- ipaddr=`echo "$line" | sed -e 's/^.*from //'`
- if [ $usedns -eq 1 ]; then
- name=`host "${ipaddr}" 2>/dev/null | \
- sed 's/.*domain name pointer \(.*\)\./\1/'`
- fi
- if [ -n "${name}" ]; then
- echo "${line} (${name})"
- else
- echo "${line}"
- fi
- done ) | \
- tee /dev/stderr | wc -l)
- [ $rc -gt 0 ] && rc=1
- ;;
-
- *) rc=0;;
-esac
-
-exit $rc
View
@@ -90,7 +90,6 @@ FILES= DAEMON \
mroute6d \
mrouted \
msgs \
- named \
natd \
netif \
netoptions \
Oops, something went wrong.

0 comments on commit 2335913

Please sign in to comment.