summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1997-06-10 20:04:36 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1997-06-10 20:04:36 +0000
commit52a326ce20051b15b4fbc13cc110b0102ee9bae2 (patch)
treee9aa679fa051a6394f32b4b1622fa92bcb0a118c
parent5c412314ff9e5d70de6828024d391eb0cca5fd41 (diff)
use /etc/namedb/tmp/ for storage, until we merge some 8.1 derivative
-rw-r--r--etc/mtree/4.4BSD.dist8
-rw-r--r--etc/mtree/4.4BSD.root8
-rw-r--r--usr.sbin/named/man/named-xfer.84
-rw-r--r--usr.sbin/named/man/named.816
-rw-r--r--usr.sbin/named/man/ndc.810
-rw-r--r--usr.sbin/named/named/ns_init.c9
-rw-r--r--usr.sbin/named/named/pathnames.h16
7 files changed, 42 insertions, 29 deletions
diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist
index a2c202c2076..f0bc68a4be6 100644
--- a/etc/mtree/4.4BSD.dist
+++ b/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-# $OpenBSD: 4.4BSD.dist,v 1.36 1997/05/02 22:26:15 graichen Exp $
+# $OpenBSD: 4.4BSD.dist,v 1.37 1997/06/10 20:04:28 deraadt Exp $
/set type=dir uname=root gname=wheel mode=0755
# .
@@ -50,6 +50,12 @@ mtree
# ./etc/namedb
namedb
+
+# ./etc/namedb/tmp
+tmp
+# ./etc/namedb/tmp
+..
+
# ./etc/namedb
..
diff --git a/etc/mtree/4.4BSD.root b/etc/mtree/4.4BSD.root
index 488a1cc3cc8..1e84e3a6b60 100644
--- a/etc/mtree/4.4BSD.root
+++ b/etc/mtree/4.4BSD.root
@@ -1,4 +1,4 @@
-# $OpenBSD: 4.4BSD.root,v 1.4 1996/07/27 10:04:28 deraadt Exp $
+# $OpenBSD: 4.4BSD.root,v 1.5 1997/06/10 20:04:29 deraadt Exp $
# $NetBSD: 4.4BSD.root,v 1.2 1996/05/12 23:30:32 thorpej Exp $
#
# user: bostic
@@ -99,6 +99,12 @@ mtree type=dir mode=0755
# ./etc/namedb
/set type=file gname=wheel uname=root mode=0600
namedb type=dir mode=0755
+
+# ./etc/namedb/tmp
+/set type=file gname=wheel uname=root mode=0600
+tmp type=dir mode=0755
+# ./etc/namedb/tmp
+
# ./etc/namedb
..
diff --git a/usr.sbin/named/man/named-xfer.8 b/usr.sbin/named/man/named-xfer.8
index de1cf30b686..664d27cf2e4 100644
--- a/usr.sbin/named/man/named-xfer.8
+++ b/usr.sbin/named/man/named-xfer.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: named-xfer.8,v 1.2 1997/03/12 10:42:15 downsj Exp $
+.\" $OpenBSD: named-xfer.8,v 1.3 1997/06/10 20:04:31 deraadt Exp $
.\" ++Copyright++ 1985
.\" -
.\" Copyright (c) 1985
@@ -114,7 +114,7 @@ messages printed.
.B \-l
Specifies a log file for debugging messages. The default is system-
dependent but is usually in
-.I /var/tmp
+.I /etc/namedb/tmp/
or
.IR /usr/tmp .
Note that this only applies if
diff --git a/usr.sbin/named/man/named.8 b/usr.sbin/named/man/named.8
index e6b450fa09e..f7a2224496a 100644
--- a/usr.sbin/named/man/named.8
+++ b/usr.sbin/named/man/named.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: named.8,v 1.2 1997/03/12 10:42:16 downsj Exp $
+.\" $OpenBSD: named.8,v 1.3 1997/06/10 20:04:32 deraadt Exp $
.\" ++Copyright++ 1985
.\" -
.\" Copyright (c) 1985
@@ -404,13 +404,13 @@ is built with the FORCED_RELOAD compile-time option, then SIGHUP will
also cause the server to check the serial number on all secondary zones.
Normally the serial numbers are only checked at the SOA-specified intervals.
.IP SIGINT
-Dumps the current data base and cache to /var/tmp/named_dump.db
+Dumps the current data base and cache to /etc/namedb/tmp/named_dump.db
.IP SIGIOT
-Dumps statistics data into /var/tmp/named.stats if the server is
+Dumps statistics data into /etc/namedb/tmp/named.stats if the server is
compiled with -DSTATS. Statistics data is appended to the file. Some
systems use SIGABRT rather than SIGIOT for this.
.IP SIGSYS
-Dumps the profiling data in /var/tmp if the server is compiled
+Dumps the profiling data in /etc/namedb/tmp if the server is compiled
with profiling (server forks, chdirs and exits).
.IP SIGTERM
Dumps the primary and secondary database files.
@@ -427,13 +427,13 @@ Toggles logging of all incoming queries via syslog(8)
(requires server to have been built with the QRYLOG option).
.SH FILES
.nf
-.ta \w'/var/tmp/named_dump.db 'u
+.ta \w'/etc/namedb/tmp/named_dump.db 'u
/etc/named.boot name server configuration boot file
/etc/named.pid the process id (on older systems)
/var/run/named.pid the process id (on newer systems)
-/var/tmp/named_dump.db dump of the name server database
-/var/tmp/named.run debug output
-/var/tmp/named.stats nameserver statistics data
+/etc/namedb/tmp/named_dump.db dump of the name server database
+/etc/namedb/tmp/named.run debug output
+/etc/namedb/tmp/named.stats nameserver statistics data
.fi
.SH "SEE ALSO"
kill(1), gethostbyname(3), signal(2),
diff --git a/usr.sbin/named/man/ndc.8 b/usr.sbin/named/man/ndc.8
index df19cf117cb..514aa1dfd5c 100644
--- a/usr.sbin/named/man/ndc.8
+++ b/usr.sbin/named/man/ndc.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ndc.8,v 1.2 1997/03/12 10:42:17 downsj Exp $
+.\" $OpenBSD: ndc.8,v 1.3 1997/06/10 20:04:33 deraadt Exp $
.\" Copyright (c) 1994
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -53,7 +53,7 @@ as shown by
Causes
.B named
to dump its database and cache to
-.B /var/tmp/named_dump.db
+.B /etc/namedb/tmp/named_dump.db
(uses the INT signal.)
.TP
.B reload
@@ -66,7 +66,7 @@ and to reload those that have changed (uses the HUP signal.)
Causes
.B named
to dump its statistics to
-.B /var/tmp/named.stats
+.B /etc/namedb/tmp/named.stats
(uses the IOT or ABRT signal.)
.TP
.B trace
@@ -74,7 +74,7 @@ Causes
.B named
to increment its ``tracing level'' by one. Whenever the tracing level
is nonzero, trace information will be written to
-.BR /var/tmp/named.run .
+.BR /etc/namedb/tmp/named.run .
Higher tracing levels result in more detailed information.
(Uses the USR1 signal.)
.TP
@@ -82,7 +82,7 @@ Higher tracing levels result in more detailed information.
Causes
.B named
to set its ``tracing level'' to zero, closing
-.B /var/tmp/named.run
+.B /etc/namedb/tmp/named.run
if it is open (uses the USR2 signal.)
.TP
.B querylog
diff --git a/usr.sbin/named/named/ns_init.c b/usr.sbin/named/named/ns_init.c
index da2cd8fb8e3..7f87972bea5 100644
--- a/usr.sbin/named/named/ns_init.c
+++ b/usr.sbin/named/named/ns_init.c
@@ -1,11 +1,11 @@
-/* $OpenBSD: ns_init.c,v 1.3 1997/04/27 23:09:44 deraadt Exp $ */
+/* $OpenBSD: ns_init.c,v 1.4 1997/06/10 20:04:34 deraadt Exp $ */
#if !defined(lint) && !defined(SABER)
#if 0
static char sccsid[] = "@(#)ns_init.c 4.38 (Berkeley) 3/21/91";
static char rcsid[] = "$From: ns_init.c,v 8.24 1996/12/02 09:17:21 vixie Exp $";
#else
-static char rcsid[] = "$OpenBSD: ns_init.c,v 1.3 1997/04/27 23:09:44 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ns_init.c,v 1.4 1997/06/10 20:04:34 deraadt Exp $";
#endif
#endif /* not lint */
@@ -566,8 +566,9 @@ boot_read(filename, includefile)
* We will always transfer this zone again
* after a reload.
*/
- sprintf(buf, "%s/NsTmp%ld.%d", _PATH_TMPDIR,
- (long)getpid(), tmpnum++); /*TDR*/
+ sprintf(buf, "%s/NsTmpXXXXXXXXXX",
+ _PATH_TMPDIR);
+ (void) mktemp(buf);
source = savestr(buf);
zp->z_flags |= Z_TMP_FILE;
} else
diff --git a/usr.sbin/named/named/pathnames.h b/usr.sbin/named/named/pathnames.h
index f2c8ed9d34c..90b549320fe 100644
--- a/usr.sbin/named/named/pathnames.h
+++ b/usr.sbin/named/named/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.2 1997/03/12 10:42:37 downsj Exp $ */
+/* $OpenBSD: pathnames.h,v 1.3 1997/06/10 20:04:35 deraadt Exp $ */
/*
* @(#)pathnames.h 5.4 (Berkeley) 6/1/90
@@ -76,16 +76,16 @@
#ifndef _PATH_XFER
# define _PATH_XFER "/usr/libexec/named-xfer"
#endif
-#define _PATH_DEBUG "/var/tmp/named.run"
-#define _PATH_DUMPFILE "/var/tmp/named_dump.db"
+#define _PATH_DEBUG "/etc/namedb/tmp/named.run"
+#define _PATH_DUMPFILE "/etc/namedb/tmp/named_dump.db"
#ifndef _PATH_PIDFILE
# define _PATH_PIDFILE "/var/run/named.pid"
#endif
-#define _PATH_STATS "/var/tmp/named.stats"
-#define _PATH_XFERTRACE "/var/tmp/xfer.trace"
-#define _PATH_XFERDDT "/var/tmp/xfer.ddt"
-#define _PATH_TMPXFER "/var/tmp/xfer.ddt.XXXXXX"
-#define _PATH_TMPDIR "/var/tmp"
+#define _PATH_STATS "/etc/namedb/tmp/named.stats"
+#define _PATH_XFERTRACE "/etc/namedb/tmp/xfer.trace"
+#define _PATH_XFERDDT "/etc/namedb/tmp/xfer.ddt"
+#define _PATH_TMPXFER "/etc/namedb/tmp/xfer.ddt.XXXXXX"
+#define _PATH_TMPDIR "/var/namedb/tmp"
#else /* BSD */