summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/mtree/4.4BSD.dist7
-rw-r--r--usr.sbin/bind/bin/named/config.c8
-rw-r--r--usr.sbin/bind/bin/rndc/rndc.c2
3 files changed, 11 insertions, 6 deletions
diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist
index 32160cbb95a..d560e550647 100644
--- a/etc/mtree/4.4BSD.dist
+++ b/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-# $OpenBSD: 4.4BSD.dist,v 1.183 2006/12/11 20:49:43 henning Exp $
+# $OpenBSD: 4.4BSD.dist,v 1.184 2007/01/01 21:30:46 aanriot Exp $
/set type=dir uname=root gname=wheel mode=0755
# .
@@ -2614,6 +2614,11 @@ standard
# ./var/named/standard
..
+# ./var/named/tmp
+tmp uname=root gname=named mode=0775
+# ./var/named/tmp
+..
+
# ./var/named
..
diff --git a/usr.sbin/bind/bin/named/config.c b/usr.sbin/bind/bin/named/config.c
index 6308b766925..3a919bc2420 100644
--- a/usr.sbin/bind/bin/named/config.c
+++ b/usr.sbin/bind/bin/named/config.c
@@ -53,7 +53,7 @@ options {\n\
#endif
" deallocate-on-exit true;\n\
# directory <none>\n\
- dump-file \"named_dump.db\";\n\
+ dump-file \"tmp/named_dump.db\";\n\
fake-iquery no;\n\
has-old-clients false;\n\
heartbeat-interval 60;\n\
@@ -62,12 +62,12 @@ options {\n\
listen-on {any;};\n\
listen-on-v6 {any;};\n\
match-mapped-addresses no;\n\
- memstatistics-file \"named.memstats\";\n\
+ memstatistics-file \"tmp/named.memstats\";\n\
multiple-cnames no;\n\
# named-xfer <obsolete>;\n\
# pid-file \"" NS_LOCALSTATEDIR "/named.pid\"; /* or /lwresd.pid */\n\
port 53;\n\
- recursing-file \"named.recursing\";\n\
+ recursing-file \"tmp/named.recursing\";\n\
"
#ifdef PATH_RANDOMDEV
"\
@@ -80,7 +80,7 @@ options {\n\
serial-queries 20;\n\
serial-query-rate 20;\n\
server-id none;\n\
- statistics-file \"named.stats\";\n\
+ statistics-file \"tmp/named.stats\";\n\
statistics-interval 60;\n\
tcp-clients 100;\n\
tcp-listen-queue 3;\n\
diff --git a/usr.sbin/bind/bin/rndc/rndc.c b/usr.sbin/bind/bin/rndc/rndc.c
index ec27daaf94c..d19908cf5ee 100644
--- a/usr.sbin/bind/bin/rndc/rndc.c
+++ b/usr.sbin/bind/bin/rndc/rndc.c
@@ -105,7 +105,7 @@ command is one of the following:\n\
stats Write server statistics to the statistics file.\n\
querylog Toggle query logging.\n\
dumpdb [-all|-cache|-zones] [view ...]\n\
- Dump cache(s) to the dump file (named_dump.db).\n\
+ Dump cache(s) to the dump file (/var/named/tmp/named_dump.db).\n\
stop Save pending updates to master files and stop the server.\n\
stop -p Save pending updates to master files and stop the server\n\
reporting process id.\n\