diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1998-06-03 17:12:06 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1998-06-03 17:12:06 +0000 |
| commit | 718804cb5327bebad3e3c45e41319adc7017138a (patch) | |
| tree | 2ab6763ea8a5dff5eab72edbfc4632d760bb2394 | |
| parent | b4c01e46d990ac226cb519e004e9766c8f9f845e (diff) | |
to turn of named chroot set to be empty, not 'NO'
| -rw-r--r-- | etc/rc | 6 | ||||
| -rw-r--r-- | etc/rc.conf | 4 |
2 files changed, 5 insertions, 5 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.74 1998/06/03 16:04:07 millert Exp $ +# $OpenBSD: rc,v 1.75 1998/06/03 17:12:03 millert Exp $ # System startup script run by init on autoboot # or after single-user. @@ -85,7 +85,7 @@ rm -f /var/spool/uucp/STST/* echo 'starting system logger' rm -f /dev/log -if [ "X${named_chroot}" != "X" -a "X${named_chroot}" != X"NO" ]; then +if [ "X${named_chroot}" != "X" ]; then rm -f ${named_chroot}/dev/log syslogd_flags="${syslogd_flags} -a ${named_chroot}/dev/log" fi @@ -97,7 +97,7 @@ if [ "X${named_flags}" != X"NO" ]; then if [ "X${named_user}" != "X" -a "X${named_user}" != X"root" ]; then named_flags="-u ${named_user} ${named_flags}" fi - if [ "X${named_chroot}" != "X" -a "X${named_chroot}" != X"NO" ]; then + if [ "X${named_chroot}" != "X" ]; then named_flags="-t ${named_chroot} ${named_flags}" fi echo 'starting named'; named $named_flags diff --git a/etc/rc.conf b/etc/rc.conf index 4f37b12ad3a..f8a7db90ccb 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.21 1998/06/03 16:04:08 millert Exp $ +# $OpenBSD: rc.conf,v 1.22 1998/06/03 17:12:05 millert Exp $ # set these to "NO" to turn them off. otherwise, they're used as flags routed_flags=NO # for 'normal' use: routed_flags="-q" @@ -49,4 +49,4 @@ ipnat_rules=/etc/ipnat.rules # Rules for Network Address Translation ipmon_flags=-s # To disable logging, use ipmon_flags=NO syslogd_flags= # add more flags, ie. -u -a /chroot/dev/log named_user=named # Named should not run as root unless neccesary -named_chroot=/var/named # Where to chroot named unless set to "NO" +named_chroot=/var/named # Where to chroot named if not empty |