diff options
| author | Joel Knight <joel@cvs.openbsd.org> | 2012-01-31 18:17:20 +0000 |
|---|---|---|
| committer | Joel Knight <joel@cvs.openbsd.org> | 2012-01-31 18:17:20 +0000 |
| commit | e8a16fa4c3491607be5a51845f26ec989b936f50 (patch) | |
| tree | 98ae520fbaa7fdaf88c96730e3a0174841ca0fac | |
| parent | a929822e242b7086dc12b0424d3c476136954ae5 (diff) | |
Document relayd(8)'s use of the openBSD.3 OID; move the CARP MIB to
openBSD.6 to avoid a conflict with relayd.
ok camield@
| -rw-r--r-- | share/snmp/OPENBSD-BASE-MIB.txt | 7 | ||||
| -rw-r--r-- | usr.sbin/snmpd/mib.h | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/share/snmp/OPENBSD-BASE-MIB.txt b/share/snmp/OPENBSD-BASE-MIB.txt index 2a2666954a1..9c44ad75cbd 100644 --- a/share/snmp/OPENBSD-BASE-MIB.txt +++ b/share/snmp/OPENBSD-BASE-MIB.txt @@ -1,4 +1,4 @@ --- $OpenBSD: OPENBSD-BASE-MIB.txt,v 1.1 2008/12/23 18:32:10 reyk Exp $ +-- $OpenBSD: OPENBSD-BASE-MIB.txt,v 1.2 2012/01/31 18:17:19 joel Exp $ -- -- Copyright (c) 2008 Reyk Floeter <reyk@openbsd.org> -- Copyright (c) 2004-2007 Joel Knight <enabled@myrealbox.com> @@ -24,7 +24,7 @@ IMPORTS FROM SNMPv2-CONF; openBSD MODULE-IDENTITY - LAST-UPDATED "200612100000Z" + LAST-UPDATED "201201310000Z" ORGANIZATION "OpenBSD" CONTACT-INFO "Editor: Reyk Floeter @@ -47,9 +47,10 @@ openBSD MODULE-IDENTITY -- pfMIBObjects OBJECT IDENTIFIER ::= { openBSD 1 } sensorsMIBObjects OBJECT IDENTIFIER ::= { openBSD 2 } --- carpMIBObjects OBJECT IDENTIFIER ::= { openBSD 3 } +-- relaydMIBObjects OBJECT IDENTIFIER ::= { openBSD 3 } -- ipsecMIBObjects OBJECT IDENTIFIER ::= { openBSD 4 } memMIBObjects OBJECT IDENTIFIER ::= { openBSD 5 } +carpMIBObjects OBJECT IDENTIFIER ::= { openBSD 6 } -- Other values localSystem OBJECT IDENTIFIER ::= { openBSD 23 } diff --git a/usr.sbin/snmpd/mib.h b/usr.sbin/snmpd/mib.h index ba25b8fe855..2b8f9d461f8 100644 --- a/usr.sbin/snmpd/mib.h +++ b/usr.sbin/snmpd/mib.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mib.h,v 1.22 2012/01/31 18:00:46 joel Exp $ */ +/* $OpenBSD: mib.h,v 1.23 2012/01/31 18:17:19 joel Exp $ */ /* * Copyright (c) 2007, 2008 Reyk Floeter <reyk@vantronix.net> @@ -412,6 +412,7 @@ #define MIB_sensorValue MIB_sensorEntry, 5 #define MIB_sensorUnits MIB_sensorEntry, 6 #define MIB_sensorStatus MIB_sensorEntry, 7 +#define MIB_relaydMIBObjects MIB_openBSD, 3 #define MIB_ipsecMIBObjects MIB_openBSD, 4 #define MIB_memMIBObjects MIB_openBSD, 5 #define MIB_memMIBVersion MIB_memMIBObjects, 1 |