svn commit: r293911 - head/etc

[Gleb Smirnoff]

Author: glebius
Date: Thu Jan 14 10:25:18 2016
New Revision: 293911
URL: https://svnweb.freebsd.org/changeset/base/293911

Log:
  Install /etc/snmpd.config with 0600 permissions.
  
  Noticed by:	Pierre Kim
  Security:	SA-16:06.snmpd
  Pointy hat to:	glebius in 2005

Modified:
  head/etc/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Thu Jan 14 10:22:45 2016	(r293910)
+++ head/etc/Makefile	Thu Jan 14 10:25:18 2016	(r293911)
@@ -82,10 +82,6 @@ BIN1+= apmd.conf
 BIN1+= auto_master
 .endif
 
-.if ${MK_BSNMP} != "no"
-BIN1+= snmpd.config
-.endif
-
 .if ${MK_FREEBSD_UPDATE} != "no"
 BIN1+= freebsd-update.conf
 .endif
@@ -219,6 +215,11 @@ distribution:
 		${BIN2} ${DESTDIR}/etc; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
 		master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
+.if ${MK_BSNMP} != "no"
+	cd ${.CURDIR}; \
+	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
+		snmpd.config ${DESTDIR}/etc;
+.endif
 .if ${MK_AT} == "no"
 	sed -i "" -e 's;.*/usr/libexec/atrun;#&;' ${DESTDIR}/etc/crontab
 .endif