Removed redundant MIB values cacheMemHighWM/cacheMemLowWM

diff --git a/include/cache_snmp.h b/include/cache_snmp.h
index c3235de95a6dcb22bf7d8f9371960742f25ba2cd..3571b0904da34a3d943f47f170053c8703a35ee8 100644 (file)
--- a/include/cache_snmp.h
+++ b/include/cache_snmp.h
@@ -1,5 +1,5 @@
 /*
- * $Id: cache_snmp.h,v 1.21 1999/01/21 23:16:37 wessels Exp $
+ * $Id: cache_snmp.h,v 1.22 1999/01/26 06:16:30 glenn Exp $
  */
 
 #ifdef SQUID_SNMP
@@ -78,8 +78,6 @@ enum {
 enum {
     CONF_ST_START,
     CONF_ST_MMAXSZ,
-    CONF_ST_MHIWM,     /* DELETE ME */
-    CONF_ST_MLOWM,     /* DELETE ME */
     CONF_ST_SWMAXSZ,
     CONF_ST_SWHIWM,
     CONF_ST_SWLOWM,

diff --git a/src/cf.data.pre b/src/cf.data.pre
index f9fb78897f646c37c2a3d487d96f483c5c7225e9..841c81ab4d1b2c2616301168f957ea92be7db680 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.139 1999/01/24 05:24:22 wessels Exp $
+# $Id: cf.data.pre,v 1.140 1999/01/26 06:16:31 glenn Exp $
 #
 #
 # SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -2425,6 +2425,7 @@ NAME: snmp_access
 TYPE: acl_access
 LOC: Config.accessList.snmp
 DEFAULT: none
+DEFAULT_IF_NONE: deny all
 IFDEF: SQUID_SNMP
 DOC_START
        Allowing or denying access to the SNMP port.
@@ -2437,10 +2438,6 @@ DOC_START
 Example:
 snmp_access allow public localhost
 snmp_access deny all
-
-NOCOMMENT_START
-snmp_access deny all
-NOCOMMENT_END
 DOC_END
 
 NAME: snmp_incoming_address

diff --git a/src/mib.txt b/src/mib.txt
index ec08e26a5d6e8e7d1a34f0163c7b22ea01f8c3f4..4a246eef4c611c8c384f5231a310471b2acece58 100644 (file)
--- a/src/mib.txt
+++ b/src/mib.txt
@@ -1,6 +1,6 @@
 SQUID-MIB  DEFINITIONS ::= BEGIN
 --
--- $Id: mib.txt,v 1.22 1999/01/15 20:48:16 glenn Exp $
+-- $Id: mib.txt,v 1.23 1999/01/26 06:16:32 glenn Exp $
 --
 
 IMPORTS
@@ -133,29 +133,13 @@ squid MODULE-IDENTITY
                         " Cache Memory Maximum Size "
         ::= { cacheStorageConfig 1 }
 
-       cacheMemHighWM OBJECT-TYPE
-                SYNTAX Integer32
-                MAX-ACCESS read-only
-                STATUS current
-                DESCRIPTION
-                        " Cache Memory High Water Mark "
-        ::= { cacheStorageConfig 2 }
-
-        cacheMemLowWM OBJECT-TYPE
-                SYNTAX Integer32
-                MAX-ACCESS read-only
-                STATUS current
-                DESCRIPTION
-                        " Cache Memory Low Water Mark "
-        ::= { cacheStorageConfig 3 }
-
         cacheSwapMaxSize OBJECT-TYPE
                 SYNTAX Integer32
                 MAX-ACCESS read-only
                 STATUS current
                 DESCRIPTION
                         " Cache Swap Maximum Size "
-        ::= { cacheStorageConfig 4 }
+        ::= { cacheStorageConfig 2 }
 
         cacheSwapHighWM OBJECT-TYPE
                 SYNTAX Integer32
@@ -163,7 +147,7 @@ squid MODULE-IDENTITY
                 STATUS current
                 DESCRIPTION
                         " Cache Swap High Water Mark "
-        ::= { cacheStorageConfig 5 }
+        ::= { cacheStorageConfig 3 }
 
         cacheSwapLowWM OBJECT-TYPE
                 SYNTAX Integer32
@@ -171,7 +155,7 @@ squid MODULE-IDENTITY
                 STATUS current
                 DESCRIPTION
                         " Cache Swap Low Water Mark "
-        ::= { cacheStorageConfig 6 }
+        ::= { cacheStorageConfig 4 }
 
 -- end of  cacheStorageConfig group
 

diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc
index 9e072512072cd609bc9a94f84c9101a3c9388d73..ca26c942f20841b840f142f11bf6c98cc22436d5 100644 (file)
--- a/src/snmp_agent.cc
+++ b/src/snmp_agent.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: snmp_agent.cc,v 1.64 1999/01/22 03:49:22 wessels Exp $
+ * $Id: snmp_agent.cc,v 1.65 1999/01/26 06:16:33 glenn Exp $
  *
  * DEBUG: section 49     SNMP Interface
  * AUTHOR: Kostas Anagnostakis
@@ -119,18 +119,6 @@ snmp_confFn(variable_list * Var, snint * ErrP)
            Answer->type = ASN_INTEGER;
            *(Answer->val.integer) = (snint) Config.memMaxSize;
            break;
-       case CONF_ST_MHIWM:     /* DELETE ME */
-           Answer->val_len = sizeof(snint);
-           Answer->val.integer = xmalloc(Answer->val_len);
-           Answer->type = ASN_INTEGER;
-           *(Answer->val.integer) = (snint) 0;
-           break;
-       case CONF_ST_MLOWM:     /* DELETE ME */
-           Answer->val_len = sizeof(snint);
-           Answer->val.integer = xmalloc(Answer->val_len);
-           Answer->type = ASN_INTEGER;
-           *(Answer->val.integer) = (snint) 0;
-           break;
        case CONF_ST_SWMAXSZ:
            Answer->val_len = sizeof(snint);
            Answer->val.integer = xmalloc(Answer->val_len);

diff --git a/src/snmp_core.cc b/src/snmp_core.cc
index 00ad5ca15d106bdcad9f2fe6e9bce4f7733bac87..d242653e9bcb716abfd39455f1bc5d04975e317b 100644 (file)
--- a/src/snmp_core.cc
+++ b/src/snmp_core.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: snmp_core.cc,v 1.29 1999/01/19 02:24:30 wessels Exp $
+ * $Id: snmp_core.cc,v 1.30 1999/01/26 06:16:34 glenn Exp $
  *
  * DEBUG: section 49    SNMP support
  * AUTHOR: Glenn Chisholm
@@ -154,14 +154,6 @@ snmpInit(void)
                                            snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 2, SQ_CONF, 5, 4),
                                                LEN_SQ_CONF + 2, snmp_confFn, 1,
                                                snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 3, SQ_CONF, 5, 4, 0),
-                                                   LEN_SQ_CONF + 3, snmp_confFn, 0)),
-                                           snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 2, SQ_CONF, 5, 5),
-                                               LEN_SQ_CONF + 2, snmp_confFn, 1,
-                                               snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 3, SQ_CONF, 5, 5, 0),
-                                                   LEN_SQ_CONF + 3, snmp_confFn, 0)),
-                                           snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 2, SQ_CONF, 5, 6),
-                                               LEN_SQ_CONF + 2, snmp_confFn, 1,
-                                               snmpAddNode(snmpCreateOid(LEN_SQ_CONF + 3, SQ_CONF, 5, 6, 0),
                                                    LEN_SQ_CONF + 3, snmp_confFn, 0)))),
                                    snmpAddNode(snmpCreateOid(LEN_SQ_PRF, SQ_PRF),
                                        LEN_SQ_PRF, NULL, 2,