From owner-svn-src-all@freebsd.org  Sun Mar 19 22:14:23 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 833D9D135BC;
 Sun, 19 Mar 2017 22:14:23 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4B67919C7;
 Sun, 19 Mar 2017 22:14:23 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2JMEMLQ059256;
 Sun, 19 Mar 2017 22:14:22 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2JMEM0U059255;
 Sun, 19 Mar 2017 22:14:22 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201703192214.v2JMEM0U059255@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Sun, 19 Mar 2017 22:14:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r315593 - stable/10/etc
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Mar 2017 22:14:23 -0000

Author: ngie
Date: Sun Mar 19 22:14:22 2017
New Revision: 315593
URL: https://svnweb.freebsd.org/changeset/base/315593

Log:
  MFC r311601:
  
  Move the mibII module up so uncommenting the bridge module works
  
  Add a note about how module ordering and dependent modules

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

Modified: stable/10/etc/snmpd.config
==============================================================================
--- stable/10/etc/snmpd.config	Sun Mar 19 22:13:40 2017	(r315592)
+++ stable/10/etc/snmpd.config	Sun Mar 19 22:14:22 2017	(r315593)
@@ -122,6 +122,14 @@ snmpEnableAuthenTraps = 2
 # order to use the enclosed variables, e.g. `usmUserStatus.$(engine).$(user1)`
 # can only be used if %usm is uncommented.
 #
+# Modules are loaded in the order listed, so they must be before any
+# dependent modules, e.g. "mibII" vs "bridge".
+#
+
+#
+# MIB-2 module
+#
+begemotSnmpdModulePath."mibII"	= "/usr/lib/snmp_mibII.so"
 
 #
 # Bridge module
@@ -136,11 +144,6 @@ snmpEnableAuthenTraps = 2
 #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"