svn commit: r310876 - stable/10/etc

[Ngie Cooper]

Author: ngie
Date: Fri Dec 30 23:59:43 2016
New Revision: 310876
URL: https://svnweb.freebsd.org/changeset/base/310876

Log:
  MFstable/11 r310875:
  
  MFC r310458,r310466:
  
  r310458:
  
  Group all loadable modules in the %default section
  
  This will allow new users to uncomment the modules and have things work
  with less head scratching, in the event they decide to uncomment any
  of the section separators, e.g. %usm or %vcm, as the module loading is
  only effective in the %default section.
  
  r310466:
  
  Don't hardcode $(securityModelUSM) (3) in the authPriv example under the %vacm
  section

Modified:
  stable/10/etc/snmpd.config
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/snmpd.config
==============================================================================
--- stable/10/etc/snmpd.config	Fri Dec 30 23:52:19 2016	(r310875)
+++ stable/10/etc/snmpd.config	Fri Dec 30 23:59:43 2016	(r310876)
@@ -112,12 +112,58 @@ sysObjectId 	= 1.3.6.1.4.1.12325.1.1.2.1
 
 snmpEnableAuthenTraps = 2
 
+# Uncomment `begemotSnmpdModulePath.".." = ".."' entries below to enable
+# modules
+
+#
+# Bridge module
+#  This requires the mibII module.
+#
+#begemotSnmpdModulePath."bridge" = "/usr/lib/snmp_bridge.so"
+
+#
+# Host resources module
+#  This requires the mibII module.
+#
+#begemotSnmpdModulePath."hostres" = "/usr/lib/snmp_hostres.so"
+
+#
+# MIB-2 module
+#
+begemotSnmpdModulePath."mibII"	= "/usr/lib/snmp_mibII.so"
+
+#
+# Netgraph module
+#
+#begemotSnmpdModulePath."netgraph" = "/usr/lib/snmp_netgraph.so"
+
+#
+# pf(4) module
+#
+#begemotSnmpdModulePath."pf"	= "/usr/lib/snmp_pf.so"
+
+#
+# SNMPv3 Notification Targets
+#
+# begemotSnmpdModulePath."target"	= "/usr/lib/snmp_target.so"
+
 #
 # SNMPv3 User-based security module - must be loaded for SNMPv3 USM
 #
 #begemotSnmpdModulePath."usm"	= "/usr/lib/snmp_usm.so"
 
 #
+# SNMPv3 View-based Access Control module
+#
+#begemotSnmpdModulePath."vacm"	= "/usr/lib/snmp_vacm.so"
+
+#
+# Wireless module
+#  This requires the mibII module.
+#
+#begemotSnmpdModulePath."wlan" = "/usr/lib/snmp_wlan.so"
+
+#
 # SNMPv3 USM User definition.
 #
 
@@ -147,11 +193,6 @@ snmpEnableAuthenTraps = 2
 #
 
 #
-# SNMPv3 View-based Access Control module
-#
-#begemotSnmpdModulePath."vacm"	= "/usr/lib/snmp_vacm.so"
-
-#
 # Definition of view-based access control entries.
 #
 #%vacm
@@ -210,15 +251,10 @@ snmpEnableAuthenTraps = 2
 #
 #Read-write-notify access to restricted for SNMPv3 USM users with authPriv
 #
-# vacmAccessStatus.$(write)."".3.$(authPriv) = 4
-# vacmAccessReadViewName.$(write)."".3.$(authPriv) = "restricted"
-# vacmAccessWriteViewName.$(write)."".3.$(authPriv) = "restricted"
-# vacmAccessNotifyViewName.$(write)."".3.$(authPriv) = "restricted"
-
-#
-# SNMPv3 Notification Targets
-#
-# begemotSnmpdModulePath."target"	= "/usr/lib/snmp_target.so"
+# vacmAccessStatus.$(write)."".$(securityModelUSM).$(authPriv) = 4
+# vacmAccessReadViewName.$(write)."".$(securityModelUSM).$(authPriv) = "restricted"
+# vacmAccessWriteViewName.$(write)."".$(securityModelUSM).$(authPriv) = "restricted"
+# vacmAccessNotifyViewName.$(write)."".$(securityModelUSM).$(authPriv) = "restricted"
 
 #%target
 # Send notifications to target tag "test"
@@ -259,44 +295,11 @@ snmpEnableAuthenTraps = 2
 # snmpTargetAddrParams.$(tagremote) = $(tag)
 # snmpTargetAddrRowStatus.$(tagremote) = 1
 
-#
-# Load MIB-2 module
-#
-begemotSnmpdModulePath."mibII"	= "/usr/lib/snmp_mibII.so"
-
 # Force a polling rate for the 64-bit interface counters in case
 # the automatic computation is wrong (which may be the case if an interface
 # announces the wrong bit rate via its MIB).
 #%mibII
 #begemotIfForcePoll = 2000
 
-
-# Netgraph module
-#
-#begemotSnmpdModulePath."netgraph" = "/usr/lib/snmp_netgraph.so"
-#
 #%netgraph
 #begemotNgControlNodeName = "snmpd"
-
-#
-# pf(4) module
-#
-#begemotSnmpdModulePath."pf"	= "/usr/lib/snmp_pf.so"
-
-#
-# Host resources module
-#  This requires the mibII module.
-#
-#begemotSnmpdModulePath."hostres" = "/usr/lib/snmp_hostres.so"
-
-#
-# Bridge module
-#  This requires the mibII module.
-#
-#begemotSnmpdModulePath."bridge" = "/usr/lib/snmp_bridge.so"
-
-#
-# Wireless module
-#  This requires the mibII module.
-#
-#begemotSnmpdModulePath."wlan" = "/usr/lib/snmp_wlan.so"