diff options
| author |   tb <tb@openbsd.org> | 2017-01-21 06:55:52 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2017-01-21 06:55:52 +0000 |
| commit | 7ba043aa1ce9515383a0058ea7033c788489d61d (patch) | |
| tree | de549c83c21e842b11e7d1ae1dfbb9ae65bb4f60 | |
| parent | Specify minimum and maximum protocol version for each method. This is (diff) | |
| download | wireguard-openbsd-7ba043aa1ce9515383a0058ea7033c788489d61d.tar.xz wireguard-openbsd-7ba043aa1ce9515383a0058ea7033c788489d61d.zip | |
Only do chown :wobj when this command will succeed. Allows using
bsd.prog.mk outside /usr/src by users not belonging to group wobj.
Requested by many after a report by Sebastien Marie.
ok deraadt
| -rw-r--r-- | share/mk/bsd.obj.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk index 1635d7cd8d3..d5261661e49 100644 --- a/share/mk/bsd.obj.mk +++ b/share/mk/bsd.obj.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.obj.mk,v 1.16 2016/11/19 14:20:58 tb Exp $ +# $OpenBSD: bsd.obj.mk,v 1.17 2017/01/21 06:55:52 tb Exp $ # $NetBSD: bsd.obj.mk,v 1.9 1996/04/10 21:08:05 thorpej Exp $ .if !target(obj) @@ -27,7 +27,7 @@ obj! _SUBDIRUSE }; \ MKDIRS=_mkdirs; \ fi; \ - elif [[ $$here == $$subdir ]]; then \ + elif [[ `id` == *'('${WOBJGROUP}')'* && $$here == $$subdir ]]; then \ SETOWNER="chown :${WOBJGROUP}"; \ else \ SETOWNER=:; \ |