diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2018-10-29 07:55:40 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2018-10-29 07:55:40 +0000 |
| commit | e4c818d8f9cb201d938896f7d612aff018f3eb19 (patch) | |
| tree | ec72f3458fe74ecb0003a66dbad7f9d4262ac061 | |
| parent | needs sys/lock.h (diff) | |
| download | wireguard-openbsd-e4c818d8f9cb201d938896f7d612aff018f3eb19.tar.xz wireguard-openbsd-e4c818d8f9cb201d938896f7d612aff018f3eb19.zip | |
Revert previous (for now).
semarie found a few regressions with daemon that will fail if cwd is not
accessible.
| -rw-r--r-- | etc/rc.d/rc.subr | 4 | ||||
| -rw-r--r-- | share/man/man8/rc.subr.8 | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/etc/rc.d/rc.subr b/etc/rc.d/rc.subr index f5547aa7878..0d887b203de 100644 --- a/etc/rc.d/rc.subr +++ b/etc/rc.d/rc.subr @@ -1,4 +1,4 @@ -# $OpenBSD: rc.subr,v 1.128 2018/10/16 07:07:05 ajacoutot Exp $ +# $OpenBSD: rc.subr,v 1.129 2018/10/29 07:55:40 ajacoutot Exp $ # # Copyright (c) 2010, 2011, 2014-2017 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -317,6 +317,6 @@ fi readonly daemon_class unset _rcflags _rcrtable _rcuser _rctimeout pexp="${daemon}${daemon_flags:+ ${daemon_flags}}" -rcexec="env -i HOME=/ su -m -c ${daemon_class} -s /bin/sh ${daemon_user} -c" +rcexec="su -l -c ${daemon_class} -s /bin/sh ${daemon_user} -c" [ "${daemon_rtable}" -eq 0 ] || rcexec="route -T ${daemon_rtable} exec ${rcexec}" diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 index 9eb19e39d55..0f3b160e498 100644 --- a/share/man/man8/rc.subr.8 +++ b/share/man/man8/rc.subr.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rc.subr.8,v 1.35 2018/10/16 07:07:05 ajacoutot Exp $ +.\" $OpenBSD: rc.subr.8,v 1.36 2018/10/29 07:55:41 ajacoutot Exp $ .\" .\" Copyright (c) 2011 Robert Nagy, Antoine Jacoutot, Ingo Schwarze .\" All rights reserved. @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: October 16 2018 $ +.Dd $Mdocdate: October 29 2018 $ .Dt RC.SUBR 8 .Os .Sh NAME @@ -312,7 +312,7 @@ Holds the full command used to run the daemon. Defaults to: .Pp -.Dl "env -i HOME=/ su -m -c ${daemon_class} -s /bin/sh ${daemon_user} -c" +.Dl "su -l -c ${daemon_class} -s /bin/sh ${daemon_user} -c" .El If .Va daemon_rtable |