summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormvs <mvs@openbsd.org>2020-06-22 09:28:04 +0000
committermvs <mvs@openbsd.org>2020-06-22 09:28:04 +0000
commitb4cf6692cb2aee31d6714111a784e6109f6071ca (patch)
tree84f5369a7beb856b1666dc40b188f841823ab319
parentFix two iwx(4) TX_CMD_OFFLD macros. (diff)
downloadwireguard-openbsd-b4cf6692cb2aee31d6714111a784e6109f6071ca.tar.xz
wireguard-openbsd-b4cf6692cb2aee31d6714111a784e6109f6071ca.zip
Install npppd.conf(5) with mode 0600 instead of 0640. npppd.conf(5) can
store radius passwords and nothing requires it to be group readable. ok yasuoka@
-rw-r--r--etc/mtree/special4
-rw-r--r--usr.sbin/npppd/Makefile6
2 files changed, 5 insertions, 5 deletions
diff --git a/etc/mtree/special b/etc/mtree/special
index c7712b025ed..961e82d5d05 100644
--- a/etc/mtree/special
+++ b/etc/mtree/special
@@ -1,4 +1,4 @@
-# $OpenBSD: special,v 1.125 2018/02/10 05:56:47 florian Exp $
+# $OpenBSD: special,v 1.126 2020/06/22 09:28:04 mvs Exp $
#
# Hand-crafted mtree specification for the dangerous files.
#
@@ -66,7 +66,7 @@ special type=file mode=0600 uname=root gname=wheel
moduli type=file mode=0644 uname=root gname=wheel
netstart type=file mode=0644 uname=root gname=wheel
npppd type=dir mode=0755 uname=root gname=wheel
-npppd.conf type=file mode=0640 uname=root gname=wheel
+npppd.conf type=file mode=0600 uname=root gname=wheel
npppd-users type=file mode=0600 uname=root gname=wheel
.. #npppd
ntpd.conf type=file mode=0644 uname=root gname=wheel optional
diff --git a/usr.sbin/npppd/Makefile b/usr.sbin/npppd/Makefile
index 1dd8011d128..8f79e04c2aa 100644
--- a/usr.sbin/npppd/Makefile
+++ b/usr.sbin/npppd/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.6 2013/03/14 16:20:46 giovanni Exp $
+# $OpenBSD: Makefile,v 1.7 2020/06/22 09:28:04 mvs Exp $
#
-# $Id: Makefile,v 1.6 2013/03/14 16:20:46 giovanni Exp $
+# $Id: Makefile,v 1.7 2020/06/22 09:28:04 mvs Exp $
#
SUBDIR+= npppd
distribution:
- ${INSTALL} -C -o root -g wheel -m 0640 ${.CURDIR}/npppd/npppd.conf \
+ ${INSTALL} -C -o root -g wheel -m 0600 ${.CURDIR}/npppd/npppd.conf \
${DESTDIR}/etc/npppd/npppd.conf
${INSTALL} -C -o root -g wheel -m 0600 ${.CURDIR}/npppd/npppd-users \
${DESTDIR}/etc/npppd/npppd-users