2.2 merge

diff --git a/src/snmp_core.cc b/src/snmp_core.cc
index 6071e432819c14f86bbe8a4ac03d7b5becf05f39..3b197a42e10734e69ef8dfeb52cd6014cc689463 100644 (file)
--- a/src/snmp_core.cc
+++ b/src/snmp_core.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: snmp_core.cc,v 1.35 1999/04/15 06:16:08 wessels Exp $
+ * $Id: snmp_core.cc,v 1.36 1999/04/26 19:47:14 wessels Exp $
  *
  * DEBUG: section 49    SNMP support
  * AUTHOR: Glenn Chisholm
@@ -200,31 +200,31 @@ snmpInit(void)
                                                snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, PERF_PROTO, 1, 14),
                                                    LEN_SQ_PRF + 3, snmp_prfProtoFn, static_Inst, 0),
                                                snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, PERF_PROTO, 1, 15),
-                                                   LEN_SQ_PRF + 3, snmp_prfProtoFn, static_Inst, 0))),
-                                       snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, PERF_PROTO, 2),
-                                           LEN_SQ_PRF + 2, NULL, NULL, 1,
-                                           snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, PERF_PROTO, 2, 1),
-                                               LEN_SQ_PRF + 3, NULL, NULL, 10,
-                                               snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 1),
-                                                   LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0),
-                                               snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 2),
-                                                   LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0),
-                                               snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 3),
-                                                   LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0),
-                                               snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 4),
-                                                   LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0),
-                                               snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 5),
-                                                   LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0),
-                                               snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 6),
-                                                   LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0),
-                                               snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 7),
-                                                   LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0),
-                                               snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 8),
-                                                   LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0),
-                                               snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 9),
-                                                   LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0),
-                                               snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 10),
-                                                   LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0)))),
+                                                   LEN_SQ_PRF + 3, snmp_prfProtoFn, static_Inst, 0)),
+                                           snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, PERF_PROTO, 2),
+                                               LEN_SQ_PRF + 2, NULL, NULL, 1,
+                                               snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, PERF_PROTO, 2, 1),
+                                                   LEN_SQ_PRF + 3, NULL, NULL, 10,
+                                                   snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 1),
+                                                       LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0),
+                                                   snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 2),
+                                                       LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0),
+                                                   snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 3),
+                                                       LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0),
+                                                   snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 4),
+                                                       LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0),
+                                                   snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 5),
+                                                       LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0),
+                                                   snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 6),
+                                                       LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0),
+                                                   snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 7),
+                                                       LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0),
+                                                   snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 8),
+                                                       LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0),
+                                                   snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 9),
+                                                       LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0),
+                                                   snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 10),
+                                                       LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0))))),
                                    snmpAddNode(snmpCreateOid(LEN_SQ_NET, SQ_NET),
                                        LEN_SQ_NET, NULL, NULL, 3,
                                        snmpAddNode(snmpCreateOid(LEN_SQ_NET + 1, SQ_NET, NET_IP_CACHE),