diff options
| author |   deraadt <deraadt@openbsd.org> | 2014-07-18 18:20:42 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2014-07-18 18:20:42 +0000 |
| commit | 051764f3f143e22d93041fcb2dfc3126130264f3 (patch) | |
| tree | 8e2b329ffbcf9bfd1b32e56fac994dab645e025f | |
| parent | As discussed with beck, tweak the wording for getentropy slightly so (diff) | |
| download | wireguard-openbsd-051764f3f143e22d93041fcb2dfc3126130264f3.tar.xz wireguard-openbsd-051764f3f143e22d93041fcb2dfc3126130264f3.zip | |
Since syslog messages are now sent via the sendsyslog(2) system call,
we no longer need the spread of dev/log AF_UNIX sockets all over the
various chroot spaces.
ok beck millert aja
| -rw-r--r-- | etc/mtree/4.4BSD.dist | 12 | ||||
| -rw-r--r-- | etc/rc.d/syslogd | 13 |
2 files changed, 2 insertions, 23 deletions
diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist index 65fce8dbc9a..6ab061e94e9 100644 --- a/etc/mtree/4.4BSD.dist +++ b/etc/mtree/4.4BSD.dist @@ -1,4 +1,4 @@ -# $OpenBSD: 4.4BSD.dist,v 1.260 2014/07/18 11:35:32 ajacoutot Exp $ +# $OpenBSD: 4.4BSD.dist,v 1.261 2014/07/18 18:20:42 deraadt Exp $ /set type=dir uname=root gname=wheel mode=0755 @@ -715,8 +715,6 @@ var # ./var/empty empty mode=0755 - dev mode=0555 - .. .. # ./var/backups @@ -773,8 +771,6 @@ var # ./var/named named - dev - .. etc uname=root gname=named mode=0750 .. master @@ -791,8 +787,6 @@ var nsd db uname=root gname=_nsd mode=0775 .. - dev - .. etc uname=root gname=_nsd mode=0750 .. @@ -857,8 +851,6 @@ var # ./var/unbound unbound - dev uname=root gname=wheel mode=0755 - .. etc uname=root gname=wheel mode=0755 .. db uname=root gname=_unbound mode=0775 @@ -869,8 +861,6 @@ var www type=dir uname=root gname=daemon mode=755 cache type=dir uname=www gname=daemon mode=1700 .. - dev type=dir uname=root gname=daemon mode=755 - .. cgi-bin type=dir uname=root gname=daemon mode=755 .. htdocs type=dir uname=root gname=daemon mode=755 diff --git a/etc/rc.d/syslogd b/etc/rc.d/syslogd index bd023755b2b..9f4e104ea08 100644 --- a/etc/rc.d/syslogd +++ b/etc/rc.d/syslogd @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: syslogd,v 1.3 2014/03/24 09:24:09 sthen Exp $ +# $OpenBSD: syslogd,v 1.4 2014/07/18 18:20:42 deraadt Exp $ daemon="/usr/sbin/syslogd" @@ -9,17 +9,6 @@ daemon="/usr/sbin/syslogd" pexp="syslogd: \[priv\]" rc_pre() { - [ X"${nginx_flags}" != X"-u" ] && rm -f /var/www/dev/log && \ - daemon_flags="${daemon_flags} -a /var/www/dev/log" - [ X"${named_flags}" != X"NO" ] && rm -f /var/named/dev/log && \ - daemon_flags="${daemon_flags} -a /var/named/dev/log" - [ X"${nsd_flags}" != X"NO" ] && rm -f /var/nsd/dev/log && \ - daemon_flags="${daemon_flags} -a /var/nsd/dev/log" - [ X"${unbound_flags}" != X"NO" ] && rm -f /var/unbound/dev/log && \ - daemon_flags="${daemon_flags} -a /var/unbound/dev/log" - [ -d /var/empty ] && rm -f /var/empty/dev/log && \ - mkdir -p -m 0555 /var/empty/dev && \ - daemon_flags="${daemon_flags} -a /var/empty/dev/log" rm -f /dev/log } |