From ee320163c6b7913ddae41cb8954b237d1b99eadf Mon Sep 17 00:00:00 2001
From: Nathan Kinder <nkinder@redhat.com>
Date: Wed, 8 Feb 2012 09:38:26 -0800
Subject: [PATCH] Ticket 284 - Remove unnecessary SNMP MIB files

We currently carry around some standard MIB files in our soruce tree
and install them as well.  Aside from our DS specific MIB file, these
are all included as a part of the Net-SNMP distribution.  We should
not be carrying these files around as well.

This patch removes the standard MIB files from our tree and updates
the Makefile to avoid installing them.
---
 Makefile.am                                |    8 +-
 Makefile.in                                |    9 +-
 ldap/servers/snmp/NETWORK-SERVICES-MIB.txt |  650 -----------------------
 ldap/servers/snmp/RFC-1215.txt             |   38 --
 ldap/servers/snmp/RFC1155-SMI.txt          |  119 -----
 ldap/servers/snmp/SNMPv2-CONF.txt          |  322 ------------
 ldap/servers/snmp/SNMPv2-SMI.txt           |  344 -------------
 ldap/servers/snmp/SNMPv2-TC.txt            |  772 ----------------------------
 ldap/servers/snmp/netscape-ldap.mib        |  759 ---------------------------
 9 files changed, 2 insertions(+), 3019 deletions(-)
 delete mode 100644 ldap/servers/snmp/NETWORK-SERVICES-MIB.txt
 delete mode 100644 ldap/servers/snmp/RFC-1215.txt
 delete mode 100644 ldap/servers/snmp/RFC1155-SMI.txt
 delete mode 100644 ldap/servers/snmp/SNMPv2-CONF.txt
 delete mode 100644 ldap/servers/snmp/SNMPv2-SMI.txt
 delete mode 100644 ldap/servers/snmp/SNMPv2-TC.txt
 delete mode 100644 ldap/servers/snmp/netscape-ldap.mib

diff --git a/Makefile.am b/Makefile.am
index e84b63d..bb761e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -404,13 +404,7 @@ inf_DATA = ldap/admin/src/slapd.inf \
 	ldap/admin/src/scripts/dsupdate.map \
 	ldap/admin/src/scripts/dsorgentries.map
 
-mib_DATA = ldap/servers/snmp/RFC-1215.txt \
-	ldap/servers/snmp/SNMPv2-TC.txt \
-	ldap/servers/snmp/redhat-directory.mib \
-	ldap/servers/snmp/SNMPv2-CONF.txt \
-	ldap/servers/snmp/NETWORK-SERVICES-MIB.txt \
-	ldap/servers/snmp/RFC1155-SMI.txt \
-	ldap/servers/snmp/SNMPv2-SMI.txt
+mib_DATA = ldap/servers/snmp/redhat-directory.mib
 
 pkgconfig_DATA = $(PACKAGE_NAME).pc
 
diff --git a/Makefile.in b/Makefile.in
index b33c6a5..88ab46f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1604,14 +1604,7 @@ inf_DATA = ldap/admin/src/slapd.inf \
 	ldap/admin/src/scripts/dsupdate.map \
 	ldap/admin/src/scripts/dsorgentries.map
 
-mib_DATA = ldap/servers/snmp/RFC-1215.txt \
-	ldap/servers/snmp/SNMPv2-TC.txt \
-	ldap/servers/snmp/redhat-directory.mib \
-	ldap/servers/snmp/SNMPv2-CONF.txt \
-	ldap/servers/snmp/NETWORK-SERVICES-MIB.txt \
-	ldap/servers/snmp/RFC1155-SMI.txt \
-	ldap/servers/snmp/SNMPv2-SMI.txt
-
+mib_DATA = ldap/servers/snmp/redhat-directory.mib
 pkgconfig_DATA = $(PACKAGE_NAME).pc
 
 #------------------------
diff --git a/ldap/servers/snmp/NETWORK-SERVICES-MIB.txt b/ldap/servers/snmp/NETWORK-SERVICES-MIB.txt
deleted file mode 100644
index cadc550..0000000
--- a/ldap/servers/snmp/NETWORK-SERVICES-MIB.txt
+++ /dev/null
@@ -1,650 +0,0 @@
--- extracted from rfc2788.txt
--- at Fri Mar 24 07:07:18 2000
-
-   NETWORK-SERVICES-MIB DEFINITIONS ::= BEGIN
-
-   IMPORTS
-       OBJECT-TYPE, Counter32, Gauge32, MODULE-IDENTITY, mib-2
-         FROM SNMPv2-SMI
-       TimeStamp, TEXTUAL-CONVENTION
-         FROM SNMPv2-TC
-       MODULE-COMPLIANCE, OBJECT-GROUP
-         FROM SNMPv2-CONF
-       SnmpAdminString
-           FROM SNMP-FRAMEWORK-MIB;
-
-   application MODULE-IDENTITY
-       LAST-UPDATED "200003030000Z"
-       ORGANIZATION "IETF Mail and Directory Management Working Group"
-       CONTACT-INFO
-         "        Ned Freed
-
-          Postal: Innosoft International, Inc.
-                  1050 Lakes Drive
-                  West Covina, CA 91790
-                  US
-
-             Tel: +1 626 919 3600
-             Fax: +1 626 919 3614
-
-          E-Mail: ned.freed@innosoft.com"
-       DESCRIPTION
-         "The MIB module describing network service applications"
-       REVISION "200003030000Z"
-       DESCRIPTION
-         "This revision, published in RFC 2788, changes a number of
-          DisplayStrings to SnmpAdminStrings. Note that this change
-          is not strictly supported by SMIv2.  However, the alternative
-          of deprecating the old objects and defining new objects
-          would have a more adverse impact on backward compatibility
-          and interoperability, given the particular semantics of
-          these objects. The defining reference for distinguished
-          names has also been updated from RFC 1779 to RFC 2253."
-       REVISION "199905120000Z"
-       DESCRIPTION
-         "This revision fixes a few small technical problems found
-          in previous versions, mostly in regards to the conformance
-          groups for different versions of this MIB.  No changes have
-          been made to the objects this MIB defines since RFC 2248."
-       REVISION "199708170000Z"
-       DESCRIPTION
-         "This revision, published in RFC 2248, adds the
-          applDescription and applURL objects, adds the quiescing
-          state to the applOperStatus object and renames the MIB
-          from the APPLICATION-MIB to the NETWORK-SERVICE-MIB."
-       REVISION "199311280000Z"
-       DESCRIPTION
-         "The original version of this MIB was published in RFC 1565"
-       ::= {mib-2 27}
-
-   -- Textual conventions
-
-   -- DistinguishedName is used to refer to objects in the
-   -- directory.
-
-   DistinguishedName ::= TEXTUAL-CONVENTION
-       DISPLAY-HINT "255a"
-       STATUS current
-       DESCRIPTION
-           "A Distinguished Name represented in accordance with
-            RFC 2253, presented in the UTF-8 charset defined in
-            RFC 2279."
-       SYNTAX OCTET STRING (SIZE (0..255))
-
-   -- Uniform Resource Locators are stored in URLStrings.
-
-   URLString ::= TEXTUAL-CONVENTION
-       DISPLAY-HINT "255a"
-       STATUS current
-       DESCRIPTION
-           "A Uniform Resource Locator represented in accordance
-            with RFCs 1738 and 2368, presented in the NVT ASCII
-            charset defined in RFC 854."
-       SYNTAX OCTET STRING (SIZE (0..255))
-
-   -- The basic applTable contains a list of the application
-   -- entities.
-
-   applTable OBJECT-TYPE
-       SYNTAX SEQUENCE OF ApplEntry
-       MAX-ACCESS not-accessible
-       STATUS current
-       DESCRIPTION
-           "The table holding objects which apply to all different
-            kinds of applications providing network services.
-            Each network service application capable of being
-            monitored should have a single entry in this table."
-       ::= {application 1}
-
-   applEntry OBJECT-TYPE
-       SYNTAX ApplEntry
-       MAX-ACCESS not-accessible
-       STATUS current
-       DESCRIPTION
-         "An entry associated with a single network service
-          application."
-       INDEX {applIndex}
-       ::= {applTable 1}
-
-   ApplEntry ::= SEQUENCE {
-       applIndex
-           INTEGER,
-       applName
-           SnmpAdminString,
-       applDirectoryName
-           DistinguishedName,
-       applVersion
-           SnmpAdminString,
-       applUptime
-           TimeStamp,
-       applOperStatus
-           INTEGER,
-       applLastChange
-           TimeStamp,
-       applInboundAssociations
-           Gauge32,
-       applOutboundAssociations
-           Gauge32,
-       applAccumulatedInboundAssociations
-           Counter32,
-       applAccumulatedOutboundAssociations
-           Counter32,
-       applLastInboundActivity
-           TimeStamp,
-       applLastOutboundActivity
-           TimeStamp,
-       applRejectedInboundAssociations
-           Counter32,
-       applFailedOutboundAssociations
-           Counter32,
-       applDescription
-           SnmpAdminString,
-       applURL
-           URLString
-   }
-
-   applIndex OBJECT-TYPE
-       SYNTAX INTEGER (1..2147483647)
-       MAX-ACCESS not-accessible
-       STATUS current
-       DESCRIPTION
-         "An index to uniquely identify the network service
-          application. This attribute is the index used for
-          lexicographic ordering of the table."
-       ::= {applEntry 1}
-
-   applName OBJECT-TYPE
-       SYNTAX SnmpAdminString
-       MAX-ACCESS read-only
-       STATUS current
-       DESCRIPTION
-         "The name the network service application chooses to be
-          known by."
-       ::= {applEntry 2}
-
-   applDirectoryName OBJECT-TYPE
-       SYNTAX DistinguishedName
-       MAX-ACCESS read-only
-       STATUS current
-       DESCRIPTION
-         "The Distinguished Name of the directory entry where
-          static information about this application is stored.
-          An empty string indicates that no information about
-          the application is available in the directory."
-       ::= {applEntry 3}
-
-   applVersion OBJECT-TYPE
-       SYNTAX SnmpAdminString
-       MAX-ACCESS read-only
-       STATUS current
-       DESCRIPTION
-         "The version of network service application software.
-          This field is usually defined by the vendor of the
-          network service application software."
-       ::= {applEntry 4}
-   applUptime OBJECT-TYPE
-       SYNTAX TimeStamp
-       MAX-ACCESS read-only
-       STATUS current
-       DESCRIPTION
-         "The value of sysUpTime at the time the network service
-          application was last initialized.  If the application was
-          last initialized prior to the last initialization of the
-          network management subsystem, then this object contains
-          a zero value."
-       ::= {applEntry 5}
-
-   applOperStatus OBJECT-TYPE
-       SYNTAX INTEGER {
-         up(1),
-         down(2),
-         halted(3),
-         congested(4),
-         restarting(5),
-         quiescing(6)
-       }
-       MAX-ACCESS read-only
-       STATUS current
-       DESCRIPTION
-         "Indicates the operational status of the network service
-          application. 'down' indicates that the network service is
-          not available. 'up' indicates that the network service
-          is operational and available.  'halted' indicates that the
-          service is operational but not available.  'congested'
-          indicates that the service is operational but no additional
-          inbound associations can be accommodated.  'restarting'
-          indicates that the service is currently unavailable but is
-          in the process of restarting and will be available soon.
-          'quiescing' indicates that service is currently operational
-          but is in the process of shutting down. Additional inbound
-          associations may be rejected by applications in the
-          'quiescing' state."
-       ::= {applEntry 6}
-
-   applLastChange OBJECT-TYPE
-       SYNTAX TimeStamp
-       MAX-ACCESS read-only
-       STATUS current
-       DESCRIPTION
-         "The value of sysUpTime at the time the network service
-          application entered its current operational state.  If
-          the current state was entered prior to the last
-          initialization of the local network management subsystem,
-          then this object contains a zero value."
-       ::= {applEntry 7}
-
-   applInboundAssociations OBJECT-TYPE
-       SYNTAX Gauge32
-       MAX-ACCESS read-only
-       STATUS current
-       DESCRIPTION
-         "The number of current associations to the network service
-          application, where it is the responder.  An inbound
-          association occurs when another application successfully
-          connects to this one."
-       ::= {applEntry 8}
-
-   applOutboundAssociations OBJECT-TYPE
-       SYNTAX Gauge32
-       MAX-ACCESS read-only
-       STATUS current
-       DESCRIPTION
-         "The number of current associations to the network service
-          application, where it is the initiator.  An outbound
-          association occurs when this application successfully
-          connects to another one."
-       ::= {applEntry 9}
-
-   applAccumulatedInboundAssociations OBJECT-TYPE
-       SYNTAX Counter32
-       MAX-ACCESS read-only
-       STATUS current
-       DESCRIPTION
-         "The total number of associations to the application entity
-          since application initialization, where it was the responder."
-       ::= {applEntry 10}
-
-   applAccumulatedOutboundAssociations OBJECT-TYPE
-       SYNTAX Counter32
-       MAX-ACCESS read-only
-       STATUS current
-       DESCRIPTION
-         "The total number of associations to the application entity
-          since application initialization, where it was the initiator."
-       ::= {applEntry 11}
-
-   applLastInboundActivity OBJECT-TYPE
-       SYNTAX TimeStamp
-       MAX-ACCESS read-only
-       STATUS current
-       DESCRIPTION
-         "The value of sysUpTime at the time this application last
-          had an inbound association.  If the last association
-          occurred prior to the last initialization of the network
-          subsystem, then this object contains a zero value."
-       ::= {applEntry 12}
-
-   applLastOutboundActivity OBJECT-TYPE
-       SYNTAX TimeStamp
-       MAX-ACCESS read-only
-       STATUS current
-       DESCRIPTION
-         "The value of sysUpTime at the time this application last
-          had an outbound association.  If the last association
-          occurred prior to the last initialization of the network
-          subsystem, then this object contains a zero value."
-       ::= {applEntry 13}
-
-   applRejectedInboundAssociations OBJECT-TYPE
-       SYNTAX Counter32
-       MAX-ACCESS read-only
-       STATUS current
-       DESCRIPTION
-         "The total number of inbound associations the application
-          entity has rejected, since application initialization.
-          Rejected associations are not counted in the accumulated
-          association totals.  Note that this only counts
-          associations the application entity has rejected itself;
-          it does not count rejections that occur at lower layers
-          of the network.  Thus, this counter may not reflect the
-          true number of failed inbound associations."
-       ::= {applEntry 14}
-
-   applFailedOutboundAssociations OBJECT-TYPE
-       SYNTAX Counter32
-       MAX-ACCESS read-only
-       STATUS current
-       DESCRIPTION
-         "The total number associations where the application entity
-          is initiator and association establishment has failed,
-          since application initialization.  Failed associations are
-          not counted in the accumulated association totals."
-       ::= {applEntry 15}
-
-   applDescription OBJECT-TYPE
-       SYNTAX SnmpAdminString
-       MAX-ACCESS read-only
-       STATUS current
-       DESCRIPTION
-         "A text description of the application.  This information
-          is intended to identify and briefly describe the
-          application in a status display."
-       ::= {applEntry 16}
-
-   applURL OBJECT-TYPE
-       SYNTAX URLString
-       MAX-ACCESS read-only
-       STATUS current
-       DESCRIPTION
-         "A URL pointing to a description of the application.
-          This information is intended to identify and describe
-          the application in a status display."
-       ::= {applEntry 17}
-
-   -- The assocTable augments the information in the applTable
-   -- with information about associations.  Note that two levels
-   -- of compliance are specified below, depending on whether
-   -- association monitoring is mandated.
-
-   assocTable OBJECT-TYPE
-       SYNTAX SEQUENCE OF AssocEntry
-       MAX-ACCESS not-accessible
-       STATUS current
-       DESCRIPTION
-           "The table holding a set of all active application
-            associations."
-       ::= {application 2}
-
-   assocEntry OBJECT-TYPE
-       SYNTAX AssocEntry
-       MAX-ACCESS not-accessible
-       STATUS current
-       DESCRIPTION
-         "An entry associated with an association for a network
-          service application."
-       INDEX {applIndex, assocIndex}
-       ::= {assocTable 1}
-
-   AssocEntry ::= SEQUENCE {
-       assocIndex
-           INTEGER,
-       assocRemoteApplication
-           SnmpAdminString,
-       assocApplicationProtocol
-           OBJECT IDENTIFIER,
-       assocApplicationType
-           INTEGER,
-       assocDuration
-           TimeStamp
-   }
-
-   assocIndex OBJECT-TYPE
-       SYNTAX INTEGER (1..2147483647)
-       MAX-ACCESS not-accessible
-       STATUS current
-       DESCRIPTION
-         "An index to uniquely identify each association for a network
-          service application.  This attribute is the index that is
-          used for lexicographic ordering of the table.  Note that the
-          table is also indexed by the applIndex."
-       ::= {assocEntry 1}
-
-   assocRemoteApplication OBJECT-TYPE
-       SYNTAX SnmpAdminString
-       MAX-ACCESS read-only
-       STATUS current
-       DESCRIPTION
-         "The name of the system running remote network service
-          application.  For an IP-based application this should be
-          either a domain name or IP address.  For an OSI application
-          it should be the string encoded distinguished name of the
-          managed object.  For X.400(1984) MTAs which do not have a
-          Distinguished Name, the RFC 2156 syntax 'mta in
-          globalid' used in X400-Received: fields can be used. Note,
-          however, that not all connections an MTA makes are
-          necessarily to another MTA."
-       ::= {assocEntry 2}
-
-   assocApplicationProtocol OBJECT-TYPE
-       SYNTAX OBJECT IDENTIFIER
-       MAX-ACCESS read-only
-       STATUS current
-       DESCRIPTION
-         "An identification of the protocol being used for the
-          application.  For an OSI Application, this will be the
-          Application Context.  For Internet applications, OID
-          values of the form {applTCPProtoID port} or {applUDPProtoID
-          port} are used for TCP-based and UDP-based protocols,
-          respectively. In either case 'port' corresponds to the
-          primary port number being used by the protocol. The
-          usual IANA procedures may be used to register ports for
-          new protocols."
-       ::= {assocEntry 3}
-
-   assocApplicationType OBJECT-TYPE
-       SYNTAX INTEGER {
-           uainitiator(1),
-           uaresponder(2),
-           peerinitiator(3),
-           peerresponder(4)}
-       MAX-ACCESS read-only
-       STATUS current
-       DESCRIPTION
-         "This indicates whether the remote application is some type of
-          client making use of this network service (e.g., a Mail User
-          Agent) or a server acting as a peer. Also indicated is whether
-          the remote end initiated an incoming connection to the network
-          service or responded to an outgoing connection made by the
-          local application.  MTAs and messaging gateways are
-          considered to be peers for the purposes of this variable."
-       ::= {assocEntry 4}
-
-   assocDuration OBJECT-TYPE
-       SYNTAX TimeStamp
-       MAX-ACCESS read-only
-       STATUS current
-       DESCRIPTION
-         "The value of sysUpTime at the time this association was
-          started.  If this association started prior to the last
-          initialization of the network subsystem, then this
-          object contains a zero value."
-       ::= {assocEntry 5}
-
-
-   -- Conformance information
-
-   applConformance OBJECT IDENTIFIER ::= {application 3}
-
-   applGroups      OBJECT IDENTIFIER ::= {applConformance 1}
-   applCompliances OBJECT IDENTIFIER ::= {applConformance 2}
-
-   -- Compliance statements
-
-   applCompliance MODULE-COMPLIANCE
-       STATUS obsolete
-       DESCRIPTION
-         "The compliance statement for RFC 1565 implementations
-          which support the Network Services Monitoring MIB
-          for basic monitoring of network service applications.
-          This is the basic compliance statement for RFC 1565."
-       MODULE
-         MANDATORY-GROUPS {applRFC1565Group}
-       ::= {applCompliances 1}
-
-   assocCompliance MODULE-COMPLIANCE
-       STATUS obsolete
-       DESCRIPTION
-         "The compliance statement for RFC 1565 implementations
-          which support the Network Services Monitoring MIB
-          for basic monitoring of network service applications
-          and their associations."
-       MODULE
-         MANDATORY-GROUPS {applRFC1565Group, assocRFC1565Group}
-       ::= {applCompliances 2}
-
-   applRFC2248Compliance MODULE-COMPLIANCE
-       STATUS deprecated
-       DESCRIPTION
-         "The compliance statement for RFC 2248 implementations
-          which support the Network Services Monitoring MIB
-          for basic monitoring of network service applications."
-       MODULE
-         MANDATORY-GROUPS {applRFC2248Group}
-       ::= {applCompliances 3}
-
-   assocRFC2248Compliance MODULE-COMPLIANCE
-       STATUS deprecated
-       DESCRIPTION
-         "The compliance statement for RFC 2248 implementations
-          which support the Network Services Monitoring MIB for
-          basic monitoring of network service applications and
-          their associations."
-       MODULE
-         MANDATORY-GROUPS {applRFC2248Group, assocRFC2248Group}
-       ::= {applCompliances 4}
-
-   applRFC2788Compliance MODULE-COMPLIANCE
-       STATUS current
-       DESCRIPTION
-         "The compliance statement for RFC 2788 implementations
-          which support the Network Services Monitoring MIB
-          for basic monitoring of network service applications."
-       MODULE
-         MANDATORY-GROUPS {applRFC2788Group}
-       ::= {applCompliances 5}
-
-   assocRFC2788Compliance MODULE-COMPLIANCE
-       STATUS current
-       DESCRIPTION
-         "The compliance statement for RFC 2788 implementations
-          which support the Network Services Monitoring MIB for
-          basic monitoring of network service applications and
-          their associations."
-       MODULE
-         MANDATORY-GROUPS {applRFC2788Group, assocRFC2788Group}
-       ::= {applCompliances 6}
-
-
-   -- Units of conformance
-
-   applRFC1565Group OBJECT-GROUP
-       OBJECTS {
-         applName, applVersion, applUptime, applOperStatus,
-         applLastChange, applInboundAssociations,
-         applOutboundAssociations, applAccumulatedInboundAssociations,
-         applAccumulatedOutboundAssociations, applLastInboundActivity,
-         applLastOutboundActivity, applRejectedInboundAssociations,
-         applFailedOutboundAssociations}
-       STATUS obsolete
-       DESCRIPTION
-         "A collection of objects providing basic monitoring of
-          network service applications.  This is the original set
-          of such objects defined in RFC 1565."
-       ::= {applGroups 7}
-
-   assocRFC1565Group OBJECT-GROUP
-       OBJECTS {
-         assocRemoteApplication, assocApplicationProtocol,
-         assocApplicationType, assocDuration}
-       STATUS obsolete
-       DESCRIPTION
-         "A collection of objects providing basic monitoring of
-          network service applications' associations.  This is the
-          original set of such objects defined in RFC 1565."
-       ::= {applGroups 2}
-
-   applRFC2248Group OBJECT-GROUP
-       OBJECTS {
-         applName, applVersion, applUptime, applOperStatus,
-         applLastChange, applInboundAssociations,
-         applOutboundAssociations, applAccumulatedInboundAssociations,
-         applAccumulatedOutboundAssociations, applLastInboundActivity,
-         applLastOutboundActivity, applRejectedInboundAssociations,
-         applFailedOutboundAssociations, applDescription, applURL}
-       STATUS deprecated
-       DESCRIPTION
-         "A collection of objects providing basic monitoring of
-          network service applications.  This group was originally
-          defined in RFC 2248; note that applDirectoryName is
-          missing."
-       ::= {applGroups 3}
-
-   assocRFC2248Group OBJECT-GROUP
-       OBJECTS {
-         assocRemoteApplication, assocApplicationProtocol,
-         assocApplicationType, assocDuration}
-       STATUS deprecated
-       DESCRIPTION
-         "A collection of objects providing basic monitoring of
-          network service applications' associations.  This group
-          was originally defined by RFC 2248."
-       ::= {applGroups 4}
-
-   applRFC2788Group OBJECT-GROUP
-       OBJECTS {
-         applName, applDirectoryName, applVersion, applUptime,
-         applOperStatus, applLastChange, applInboundAssociations,
-         applOutboundAssociations, applAccumulatedInboundAssociations,
-         applAccumulatedOutboundAssociations, applLastInboundActivity,
-         applLastOutboundActivity, applRejectedInboundAssociations,
-         applFailedOutboundAssociations, applDescription, applURL}
-       STATUS current
-       DESCRIPTION
-         "A collection of objects providing basic monitoring of
-          network service applications.  This is the appropriate
-          group for RFC 2788 -- it adds the applDirectoryName object
-          missing in RFC 2248."
-       ::= {applGroups 5}
-
-   assocRFC2788Group OBJECT-GROUP
-       OBJECTS {
-         assocRemoteApplication, assocApplicationProtocol,
-         assocApplicationType, assocDuration}
-       STATUS current
-       DESCRIPTION
-         "A collection of objects providing basic monitoring of
-          network service applications' associations.  This is
-          the appropriate group for RFC 2788."
-       ::= {applGroups 6}
-
-   -- OIDs of the form {applTCPProtoID port} are intended to be used
-   -- for TCP-based protocols that don't have OIDs assigned by other
-   -- means. {applUDPProtoID port} serves the same purpose for
-   -- UDP-based protocols. In either case 'port' corresponds to
-   -- the primary port number being used by the protocol. For example,
-   -- assuming no other OID is assigned for SMTP, an OID of
-   -- {applTCPProtoID 25} could be used, since SMTP is a TCP-based
-   -- protocol that uses port 25 as its primary port.
-
-   applTCPProtoID OBJECT IDENTIFIER ::= {application 4}
-   applUDPProtoID OBJECT IDENTIFIER ::= {application 5}
-
-   END
-
--- 
---    Copyright (C) The Internet Society (2000).  All Rights Reserved.
--- 
---    This document and translations of it may be copied and furnished to
---    others, and derivative works that comment on or otherwise explain it
---    or assist in its implementation may be prepared, copied, published
---    and distributed, in whole or in part, without restriction of any
---    kind, provided that the above copyright notice and this paragraph are
---    included on all such copies and derivative works.  However, this
---    document itself may not be modified in any way, such as by removing
---    the copyright notice or references to the Internet Society or other
---    Internet organizations, except as needed for the purpose of
---    developing Internet standards in which case the procedures for
---    copyrights defined in the Internet Standards process must be
---    followed, or as required to translate it into languages other than
---    English.
--- 
---    The limited permissions granted above are perpetual and will not be
---    revoked by the Internet Society or its successors or assigns.
--- 
---    This document and the information contained herein is provided on an
---    "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
---    TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
---    BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
---    HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
---    MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
--- 
diff --git a/ldap/servers/snmp/RFC-1215.txt b/ldap/servers/snmp/RFC-1215.txt
deleted file mode 100644
index 6432723..0000000
--- a/ldap/servers/snmp/RFC-1215.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-
-RFC-1215 DEFINITIONS ::= BEGIN
-
--- This  module is a empty module.  It has been created solely for the 
--- purpose of allowing other modules to correctly import the TRAP-TYPE 
--- clause from RFC-1215 where it should be imported from.  It's a
--- built in type in the UCD-SNMP code, and in fact RFC-1215 doesn't
--- actually define a mib at all; it only defines macros.  However,
--- importing the TRAP-TYPE is conventionally done from an import
--- clause pointing to RFC-1215.
---
---   Wes 7/17/98
-
-TRAP-TYPE MACRO ::=
-BEGIN
-    TYPE NOTATION ::= "ENTERPRISE" value
-                      (enterprise OBJECT IDENTIFIER)
-                      VarPart
-                      DescrPart
-                      ReferPart
-    VALUE NOTATION ::= value (VALUE INTEGER)
-    VarPart ::=
-               "VARIABLES" "{" VarTypes "}"
-               | empty
-    VarTypes ::=
-               VarType | VarTypes "," VarType
-    VarType ::=
-               value (vartype ObjectName)
-    DescrPart ::=
-               "DESCRIPTION" value (description DisplayString)
-               | empty
-    ReferPart ::=
-               "REFERENCE" value (reference DisplayString)
-               | empty
-END
- 
-
-END
diff --git a/ldap/servers/snmp/RFC1155-SMI.txt b/ldap/servers/snmp/RFC1155-SMI.txt
deleted file mode 100644
index 3abc7ff..0000000
--- a/ldap/servers/snmp/RFC1155-SMI.txt
+++ /dev/null
@@ -1,119 +0,0 @@
-RFC1155-SMI DEFINITIONS ::= BEGIN
-
-EXPORTS -- EVERYTHING
-        internet, directory, mgmt,
-        experimental, private, enterprises,
-        OBJECT-TYPE, ObjectName, ObjectSyntax, SimpleSyntax,
-        ApplicationSyntax, NetworkAddress, IpAddress,
-        Counter, Gauge, TimeTicks, Opaque;
-
- -- the path to the root
-
- internet      OBJECT IDENTIFIER ::= { iso org(3) dod(6) 1 }
-
- directory     OBJECT IDENTIFIER ::= { internet 1 }
-
- mgmt          OBJECT IDENTIFIER ::= { internet 2 }
-
- experimental  OBJECT IDENTIFIER ::= { internet 3 }
-
- private       OBJECT IDENTIFIER ::= { internet 4 }
- enterprises   OBJECT IDENTIFIER ::= { private 1 }
-
- -- definition of object types
-
- OBJECT-TYPE MACRO ::=
- BEGIN
-     TYPE NOTATION ::= "SYNTAX" type (TYPE ObjectSyntax)
-                       "ACCESS" Access
-                       "STATUS" Status
-     VALUE NOTATION ::= value (VALUE ObjectName)
-
-     Access ::= "read-only"
-                     | "read-write"
-                     | "write-only"
-                     | "not-accessible"
-     Status ::= "mandatory"
-                     | "optional"
-                     | "obsolete"
- END
-
-    -- names of objects in the MIB
-
-    ObjectName ::=
-        OBJECT IDENTIFIER
-
-    -- syntax of objects in the MIB
-
-    ObjectSyntax ::=
-        CHOICE {
-            simple
-                SimpleSyntax,
-    -- note that simple SEQUENCEs are not directly
-    -- mentioned here to keep things simple (i.e.,
-    -- prevent mis-use).  However, application-wide
-    -- types which are IMPLICITly encoded simple
-    -- SEQUENCEs may appear in the following CHOICE
-
-            application-wide
-                ApplicationSyntax
-        }
-
-       SimpleSyntax ::=
-           CHOICE {
-               number
-                   INTEGER,
-               string
-                   OCTET STRING,
-               object
-                   OBJECT IDENTIFIER,
-               empty
-                   NULL
-           }
-
-       ApplicationSyntax ::=
-           CHOICE {
-               address
-                   NetworkAddress,
-               counter
-                   Counter,
-               gauge
-                   Gauge,
-               ticks
-                   TimeTicks,
-               arbitrary
-                   Opaque
-
-       -- other application-wide types, as they are
-       -- defined, will be added here
-           }
-
-       -- application-wide types
-
-       NetworkAddress ::=
-           CHOICE {
-               internet
-                   IpAddress
-           }
-
-       IpAddress ::=
-           [APPLICATION 0]          -- in network-byte order
-               IMPLICIT OCTET STRING (SIZE (4))
-
-       Counter ::=
-           [APPLICATION 1]
-               IMPLICIT INTEGER (0..4294967295)
-
-       Gauge ::=
-           [APPLICATION 2]
-               IMPLICIT INTEGER (0..4294967295)
-
-       TimeTicks ::=
-           [APPLICATION 3]
-               IMPLICIT INTEGER (0..4294967295)
-
-       Opaque ::=
-           [APPLICATION 4]          -- arbitrary ASN.1 value,
-               IMPLICIT OCTET STRING   --   "double-wrapped"
-
-       END
diff --git a/ldap/servers/snmp/SNMPv2-CONF.txt b/ldap/servers/snmp/SNMPv2-CONF.txt
deleted file mode 100644
index 24a1eed..0000000
--- a/ldap/servers/snmp/SNMPv2-CONF.txt
+++ /dev/null
@@ -1,322 +0,0 @@
-SNMPv2-CONF DEFINITIONS ::= BEGIN
-
-IMPORTS ObjectName, NotificationName, ObjectSyntax
-                                               FROM SNMPv2-SMI;
-
--- definitions for conformance groups
-
-OBJECT-GROUP MACRO ::=
-BEGIN
-    TYPE NOTATION ::=
-                  ObjectsPart
-                  "STATUS" Status
-                  "DESCRIPTION" Text
-                  ReferPart
-
-    VALUE NOTATION ::=
-                  value(VALUE OBJECT IDENTIFIER)
-
-    ObjectsPart ::=
-                  "OBJECTS" "{" Objects "}"
-    Objects ::=
-                  Object
-                | Objects "," Object
-    Object ::=
-
-                  value(ObjectName)
-
-    Status ::=
-                  "current"
-                | "deprecated"
-                | "obsolete"
-
-    ReferPart ::=
-                  "REFERENCE" Text
-                | empty
-
-    -- a character string as defined in [2]
-    Text ::= value(IA5String)
-END
-
--- more definitions for conformance groups
-
-NOTIFICATION-GROUP MACRO ::=
-BEGIN
-    TYPE NOTATION ::=
-                  NotificationsPart
-                  "STATUS" Status
-                  "DESCRIPTION" Text
-                  ReferPart
-
-    VALUE NOTATION ::=
-                  value(VALUE OBJECT IDENTIFIER)
-
-    NotificationsPart ::=
-                  "NOTIFICATIONS" "{" Notifications "}"
-    Notifications ::=
-                  Notification
-                | Notifications "," Notification
-    Notification ::=
-                  value(NotificationName)
-
-    Status ::=
-                  "current"
-                | "deprecated"
-                | "obsolete"
-
-    ReferPart ::=
-                  "REFERENCE" Text
-                | empty
-
-    -- a character string as defined in [2]
-    Text ::= value(IA5String)
-END
-
--- definitions for compliance statements
-
-MODULE-COMPLIANCE MACRO ::=
-BEGIN
-    TYPE NOTATION ::=
-                  "STATUS" Status
-                  "DESCRIPTION" Text
-                  ReferPart
-                  ModulePart
-
-    VALUE NOTATION ::=
-                  value(VALUE OBJECT IDENTIFIER)
-
-    Status ::=
-                  "current"
-                | "deprecated"
-                | "obsolete"
-
-    ReferPart ::=
-                  "REFERENCE" Text
-                | empty
-
-    ModulePart ::=
-                  Modules
-    Modules ::=
-                  Module
-                | Modules Module
-    Module ::=
-                  -- name of module --
-                  "MODULE" ModuleName
-                  MandatoryPart
-                  CompliancePart
-
-    ModuleName ::=
-                  -- identifier must start with uppercase letter
-                  identifier ModuleIdentifier
-                  -- must not be empty unless contained
-                  -- in MIB Module
-                | empty
-    ModuleIdentifier ::=
-                  value(OBJECT IDENTIFIER)
-                | empty
-
-    MandatoryPart ::=
-                  "MANDATORY-GROUPS" "{" Groups "}"
-                | empty
-
-    Groups ::=
-
-                  Group
-                | Groups "," Group
-    Group ::=
-                  value(OBJECT IDENTIFIER)
-
-    CompliancePart ::=
-                  Compliances
-                | empty
-
-    Compliances ::=
-                  Compliance
-                | Compliances Compliance
-    Compliance ::=
-                  ComplianceGroup
-                | Object
-
-    ComplianceGroup ::=
-                  "GROUP" value(OBJECT IDENTIFIER)
-                  "DESCRIPTION" Text
-
-    Object ::=
-                  "OBJECT" value(ObjectName)
-                  SyntaxPart
-                  WriteSyntaxPart
-                  AccessPart
-                  "DESCRIPTION" Text
-
-    -- must be a refinement for object's SYNTAX clause
-    SyntaxPart ::= "SYNTAX" Syntax
-                | empty
-
-    -- must be a refinement for object's SYNTAX clause
-    WriteSyntaxPart ::= "WRITE-SYNTAX" Syntax
-                | empty
-
-    Syntax ::=    -- Must be one of the following:
-                       -- a base type (or its refinement),
-                       -- a textual convention (or its refinement), or
-                       -- a BITS pseudo-type
-                  type
-                | "BITS" "{" NamedBits "}"
-
-    NamedBits ::= NamedBit
-                | NamedBits "," NamedBit
-
-    NamedBit ::= identifier "(" number ")" -- number is nonnegative
-
-    AccessPart ::=
-                  "MIN-ACCESS" Access
-                | empty
-    Access ::=
-                  "not-accessible"
-                | "accessible-for-notify"
-                | "read-only"
-                | "read-write"
-                | "read-create"
-
-    -- a character string as defined in [2]
-    Text ::= value(IA5String)
-END
-
--- definitions for capabilities statements
-
-AGENT-CAPABILITIES MACRO ::=
-BEGIN
-    TYPE NOTATION ::=
-                  "PRODUCT-RELEASE" Text
-                  "STATUS" Status
-                  "DESCRIPTION" Text
-                  ReferPart
-                  ModulePart
-
-    VALUE NOTATION ::=
-                  value(VALUE OBJECT IDENTIFIER)
-
-    Status ::=
-                  "current"
-                | "obsolete"
-
-    ReferPart ::=
-                  "REFERENCE" Text
-                | empty
-
-    ModulePart ::=
-                  Modules
-                | empty
-    Modules ::=
-                  Module
-                | Modules Module
-    Module ::=
-                  -- name of module --
-                  "SUPPORTS" ModuleName
-                  "INCLUDES" "{" Groups "}"
-                  VariationPart
-
-    ModuleName ::=
-
-                  -- identifier must start with uppercase letter
-                  identifier ModuleIdentifier
-    ModuleIdentifier ::=
-                  value(OBJECT IDENTIFIER)
-                | empty
-
-    Groups ::=
-                  Group
-                | Groups "," Group
-    Group ::=
-                  value(OBJECT IDENTIFIER)
-
-    VariationPart ::=
-                  Variations
-                | empty
-    Variations ::=
-                  Variation
-                | Variations Variation
-
-    Variation ::=
-                  ObjectVariation
-                | NotificationVariation
-
-    NotificationVariation ::=
-                  "VARIATION" value(NotificationName)
-                  AccessPart
-                  "DESCRIPTION" Text
-
-    ObjectVariation ::=
-                  "VARIATION" value(ObjectName)
-                  SyntaxPart
-                  WriteSyntaxPart
-                  AccessPart
-                  CreationPart
-                  DefValPart
-                  "DESCRIPTION" Text
-
-    -- must be a refinement for object's SYNTAX clause
-    SyntaxPart ::= "SYNTAX" Syntax
-                | empty
-
-    WriteSyntaxPart ::= "WRITE-SYNTAX" Syntax
-                | empty
-
-    Syntax ::=    -- Must be one of the following:
-                       -- a base type (or its refinement),
-                       -- a textual convention (or its refinement), or
-                       -- a BITS pseudo-type
-
-                  type
-                | "BITS" "{" NamedBits "}"
-
-    NamedBits ::= NamedBit
-                | NamedBits "," NamedBit
-
-    NamedBit ::= identifier "(" number ")" -- number is nonnegative
-
-    AccessPart ::=
-                  "ACCESS" Access
-                | empty
-
-    Access ::=
-                  "not-implemented"
-                -- only "not-implemented" for notifications
-                | "accessible-for-notify"
-                | "read-only"
-                | "read-write"
-                | "read-create"
-                -- following is for backward-compatibility only
-                | "write-only"
-
-    CreationPart ::=
-                  "CREATION-REQUIRES" "{" Cells "}"
-                | empty
-    Cells ::=
-                  Cell
-                | Cells "," Cell
-    Cell ::=
-                  value(ObjectName)
-
-    DefValPart ::= "DEFVAL" "{" Defvalue "}"
-                | empty
-
-    Defvalue ::=  -- must be valid for the object's syntax
-                  -- in this macro's SYNTAX clause, if present,
-                  -- or if not, in object's OBJECT-TYPE macro
-                  value(ObjectSyntax)
-                | "{" BitsValue "}"
-
-    BitsValue ::= BitNames
-                | empty
-
-    BitNames ::=  BitName
-                | BitNames "," BitName
-
-    BitName ::= identifier
-
-    -- a character string as defined in [2]
-    Text ::= value(IA5String)
-END
-
-END
diff --git a/ldap/servers/snmp/SNMPv2-SMI.txt b/ldap/servers/snmp/SNMPv2-SMI.txt
deleted file mode 100644
index 1c01e1d..0000000
--- a/ldap/servers/snmp/SNMPv2-SMI.txt
+++ /dev/null
@@ -1,344 +0,0 @@
-SNMPv2-SMI DEFINITIONS ::= BEGIN
-
--- the path to the root
-
-org            OBJECT IDENTIFIER ::= { iso 3 }  --  "iso" = 1
-dod            OBJECT IDENTIFIER ::= { org 6 }
-internet       OBJECT IDENTIFIER ::= { dod 1 }
-
-directory      OBJECT IDENTIFIER ::= { internet 1 }
-
-mgmt           OBJECT IDENTIFIER ::= { internet 2 }
-mib-2          OBJECT IDENTIFIER ::= { mgmt 1 }
-transmission   OBJECT IDENTIFIER ::= { mib-2 10 }
-
-experimental   OBJECT IDENTIFIER ::= { internet 3 }
-
-private        OBJECT IDENTIFIER ::= { internet 4 }
-enterprises    OBJECT IDENTIFIER ::= { private 1 }
-
-security       OBJECT IDENTIFIER ::= { internet 5 }
-
-snmpV2         OBJECT IDENTIFIER ::= { internet 6 }
-
--- transport domains
-snmpDomains    OBJECT IDENTIFIER ::= { snmpV2 1 }
-
--- transport proxies
-snmpProxys     OBJECT IDENTIFIER ::= { snmpV2 2 }
-
--- module identities
-snmpModules    OBJECT IDENTIFIER ::= { snmpV2 3 }
-
--- Extended UTCTime, to allow dates with four-digit years
--- (Note that this definition of ExtUTCTime is not to be IMPORTed
---  by MIB modules.)
-ExtUTCTime ::= OCTET STRING(SIZE(11 | 13))
-    -- format is YYMMDDHHMMZ or YYYYMMDDHHMMZ
-
-    --   where: YY   - last two digits of year (only years
-    --                 between 1900-1999)
-    --          YYYY - last four digits of the year (any year)
-    --          MM   - month (01 through 12)
-    --          DD   - day of month (01 through 31)
-    --          HH   - hours (00 through 23)
-    --          MM   - minutes (00 through 59)
-    --          Z    - denotes GMT (the ASCII character Z)
-    --
-    -- For example, "9502192015Z" and "199502192015Z" represent
-    -- 8:15pm GMT on 19 February 1995. Years after 1999 must use
-    -- the four digit year format. Years 1900-1999 may use the
-    -- two or four digit format.
-
--- definitions for information modules
-
-MODULE-IDENTITY MACRO ::=
-BEGIN
-    TYPE NOTATION ::=
-                  "LAST-UPDATED" value(Update ExtUTCTime)
-                  "ORGANIZATION" Text
-                  "CONTACT-INFO" Text
-                  "DESCRIPTION" Text
-                  RevisionPart
-
-    VALUE NOTATION ::=
-                  value(VALUE OBJECT IDENTIFIER)
-
-    RevisionPart ::=
-                  Revisions
-                | empty
-    Revisions ::=
-                  Revision
-                | Revisions Revision
-    Revision ::=
-                  "REVISION" value(Update ExtUTCTime)
-                  "DESCRIPTION" Text
-
-    -- a character string as defined in section 3.1.1
-    Text ::= value(IA5String)
-END
-
-OBJECT-IDENTITY MACRO ::=
-BEGIN
-    TYPE NOTATION ::=
-                  "STATUS" Status
-                  "DESCRIPTION" Text
-
-                  ReferPart
-
-    VALUE NOTATION ::=
-                  value(VALUE OBJECT IDENTIFIER)
-
-    Status ::=
-                  "current"
-                | "deprecated"
-                | "obsolete"
-
-    ReferPart ::=
-                  "REFERENCE" Text
-                | empty
-
-    -- a character string as defined in section 3.1.1
-    Text ::= value(IA5String)
-END
-
--- names of objects
--- (Note that these definitions of ObjectName and NotificationName
---  are not to be IMPORTed by MIB modules.)
-
-ObjectName ::=
-    OBJECT IDENTIFIER
-
-NotificationName ::=
-    OBJECT IDENTIFIER
-
--- syntax of objects
-
--- the "base types" defined here are:
---   3 built-in ASN.1 types: INTEGER, OCTET STRING, OBJECT IDENTIFIER
---   8 application-defined types: Integer32, IpAddress, Counter32,
---              Gauge32, Unsigned32, TimeTicks, Opaque, and Counter64
-
-ObjectSyntax ::=
-    CHOICE {
-        simple
-            SimpleSyntax,
-          -- note that SEQUENCEs for conceptual tables and
-          -- rows are not mentioned here...
-
-        application-wide
-            ApplicationSyntax
-    }
-
--- built-in ASN.1 types
-
-SimpleSyntax ::=
-    CHOICE {
-        -- INTEGERs with a more restrictive range
-        -- may also be used
-        integer-value               -- includes Integer32
-            INTEGER (-2147483648..2147483647),
-        -- OCTET STRINGs with a more restrictive size
-        -- may also be used
-        string-value
-            OCTET STRING (SIZE (0..65535)),
-        objectID-value
-            OBJECT IDENTIFIER
-    }
-
--- indistinguishable from INTEGER, but never needs more than
--- 32-bits for a two's complement representation
-Integer32 ::=
-        INTEGER (-2147483648..2147483647)
-
--- application-wide types
-
-ApplicationSyntax ::=
-    CHOICE {
-        ipAddress-value
-            IpAddress,
-        counter-value
-            Counter32,
-        timeticks-value
-            TimeTicks,
-        arbitrary-value
-            Opaque,
-        big-counter-value
-            Counter64,
-        unsigned-integer-value  -- includes Gauge32
-            Unsigned32
-    }
-
--- in network-byte order
-
--- (this is a tagged type for historical reasons)
-IpAddress ::=
-    [APPLICATION 0]
-        IMPLICIT OCTET STRING (SIZE (4))
-
--- this wraps
-Counter32 ::=
-    [APPLICATION 1]
-        IMPLICIT INTEGER (0..4294967295)
-
--- this doesn't wrap
-Gauge32 ::=
-    [APPLICATION 2]
-        IMPLICIT INTEGER (0..4294967295)
-
--- an unsigned 32-bit quantity
--- indistinguishable from Gauge32
-Unsigned32 ::=
-    [APPLICATION 2]
-        IMPLICIT INTEGER (0..4294967295)
-
--- hundredths of seconds since an epoch
-TimeTicks ::=
-    [APPLICATION 3]
-        IMPLICIT INTEGER (0..4294967295)
-
--- for backward-compatibility only
-Opaque ::=
-    [APPLICATION 4]
-        IMPLICIT OCTET STRING
-
--- for counters that wrap in less than one hour with only 32 bits
-Counter64 ::=
-    [APPLICATION 6]
-        IMPLICIT INTEGER (0..18446744073709551615)
-
--- definition for objects
-
-OBJECT-TYPE MACRO ::=
-BEGIN
-    TYPE NOTATION ::=
-                  "SYNTAX" Syntax
-                  UnitsPart
-                  "MAX-ACCESS" Access
-                  "STATUS" Status
-                  "DESCRIPTION" Text
-                  ReferPart
-
-                  IndexPart
-                  DefValPart
-
-    VALUE NOTATION ::=
-                  value(VALUE ObjectName)
-
-    Syntax ::=   -- Must be one of the following:
-                       -- a base type (or its refinement),
-                       -- a textual convention (or its refinement), or
-                       -- a BITS pseudo-type
-                   type
-                | "BITS" "{" NamedBits "}"
-
-    NamedBits ::= NamedBit
-                | NamedBits "," NamedBit
-
-    NamedBit ::=  identifier "(" number ")" -- number is nonnegative
-
-    UnitsPart ::=
-                  "UNITS" Text
-                | empty
-
-    Access ::=
-                  "not-accessible"
-                | "accessible-for-notify"
-                | "read-only"
-                | "read-write"
-                | "read-create"
-
-    Status ::=
-                  "current"
-                | "deprecated"
-                | "obsolete"
-
-    ReferPart ::=
-                  "REFERENCE" Text
-                | empty
-
-    IndexPart ::=
-                  "INDEX"    "{" IndexTypes "}"
-                | "AUGMENTS" "{" Entry      "}"
-                | empty
-    IndexTypes ::=
-                  IndexType
-                | IndexTypes "," IndexType
-    IndexType ::=
-                  "IMPLIED" Index
-                | Index
-
-    Index ::=
-                    -- use the SYNTAX value of the
-                    -- correspondent OBJECT-TYPE invocation
-                  value(ObjectName)
-    Entry ::=
-                    -- use the INDEX value of the
-                    -- correspondent OBJECT-TYPE invocation
-                  value(ObjectName)
-
-    DefValPart ::= "DEFVAL" "{" Defvalue "}"
-                | empty
-
-    Defvalue ::=  -- must be valid for the type specified in
-                  -- SYNTAX clause of same OBJECT-TYPE macro
-                  value(ObjectSyntax)
-                | "{" BitsValue "}"
-
-    BitsValue ::= BitNames
-                | empty
-
-    BitNames ::=  BitName
-                | BitNames "," BitName
-
-    BitName ::= identifier
-
-    -- a character string as defined in section 3.1.1
-    Text ::= value(IA5String)
-END
-
--- definitions for notifications
-
-NOTIFICATION-TYPE MACRO ::=
-BEGIN
-    TYPE NOTATION ::=
-                  ObjectsPart
-                  "STATUS" Status
-                  "DESCRIPTION" Text
-                  ReferPart
-
-    VALUE NOTATION ::=
-                  value(VALUE NotificationName)
-
-    ObjectsPart ::=
-                  "OBJECTS" "{" Objects "}"
-                | empty
-    Objects ::=
-                  Object
-
-                | Objects "," Object
-    Object ::=
-                  value(ObjectName)
-
-    Status ::=
-                  "current"
-                | "deprecated"
-                | "obsolete"
-
-    ReferPart ::=
-                  "REFERENCE" Text
-                | empty
-
-    -- a character string as defined in section 3.1.1
-    Text ::= value(IA5String)
-END
-
--- definitions of administrative identifiers
-
-zeroDotZero    OBJECT-IDENTITY
-    STATUS     current
-    DESCRIPTION
-            "A value used for null identifiers."
-    ::= { 0 0 }
-
-END
diff --git a/ldap/servers/snmp/SNMPv2-TC.txt b/ldap/servers/snmp/SNMPv2-TC.txt
deleted file mode 100644
index 860bf71..0000000
--- a/ldap/servers/snmp/SNMPv2-TC.txt
+++ /dev/null
@@ -1,772 +0,0 @@
-SNMPv2-TC DEFINITIONS ::= BEGIN
-
-IMPORTS
-    TimeTicks         FROM SNMPv2-SMI;
-
--- definition of textual conventions
-
-TEXTUAL-CONVENTION MACRO ::=
-
-BEGIN
-    TYPE NOTATION ::=
-                  DisplayPart
-                  "STATUS" Status
-                  "DESCRIPTION" Text
-                  ReferPart
-                  "SYNTAX" Syntax
-
-    VALUE NOTATION ::=
-                   value(VALUE Syntax)      -- adapted ASN.1
-
-    DisplayPart ::=
-                  "DISPLAY-HINT" Text
-                | empty
-
-    Status ::=
-                  "current"
-                | "deprecated"
-                | "obsolete"
-
-    ReferPart ::=
-                  "REFERENCE" Text
-                | empty
-
-    -- a character string as defined in [2]
-    Text ::= value(IA5String)
-
-    Syntax ::=   -- Must be one of the following:
-                       -- a base type (or its refinement), or
-                       -- a BITS pseudo-type
-                  type
-                | "BITS" "{" NamedBits "}"
-
-    NamedBits ::= NamedBit
-                | NamedBits "," NamedBit
-
-    NamedBit ::=  identifier "(" number ")" -- number is nonnegative
-
-END
-
-DisplayString ::= TEXTUAL-CONVENTION
-    DISPLAY-HINT "255a"
-    STATUS       current
-    DESCRIPTION
-            "Represents textual information taken from the NVT ASCII
-
-            character set, as defined in pages 4, 10-11 of RFC 854.
-
-            To summarize RFC 854, the NVT ASCII repertoire specifies:
-
-              - the use of character codes 0-127 (decimal)
-
-              - the graphics characters (32-126) are interpreted as
-                US ASCII
-
-              - NUL, LF, CR, BEL, BS, HT, VT and FF have the special
-                meanings specified in RFC 854
-
-              - the other 25 codes have no standard interpretation
-
-              - the sequence 'CR LF' means newline
-
-              - the sequence 'CR NUL' means carriage-return
-
-              - an 'LF' not preceded by a 'CR' means moving to the
-                same column on the next line.
-
-              - the sequence 'CR x' for any x other than LF or NUL is
-                illegal.  (Note that this also means that a string may
-                end with either 'CR LF' or 'CR NUL', but not with CR.)
-
-            Any object defined using this syntax may not exceed 255
-            characters in length."
-    SYNTAX       OCTET STRING (SIZE (0..255))
-
-PhysAddress ::= TEXTUAL-CONVENTION
-    DISPLAY-HINT "1x:"
-    STATUS       current
-    DESCRIPTION
-            "Represents media- or physical-level addresses."
-    SYNTAX       OCTET STRING
-
-MacAddress ::= TEXTUAL-CONVENTION
-    DISPLAY-HINT "1x:"
-    STATUS       current
-    DESCRIPTION
-            "Represents an 802 MAC address represented in the
-            `canonical' order defined by IEEE 802.1a, i.e., as if it
-            were transmitted least significant bit first, even though
-            802.5 (in contrast to other 802.x protocols) requires MAC
-            addresses to be transmitted most significant bit first."
-    SYNTAX       OCTET STRING (SIZE (6))
-
-TruthValue ::= TEXTUAL-CONVENTION
-    STATUS       current
-    DESCRIPTION
-            "Represents a boolean value."
-    SYNTAX       INTEGER { true(1), false(2) }
-
-TestAndIncr ::= TEXTUAL-CONVENTION
-    STATUS       current
-    DESCRIPTION
-            "Represents integer-valued information used for atomic
-            operations.  When the management protocol is used to specify
-            that an object instance having this syntax is to be
-            modified, the new value supplied via the management protocol
-            must precisely match the value presently held by the
-            instance.  If not, the management protocol set operation
-            fails with an error of `inconsistentValue'.  Otherwise, if
-            the current value is the maximum value of 2^31-1 (2147483647
-            decimal), then the value held by the instance is wrapped to
-            zero; otherwise, the value held by the instance is
-            incremented by one.  (Note that regardless of whether the
-            management protocol set operation succeeds, the variable-
-            binding in the request and response PDUs are identical.)
-
-            The value of the ACCESS clause for objects having this
-            syntax is either `read-write' or `read-create'.  When an
-            instance of a columnar object having this syntax is created,
-            any value may be supplied via the management protocol.
-
-            When the network management portion of the system is re-
-            initialized, the value of every object instance having this
-            syntax must either be incremented from its value prior to
-            the re-initialization, or (if the value prior to the re-
-            initialization is unknown) be set to a pseudo-randomly
-            generated value."
-    SYNTAX       INTEGER (0..2147483647)
-
-AutonomousType ::= TEXTUAL-CONVENTION
-    STATUS       current
-    DESCRIPTION
-            "Represents an independently extensible type identification
-            value.  It may, for example, indicate a particular sub-tree
-            with further MIB definitions, or define a particular type of
-            protocol or hardware."
-    SYNTAX       OBJECT IDENTIFIER
-
-InstancePointer ::= TEXTUAL-CONVENTION
-    STATUS       obsolete
-    DESCRIPTION
-            "A pointer to either a specific instance of a MIB object or
-            a conceptual row of a MIB table in the managed device.  In
-            the latter case, by convention, it is the name of the
-            particular instance of the first accessible columnar object
-            in the conceptual row.
-
-            The two uses of this textual convention are replaced by
-            VariablePointer and RowPointer, respectively."
-    SYNTAX       OBJECT IDENTIFIER
-
-VariablePointer ::= TEXTUAL-CONVENTION
-    STATUS       current
-    DESCRIPTION
-            "A pointer to a specific object instance.  For example,
-            sysContact.0 or ifInOctets.3."
-    SYNTAX       OBJECT IDENTIFIER
-
-RowPointer ::= TEXTUAL-CONVENTION
-    STATUS       current
-    DESCRIPTION
-            "Represents a pointer to a conceptual row.  The value is the
-            name of the instance of the first accessible columnar object
-            in the conceptual row.
-
-            For example, ifIndex.3 would point to the 3rd row in the
-            ifTable (note that if ifIndex were not-accessible, then
-            ifDescr.3 would be used instead)."
-    SYNTAX       OBJECT IDENTIFIER
-
-RowStatus ::= TEXTUAL-CONVENTION
-    STATUS       current
-    DESCRIPTION
-            "The RowStatus textual convention is used to manage the
-            creation and deletion of conceptual rows, and is used as the
-            value of the SYNTAX clause for the status column of a
-            conceptual row (as described in Section 7.7.1 of [2].)
-
-            The status column has six defined values:
-
-                 - `active', which indicates that the conceptual row is
-                 available for use by the managed device;
-
-                 - `notInService', which indicates that the conceptual
-                 row exists in the agent, but is unavailable for use by
-                 the managed device (see NOTE below); 'notInService' has
-                 no implication regarding the internal consistency of
-                 the row, availability of resources, or consistency with
-                 the current state of the managed device;
-
-                 - `notReady', which indicates that the conceptual row
-                 exists in the agent, but is missing information
-                 necessary in order to be available for use by the
-                 managed device (i.e., one or more required columns in
-                 the conceptual row have not been instanciated);
-
-                 - `createAndGo', which is supplied by a management
-                 station wishing to create a new instance of a
-                 conceptual row and to have its status automatically set
-                 to active, making it available for use by the managed
-                 device;
-
-                 - `createAndWait', which is supplied by a management
-                 station wishing to create a new instance of a
-                 conceptual row (but not make it available for use by
-                 the managed device); and,
-                 - `destroy', which is supplied by a management station
-                 wishing to delete all of the instances associated with
-                 an existing conceptual row.
-
-            Whereas five of the six values (all except `notReady') may
-            be specified in a management protocol set operation, only
-            three values will be returned in response to a management
-            protocol retrieval operation:  `notReady', `notInService' or
-            `active'.  That is, when queried, an existing conceptual row
-            has only three states:  it is either available for use by
-            the managed device (the status column has value `active');
-            it is not available for use by the managed device, though
-            the agent has sufficient information to attempt to make it
-            so (the status column has value `notInService'); or, it is
-            not available for use by the managed device, and an attempt
-            to make it so would fail because the agent has insufficient
-            information (the state column has value `notReady').
-
-                                     NOTE WELL
-
-                 This textual convention may be used for a MIB table,
-                 irrespective of whether the values of that table's
-                 conceptual rows are able to be modified while it is
-                 active, or whether its conceptual rows must be taken
-                 out of service in order to be modified.  That is, it is
-                 the responsibility of the DESCRIPTION clause of the
-                 status column to specify whether the status column must
-                 not be `active' in order for the value of some other
-                 column of the same conceptual row to be modified.  If
-                 such a specification is made, affected columns may be
-                 changed by an SNMP set PDU if the RowStatus would not
-                 be equal to `active' either immediately before or after
-                 processing the PDU.  In other words, if the PDU also
-                 contained a varbind that would change the RowStatus
-                 value, the column in question may be changed if the
-                 RowStatus was not equal to `active' as the PDU was
-                 received, or if the varbind sets the status to a value
-                 other than 'active'.
-
-            Also note that whenever any elements of a row exist, the
-            RowStatus column must also exist.
-
-            To summarize the effect of having a conceptual row with a
-            status column having a SYNTAX clause value of RowStatus,
-            consider the following state diagram:
-
-                                         STATE
-              +--------------+-----------+-------------+-------------
-              |      A       |     B     |      C      |      D
-              |              |status col.|status column|
-              |status column |    is     |      is     |status column
-    ACTION    |does not exist|  notReady | notInService|  is active
---------------+--------------+-----------+-------------+-------------
-set status    |noError    ->D|inconsist- |inconsistent-|inconsistent-
-column to     |       or     |   entValue|        Value|        Value
-createAndGo   |inconsistent- |           |             |
-              |         Value|           |             |
---------------+--------------+-----------+-------------+-------------
-set status    |noError  see 1|inconsist- |inconsistent-|inconsistent-
-column to     |       or     |   entValue|        Value|        Value
-createAndWait |wrongValue    |           |             |
---------------+--------------+-----------+-------------+-------------
-set status    |inconsistent- |inconsist- |noError      |noError
-column to     |         Value|   entValue|             |
-active        |              |           |             |
-              |              |     or    |             |
-              |              |           |             |
-              |              |see 2   ->D|see 8     ->D|          ->D
---------------+--------------+-----------+-------------+-------------
-set status    |inconsistent- |inconsist- |noError      |noError   ->C
-column to     |         Value|   entValue|             |
-notInService  |              |           |             |
-              |              |     or    |             |      or
-              |              |           |             |
-              |              |see 3   ->C|          ->C|see 6
---------------+--------------+-----------+-------------+-------------
-set status    |noError       |noError    |noError      |noError   ->A
-column to     |              |           |             |      or
-destroy       |           ->A|        ->A|          ->A|see 7
---------------+--------------+-----------+-------------+-------------
-set any other |see 4         |noError    |noError      |see 5
-column to some|              |           |             |
-value         |              |      see 1|          ->C|          ->D
---------------+--------------+-----------+-------------+-------------
-
-            (1) goto B or C, depending on information available to the
-            agent.
-
-            (2) if other variable bindings included in the same PDU,
-            provide values for all columns which are missing but
-            required, and all columns have acceptable values, then
-            return noError and goto D.
-
-            (3) if other variable bindings included in the same PDU,
-            provide legal values for all columns which are missing but
-            required, then return noError and goto C.
-
-            (4) at the discretion of the agent, the return value may be
-            either:
-
-                 inconsistentName:  because the agent does not choose to
-                 create such an instance when the corresponding
-                 RowStatus instance does not exist, or
-
-                 inconsistentValue:  if the supplied value is
-                 inconsistent with the state of some other MIB object's
-                 value, or
-
-                 noError: because the agent chooses to create the
-                 instance.
-
-            If noError is returned, then the instance of the status
-            column must also be created, and the new state is B or C,
-            depending on the information available to the agent.  If
-            inconsistentName or inconsistentValue is returned, the row
-            remains in state A.
-
-            (5) depending on the MIB definition for the column/table,
-            either noError or inconsistentValue may be returned.
-
-            (6) the return value can indicate one of the following
-            errors:
-
-                 wrongValue: because the agent does not support
-                 notInService (e.g., an agent which does not support
-                 createAndWait), or
-
-                 inconsistentValue: because the agent is unable to take
-                 the row out of service at this time, perhaps because it
-                 is in use and cannot be de-activated.
-
-            (7) the return value can indicate the following error:
-
-                 inconsistentValue: because the agent is unable to
-                 remove the row at this time, perhaps because it is in
-                 use and cannot be de-activated.
-
-            (8) the transition to D can fail, e.g., if the values of the
-            conceptual row are inconsistent, then the error code would
-            be inconsistentValue.
-
-            NOTE: Other processing of (this and other varbinds of) the
-            set request may result in a response other than noError
-            being returned, e.g., wrongValue, noCreation, etc.
-
-                              Conceptual Row Creation
-
-            There are four potential interactions when creating a
-            conceptual row:  selecting an instance-identifier which is
-            not in use; creating the conceptual row; initializing any
-            objects for which the agent does not supply a default; and,
-            making the conceptual row available for use by the managed
-            device.
-
-            Interaction 1: Selecting an Instance-Identifier
-
-            The algorithm used to select an instance-identifier varies
-            for each conceptual row.  In some cases, the instance-
-            identifier is semantically significant, e.g., the
-            destination address of a route, and a management station
-            selects the instance-identifier according to the semantics.
-
-            In other cases, the instance-identifier is used solely to
-            distinguish conceptual rows, and a management station
-            without specific knowledge of the conceptual row might
-            examine the instances present in order to determine an
-            unused instance-identifier.  (This approach may be used, but
-            it is often highly sub-optimal; however, it is also a
-            questionable practice for a naive management station to
-            attempt conceptual row creation.)
-
-            Alternately, the MIB module which defines the conceptual row
-            might provide one or more objects which provide assistance
-            in determining an unused instance-identifier.  For example,
-            if the conceptual row is indexed by an integer-value, then
-            an object having an integer-valued SYNTAX clause might be
-            defined for such a purpose, allowing a management station to
-            issue a management protocol retrieval operation.  In order
-            to avoid unnecessary collisions between competing management
-            stations, `adjacent' retrievals of this object should be
-            different.
-
-            Finally, the management station could select a pseudo-random
-            number to use as the index.  In the event that this index
-
-            was already in use and an inconsistentValue was returned in
-            response to the management protocol set operation, the
-            management station should simply select a new pseudo-random
-            number and retry the operation.
-
-            A MIB designer should choose between the two latter
-            algorithms based on the size of the table (and therefore the
-            efficiency of each algorithm).  For tables in which a large
-            number of entries are expected, it is recommended that a MIB
-            object be defined that returns an acceptable index for
-            creation.  For tables with small numbers of entries, it is
-            recommended that the latter pseudo-random index mechanism be
-            used.
-
-            Interaction 2: Creating the Conceptual Row
-
-            Once an unused instance-identifier has been selected, the
-            management station determines if it wishes to create and
-            activate the conceptual row in one transaction or in a
-            negotiated set of interactions.
-
-            Interaction 2a: Creating and Activating the Conceptual Row
-
-            The management station must first determine the column
-            requirements, i.e., it must determine those columns for
-            which it must or must not provide values.  Depending on the
-            complexity of the table and the management station's
-            knowledge of the agent's capabilities, this determination
-            can be made locally by the management station.  Alternately,
-            the management station issues a management protocol get
-            operation to examine all columns in the conceptual row that
-            it wishes to create.  In response, for each column, there
-            are three possible outcomes:
-
-                 - a value is returned, indicating that some other
-                 management station has already created this conceptual
-                 row.  We return to interaction 1.
-
-                 - the exception `noSuchInstance' is returned,
-                 indicating that the agent implements the object-type
-                 associated with this column, and that this column in at
-                 least one conceptual row would be accessible in the MIB
-                 view used by the retrieval were it to exist. For those
-                 columns to which the agent provides read-create access,
-                 the `noSuchInstance' exception tells the management
-                 station that it should supply a value for this column
-                 when the conceptual row is to be created.
-
-                 - the exception `noSuchObject' is returned, indicating
-                 that the agent does not implement the object-type
-                 associated with this column or that there is no
-                 conceptual row for which this column would be
-                 accessible in the MIB view used by the retrieval.  As
-                 such, the management station can not issue any
-                 management protocol set operations to create an
-                 instance of this column.
-
-            Once the column requirements have been determined, a
-            management protocol set operation is accordingly issued.
-            This operation also sets the new instance of the status
-            column to `createAndGo'.
-
-            When the agent processes the set operation, it verifies that
-            it has sufficient information to make the conceptual row
-            available for use by the managed device.  The information
-            available to the agent is provided by two sources:  the
-            management protocol set operation which creates the
-            conceptual row, and, implementation-specific defaults
-            supplied by the agent (note that an agent must provide
-            implementation-specific defaults for at least those objects
-            which it implements as read-only).  If there is sufficient
-            information available, then the conceptual row is created, a
-            `noError' response is returned, the status column is set to
-            `active', and no further interactions are necessary (i.e.,
-            interactions 3 and 4 are skipped).  If there is insufficient
-            information, then the conceptual row is not created, and the
-            set operation fails with an error of `inconsistentValue'.
-            On this error, the management station can issue a management
-            protocol retrieval operation to determine if this was
-            because it failed to specify a value for a required column,
-            or, because the selected instance of the status column
-            already existed.  In the latter case, we return to
-            interaction 1.  In the former case, the management station
-            can re-issue the set operation with the additional
-            information, or begin interaction 2 again using
-            `createAndWait' in order to negotiate creation of the
-            conceptual row.
-
-                                     NOTE WELL
-
-                 Regardless of the method used to determine the column
-                 requirements, it is possible that the management
-                 station might deem a column necessary when, in fact,
-                 the agent will not allow that particular columnar
-                 instance to be created or written.  In this case, the
-                 management protocol set operation will fail with an
-                 error such as `noCreation' or `notWritable'.  In this
-                 case, the management station decides whether it needs
-                 to be able to set a value for that particular columnar
-                 instance.  If not, the management station re-issues the
-                 management protocol set operation, but without setting
-                 a value for that particular columnar instance;
-                 otherwise, the management station aborts the row
-                 creation algorithm.
-
-            Interaction 2b: Negotiating the Creation of the Conceptual
-            Row
-
-            The management station issues a management protocol set
-            operation which sets the desired instance of the status
-            column to `createAndWait'.  If the agent is unwilling to
-            process a request of this sort, the set operation fails with
-            an error of `wrongValue'.  (As a consequence, such an agent
-            must be prepared to accept a single management protocol set
-            operation, i.e., interaction 2a above, containing all of the
-            columns indicated by its column requirements.)  Otherwise,
-            the conceptual row is created, a `noError' response is
-            returned, and the status column is immediately set to either
-            `notInService' or `notReady', depending on whether it has
-            sufficient information to (attempt to) make the conceptual
-            row available for use by the managed device.  If there is
-            sufficient information available, then the status column is
-            set to `notInService'; otherwise, if there is insufficient
-            information, then the status column is set to `notReady'.
-            Regardless, we proceed to interaction 3.
-
-            Interaction 3: Initializing non-defaulted Objects
-
-            The management station must now determine the column
-            requirements.  It issues a management protocol get operation
-            to examine all columns in the created conceptual row.  In
-            the response, for each column, there are three possible
-            outcomes:
-
-                 - a value is returned, indicating that the agent
-                 implements the object-type associated with this column
-                 and had sufficient information to provide a value.  For
-                 those columns to which the agent provides read-create
-                 access (and for which the agent allows their values to
-                 be changed after their creation), a value return tells
-                 the management station that it may issue additional
-                 management protocol set operations, if it desires, in
-                 order to change the value associated with this column.
-
-                 - the exception `noSuchInstance' is returned,
-                 indicating that the agent implements the object-type
-                 associated with this column, and that this column in at
-                 least one conceptual row would be accessible in the MIB
-                 view used by the retrieval were it to exist. However,
-                 the agent does not have sufficient information to
-                 provide a value, and until a value is provided, the
-                 conceptual row may not be made available for use by the
-                 managed device.  For those columns to which the agent
-                 provides read-create access, the `noSuchInstance'
-                 exception tells the management station that it must
-                 issue additional management protocol set operations, in
-                 order to provide a value associated with this column.
-
-                 - the exception `noSuchObject' is returned, indicating
-                 that the agent does not implement the object-type
-                 associated with this column or that there is no
-                 conceptual row for which this column would be
-                 accessible in the MIB view used by the retrieval.  As
-                 such, the management station can not issue any
-                 management protocol set operations to create an
-                 instance of this column.
-
-            If the value associated with the status column is
-            `notReady', then the management station must first deal with
-            all `noSuchInstance' columns, if any.  Having done so, the
-            value of the status column becomes `notInService', and we
-            proceed to interaction 4.
-
-            Interaction 4: Making the Conceptual Row Available
-
-            Once the management station is satisfied with the values
-            associated with the columns of the conceptual row, it issues
-            a management protocol set operation to set the status column
-            to `active'.  If the agent has sufficient information to
-            make the conceptual row available for use by the managed
-            device, the management protocol set operation succeeds (a
-            `noError' response is returned).  Otherwise, the management
-            protocol set operation fails with an error of
-            `inconsistentValue'.
-
-                                     NOTE WELL
-
-                 A conceptual row having a status column with value
-                 `notInService' or `notReady' is unavailable to the
-                 managed device.  As such, it is possible for the
-                 managed device to create its own instances during the
-                 time between the management protocol set operation
-                 which sets the status column to `createAndWait' and the
-                 management protocol set operation which sets the status
-                 column to `active'.  In this case, when the management
-                 protocol set operation is issued to set the status
-                 column to `active', the values held in the agent
-                 supersede those used by the managed device.
-
-            If the management station is prevented from setting the
-            status column to `active' (e.g., due to management station
-            or network failure) the conceptual row will be left in the
-            `notInService' or `notReady' state, consuming resources
-            indefinitely.  The agent must detect conceptual rows that
-            have been in either state for an abnormally long period of
-            time and remove them.  It is the responsibility of the
-            DESCRIPTION clause of the status column to indicate what an
-            abnormally long period of time would be.  This period of
-            time should be long enough to allow for human response time
-            (including `think time') between the creation of the
-            conceptual row and the setting of the status to `active'.
-            In the absence of such information in the DESCRIPTION
-            clause, it is suggested that this period be approximately 5
-            minutes in length.  This removal action applies not only to
-            newly-created rows, but also to previously active rows which
-            are set to, and left in, the notInService state for a
-            prolonged period exceeding that which is considered normal
-            for such a conceptual row.
-
-                             Conceptual Row Suspension
-
-            When a conceptual row is `active', the management station
-            may issue a management protocol set operation which sets the
-            instance of the status column to `notInService'.  If the
-            agent is unwilling to do so, the set operation fails with an
-            error of `wrongValue' or `inconsistentValue'.  Otherwise,
-            the conceptual row is taken out of service, and a `noError'
-            response is returned.  It is the responsibility of the
-            DESCRIPTION clause of the status column to indicate under
-            what circumstances the status column should be taken out of
-            service (e.g., in order for the value of some other column
-            of the same conceptual row to be modified).
-
-                              Conceptual Row Deletion
-
-            For deletion of conceptual rows, a management protocol set
-            operation is issued which sets the instance of the status
-            column to `destroy'.  This request may be made regardless of
-            the current value of the status column (e.g., it is possible
-            to delete conceptual rows which are either `notReady',
-            `notInService' or `active'.)  If the operation succeeds,
-            then all instances associated with the conceptual row are
-            immediately removed."
-    SYNTAX       INTEGER {
-                     -- the following two values are states:
-                     -- these values may be read or written
-                     active(1),
-                     notInService(2),
-                     -- the following value is a state:
-                     -- this value may be read, but not written
-                     notReady(3),
-                     -- the following three values are
-                     -- actions: these values may be written,
-                     --   but are never read
-                     createAndGo(4),
-                     createAndWait(5),
-                     destroy(6)
-                 }
-
-TimeStamp ::= TEXTUAL-CONVENTION
-    STATUS       current
-    DESCRIPTION
-            "The value of the sysUpTime object at which a specific
-            occurrence happened.  The specific occurrence must be
-
-            defined in the description of any object defined using this
-            type.
-
-            If sysUpTime is reset to zero as a result of a re-
-            initialization of the network management (sub)system, then
-            the values of all TimeStamp objects are also reset.
-            However, after approximately 497 days without a re-
-            initialization, the sysUpTime object will reach 2^^32-1 and
-            then increment around to zero; in this case, existing values
-            of TimeStamp objects do not change.  This can lead to
-            ambiguities in the value of TimeStamp objects."
-    SYNTAX       TimeTicks
-
-TimeInterval ::= TEXTUAL-CONVENTION
-    STATUS       current
-    DESCRIPTION
-            "A period of time, measured in units of 0.01 seconds."
-    SYNTAX       INTEGER (0..2147483647)
-
-DateAndTime ::= TEXTUAL-CONVENTION
-    DISPLAY-HINT "2d-1d-1d,1d:1d:1d.1d,1a1d:1d"
-    STATUS       current
-    DESCRIPTION
-            "A date-time specification.
-
-            field  octets  contents                  range
-            -----  ------  --------                  -----
-              1      1-2   year*                     0..65536
-              2       3    month                     1..12
-              3       4    day                       1..31
-              4       5    hour                      0..23
-              5       6    minutes                   0..59
-              6       7    seconds                   0..60
-                           (use 60 for leap-second)
-              7       8    deci-seconds              0..9
-              8       9    direction from UTC        '+' / '-'
-              9      10    hours from UTC*           0..13
-             10      11    minutes from UTC          0..59
-
-            * Notes:
-            - the value of year is in network-byte order
-            - daylight saving time in New Zealand is +13
-
-            For example, Tuesday May 26, 1992 at 1:30:15 PM EDT would be
-            displayed as:
-
-                             1992-5-26,13:30:15.0,-4:0
-
-            Note that if only local time is known, then timezone
-            information (fields 8-10) is not present."
-    SYNTAX       OCTET STRING (SIZE (8 | 11))
-
-StorageType ::= TEXTUAL-CONVENTION
-    STATUS       current
-    DESCRIPTION
-            "Describes the memory realization of a conceptual row.  A
-            row which is volatile(2) is lost upon reboot.  A row which
-            is either nonVolatile(3), permanent(4) or readOnly(5), is
-            backed up by stable storage.  A row which is permanent(4)
-            can be changed but not deleted.  A row which is readOnly(5)
-            cannot be changed nor deleted.
-
-            If the value of an object with this syntax is either
-            permanent(4) or readOnly(5), it cannot be written.
-            Conversely, if the value is either other(1), volatile(2) or
-            nonVolatile(3), it cannot be modified to be permanent(4) or
-            readOnly(5).  (All illegal modifications result in a
-            'wrongValue' error.)
-
-            Every usage of this textual convention is required to
-            specify the columnar objects which a permanent(4) row must
-            at a minimum allow to be writable."
-    SYNTAX       INTEGER {
-                     other(1),       -- eh?
-                     volatile(2),    -- e.g., in RAM
-                     nonVolatile(3), -- e.g., in NVRAM
-                     permanent(4),   -- e.g., partially in ROM
-                     readOnly(5)     -- e.g., completely in ROM
-                 }
-
-TDomain ::= TEXTUAL-CONVENTION
-    STATUS       current
-    DESCRIPTION
-          "Denotes a kind of transport service.
-
-          Some possible values, such as snmpUDPDomain, are defined in
-          the SNMPv2-TM MIB module.  Other possible values are defined
-          in other MIB modules."
-    REFERENCE    "The SNMPv2-TM MIB module is defined in RFC 1906."
-    SYNTAX       OBJECT IDENTIFIER
-
-TAddress ::= TEXTUAL-CONVENTION
-    STATUS       current
-    DESCRIPTION
-          "Denotes a transport service address.
-
-          A TAddress value is always interpreted within the context of a
-          TDomain value.  Thus, each definition of a TDomain value must
-          be accompanied by a definition of a textual convention for use
-          with that TDomain.  Some possible textual conventions, such as
-          SnmpUDPAddress for snmpUDPDomain, are defined in the SNMPv2-TM
-          MIB module.  Other possible textual conventions are defined in
-          other MIB modules."
-    REFERENCE    "The SNMPv2-TM MIB module is defined in RFC 1906."
-    SYNTAX       OCTET STRING (SIZE (1..255))
-
-END
diff --git a/ldap/servers/snmp/netscape-ldap.mib b/ldap/servers/snmp/netscape-ldap.mib
deleted file mode 100644
index c4ef5f6..0000000
--- a/ldap/servers/snmp/netscape-ldap.mib
+++ /dev/null
@@ -1,759 +0,0 @@
--- BEGIN COPYRIGHT BLOCK
--- This Program is free software; you can redistribute it and/or modify it under
--- the terms of the GNU General Public License as published by the Free Software
--- Foundation; version 2 of the License.
--- 
--- This Program is distributed in the hope that it will be useful, but WITHOUT
--- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License along with
--- this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
--- Place, Suite 330, Boston, MA 02111-1307 USA.
--- 
--- In addition, as a special exception, Red Hat, Inc. gives You the additional
--- right to link the code of this Program with code not covered under the GNU
--- General Public License ("Non-GPL Code") and to distribute linked combinations
--- including the two, subject to the limitations in this paragraph. Non-GPL Code
--- permitted under this exception must only link to the code of this Program
--- through those well defined interfaces identified in the file named EXCEPTION
--- found in the source code files (the "Approved Interfaces"). The files of
--- Non-GPL Code may instantiate templates or use macros or inline functions from
--- the Approved Interfaces without causing the resulting work to be covered by
--- the GNU General Public License. Only Red Hat, Inc. may make changes or
--- additions to the list of Approved Interfaces. You must obey the GNU General
--- Public License in all respects for all of the Program code and other code used
--- in conjunction with the Program except the Non-GPL Code covered by this
--- exception. If you modify this file, you may extend this exception to your
--- version of the file, but you are not obligated to do so. If you do not wish to
--- provide this exception without modification, you must delete this exception
--- statement from your version and license this file solely under the GPL without
--- exception. 
--- 
--- 
--- Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
--- Copyright (C) 2005 Red Hat, Inc.
--- All rights reserved.
--- END COPYRIGHT BLOCK
---
---
--- MIB for Directory Server
---
--- This is an implementation of the MADMAN mib for monitoring LDAP/CLDAP and X.500
--- directories described in RFC 2788 and 2789
--- with the addition of traps for server up and down events
-
-NSLDAP-MIB DEFINITIONS ::= BEGIN
-
-IMPORTS
-      MODULE-IDENTITY,  Counter32, Gauge32, OBJECT-TYPE
-                 FROM SNMPv2-SMI 
-      DisplayString,    TimeStamp, TEXTUAL-CONVENTION
-                 FROM SNMPv2-TC
-      MODULE-COMPLIANCE, OBJECT-GROUP
-                 FROM SNMPv2-CONF
-      applIndex, DistinguishedName, URLString
-                 FROM NETWORK-SERVICES-MIB
-      enterprises
-                 FROM RFC1155-SMI
-      TRAP-TYPE 
-		 FROM RFC-1215;
-     
-      netscape OBJECT IDENTIFIER ::= { enterprises 1450 }
-
-   URLString ::= TEXTUAL-CONVENTION
-       STATUS current
-       DESCRIPTION
-           "I couldn't find it but madman said it should be here, guessing DisplayString"
-       SYNTAX DisplayString
-
-    nsldap MODULE-IDENTITY
-       LAST-UPDATED "200207160000Z"
-       ORGANIZATION "Netscape Communications Corp"
-       CONTACT-INFO
-              "        AOL Strategic Business Solutions 
-               Postal: 22000 AOL Way
-                       Dulles, VA 20166
-
-              Website: http://enterprise.netscape.com"
-            DESCRIPTION
-               " An implementation of the MADMAN mib for monitoring LDAP/CLDAP and X.500
-		 directories described in RFC 2788 and 2789
-                 used for Directory Server"
-            ::= { netscape 7}
-
-    dsOpsTable OBJECT-TYPE
-        SYNTAX SEQUENCE OF DsOpsEntry
-        MAX-ACCESS not-accessible
-        STATUS current
-        DESCRIPTION
-          " The table holding information related to the
-                   DS operations."
-        ::= {nsldap 1}
-
-    dsOpsEntry OBJECT-TYPE
-        SYNTAX DsOpsEntry
-        MAX-ACCESS not-accessible
-        STATUS current
-        DESCRIPTION
-          " Entry containing operations related statistics  
-            for a DS."
-        INDEX { applIndex} 
-        ::= {dsOpsTable 1}
-
-    DsOpsEntry ::= SEQUENCE {
-
-    -- Bindings
-
-        dsAnonymousBinds
-            Counter32,
-        dsUnAuthBinds
-            Counter32,
-        dsSimpleAuthBinds
-            Counter32,
-        dsStrongAuthBinds
-            Counter32,
-        dsBindSecurityErrors
-            Counter32,
-
-    -- In-coming operations
-
-        dsInOps
-            Counter32,
-        dsReadOps
-            Counter32,
-        dsCompareOps
-            Counter32,
-        dsAddEntryOps
-            Counter32,
-        dsRemoveEntryOps
-            Counter32,
-        dsModifyEntryOps
-            Counter32,
-        dsModifyRDNOps
-            Counter32,
-        dsListOps
-            Counter32,
-        dsSearchOps
-            Counter32,
-        dsOneLevelSearchOps
-            Counter32,
-        dsWholeSubtreeSearchOps
-            Counter32,
-
-    -- Out going operations
-
-        dsReferrals
-            Counter32,
-	dsChainings
-            Counter32,
-
-    -- Errors
-
-        dsSecurityErrors
-            Counter32,
-        dsErrors
-            Counter32
-    }
-
-    -- CLDAP does not use binds; for A CLDAP DS the bind
-    -- related counters will be inaccessible.
-    --
-    -- CLDAP and LDAP implement "Read" and "List" operations
-    -- indirectly via the "search" operation; the following
-    -- counters will be inaccessible for CLDAP and LDAP DSs:
-    -- dsReadOps, dsListOps
-    --
-    -- CLDAP does not implement "Compare", "Add", "Remove",
-    -- "Modify", "ModifyRDN"; the following counters will be
-    -- inaccessible for CLDAP DSs:
-    -- dsCompareOps, dsAddEntryOps,  dsRemoveEntryOps,
-    -- dsModifyEntryOps, dsModifyRDNOps.
-    --
-    -- CLDAP and LDAP DS's do not return Referrals
-    -- the following fields will remain inaccessible for
-    -- CLDAP and LDAP DSs: dsReferrals.
-
-    dsAnonymousBinds OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of anonymous  binds to this DS from UAs
-            since application start."
-        ::= {dsOpsEntry 1}
-
-    dsUnAuthBinds OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of un-authenticated binds to this DS since
-            application start."
-        ::= {dsOpsEntry 2}
-
-    dsSimpleAuthBinds OBJECT-TYPE
-	SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of binds to this DS that were authenticated
-            using simple authentication procedures since
-            application start."
-        REFERENCE
-          " CCITT Blue Book Fascicle VIII.8 - Rec. X.511, 1988:
-            Section 8.1.2.1.1. and, RFC1777 Section 4.1"
-        ::= {dsOpsEntry 3}
-
-    dsStrongAuthBinds OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of binds to this DS that were authenticated
-            using the strong authentication procedures since
-            application start. This includes the binds that were
-            authenticated using external authentication procedures."
-        REFERENCE
-          " CCITT Blue Book Fascicle VIII.8 - Rec. X.511, 1988:
-            Sections 8.1.2.1.2 &  8.1.2.1.3. and, RFC1777 Section 4.1."
-        ::= {dsOpsEntry 4}
-
-    dsBindSecurityErrors OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of bind operations that have been rejected
-            by this DS due to inappropriateAuthentication or
-            invalidCredentials."
-        REFERENCE
-          " CCITT Blue Book Fascicle VIII.8 - Rec. X.511, 1988:
-            Section 12.7.2 and, RFC1777 Section 4."
-        ::= {dsOpsEntry 5}
-
-    dsInOps OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of operations forwarded to this DS
-            from UAs or other DSs since application
-            start up."
-        ::= {dsOpsEntry 6}
-		
-	dsReadOps OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of read operations serviced by
-            this DS since application startup."
-        REFERENCE
-          " CCITT Blue Book Fascicle VIII.8 - Rec. X.511, 1988:
-            Section 9.1."
-        ::= {dsOpsEntry 7}
-
-    dsCompareOps OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of compare operations serviced by
-            this DS  since application startup."
-        REFERENCE
-          " CCITT Blue Book Fascicle VIII.8 - Rec. X.511, 1988:
-            Section 9.2. and, RFC1777 section 4.8"
-        ::= {dsOpsEntry 8}
-
-    dsAddEntryOps OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of addEntry operations serviced by
-            this DS since application startup."
-        REFERENCE
-          " CCITT Blue Book Fascicle VIII.8 - Rec. X.511, 1988:
-            Section 11.1. and, RFC1777 Section 4.5."
-        ::= {dsOpsEntry 9}
-
-    dsRemoveEntryOps OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of removeEntry operations serviced by
-            this DS since application startup."
-         REFERENCE
-          " CCITT Blue Book Fascicle VIII.8 - Rec. X.511, 1988:
-            Section 11.2. and, RFC1777 Section 4.6."
-        ::= {dsOpsEntry 10}
-
-	dsModifyEntryOps OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of modifyEntry operations serviced by
-            this DS since application startup."
-        REFERENCE
-          " CCITT Blue Book Fascicle VIII.8 - Rec. X.511, 1988:
-            Section 11.3. and, RFC1777 Section 4.4."
-        ::= {dsOpsEntry 11}
-
-    dsModifyRDNOps OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of modifyRDN operations serviced by
-                   this DS since application startup."
-        REFERENCE
-          " CCITT Blue Book Fascicle VIII.8 - Rec. X.511, 1988:
-            Section 11.4.and, RFC1777 Section 4.7"
-        ::= {dsOpsEntry 12}
-
-    dsListOps OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of list operations serviced by
-            this DS since application startup."
-        REFERENCE
-          " CCITT Blue Book Fascicle VIII.8 - Rec. X.511, 1988:
-            Section 10.1."
-        ::= {dsOpsEntry 13}
-
-    dsSearchOps OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of search operations- baseObject searches,
-            oneLevel searches and  wholeSubtree searches,
-            serviced by this DS  since application startup."
-        REFERENCE
-          " CCITT Blue Book Fascicle VIII.8 - Rec. X.511, 1988:
-            Section 10.2. and, RFC1777 Section 4.3."
-        ::= {dsOpsEntry 14}
-
-	dsOneLevelSearchOps OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of oneLevel search operations serviced
-            by this DS since application startup."
-        REFERENCE
-          " CCITT Blue Book Fascicle VIII.8 - Rec. X.511, 1988:
-            Section 10.2.2.2. and, RFC1777 Section 4.3."
-        ::= {dsOpsEntry 15}
-
-    dsWholeSubtreeSearchOps   OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of wholeSubtree search operations serviced
-            by this DS since application startup."
-        REFERENCE
-          " CCITT Blue Book Fascicle VIII.8 - Rec. X.511, 1988:
-            Section 10.2.2.2. and, RFC1777 Section 4.3."
-        ::= {dsOpsEntry 16}
-
-    dsReferrals OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of referrals returned by this DS in response
-            to requests for operations since application startup."
-        REFERENCE
-          " CCITT Blue Book Fascicle VIII.8 - Rec. X.511, 1988:
-            Section 12.6."
-        ::= {dsOpsEntry 17}
-
-    dsChainings OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of operations forwarded by this DS
-            to other DSs since application startup."
-        REFERENCE
-          " CCITT Blue Book Fascicle VIII.8 - Rec. X.518, 1988:
-            Section 14."
-        ::= {dsOpsEntry 18}
-
-	dsSecurityErrors OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of operations forwarded to this DS
-            which did not meet the security requirements. "
-        REFERENCE
-          " CCITT Blue Book Fascicle VIII.8 - Rec. X.511, 1988:
-            Section 12.7. and, RFC1777 Section 4."
-        ::= {dsOpsEntry 19}
-
-    dsErrors  OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of operations that could not be serviced
-            due to errors other than security errors, and
-            referrals.
-            A partially serviced operation will not be counted
-            as an error.
-            The errors include NameErrors, UpdateErrors, Attribute
-            errors and ServiceErrors."
-        REFERENCE
-          " CCITT Blue Book Fascicle VIII.8 - Rec. X.511, 1988:
-            Sections 12.4, 12.5, 12.8 & 12.9. and, RFC1777 Section 4."
-        ::= {dsOpsEntry 20}
-
-    -- Entry statistics/Cache performance
-    dsEntriesTable OBJECT-TYPE
-        SYNTAX SEQUENCE OF DsEntriesEntry
-        MAX-ACCESS not-accessible
-        STATUS current
-        DESCRIPTION
-          " The table holding information related to the
-            entry statistics and cache performance of the DSs."
-        ::= {nsldap 2}
-
-    dsEntriesEntry OBJECT-TYPE
-        SYNTAX DsEntriesEntry
-        MAX-ACCESS not-accessible
-        STATUS current
-        DESCRIPTION
-          " Entry containing statistics pertaining to entries
-            held by a DS."
-        INDEX { applIndex }
-        ::= {dsEntriesTable 1}
-
-
-	DsEntriesEntry ::= SEQUENCE {
-
-        dsMasterEntries
-            Gauge32,
-        dsCopyEntries
-            Gauge32,
-        dsCacheEntries
-            Gauge32,
-        dsCacheHits
-            Counter32,
-        dsSlaveHits
-            Counter32
-    }
-
-   -- A (C)LDAP frontend to the X.500 Directory will not have
-   -- MasterEntries, CopyEntries; the following counters will
-   -- be inaccessible for LDAP/CLDAP frontends to the X.500
-   -- directory: dsMasterEntries, dsCopyEntries, dsSlaveHits.
-
-    dsMasterEntries OBJECT-TYPE
-        SYNTAX Gauge32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of entries mastered in the DS."
-        ::= {dsEntriesEntry 1}
-
-    dsCopyEntries OBJECT-TYPE
-        SYNTAX Gauge32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of entries for which systematic (slave)
-            copies are maintained in the DS."
-        ::= {dsEntriesEntry 2}
-
-    dsCacheEntries OBJECT-TYPE
-        SYNTAX Gauge32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of entries cached (non-systematic copies) in
-            the DS. This will include the entries that are
-            cached partially. The negative cache is not counted."
-        ::= {dsEntriesEntry 3}
-
-	dsCacheHits OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of operations that were serviced from
-            the locally held cache since application
-            startup."
-        ::= {dsEntriesEntry 4}
-
-    dsSlaveHits  OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Number of operations that were serviced from
-            the locally held object replications ( shadow
-            entries) since application startup."
-        ::= {dsEntriesEntry 5}
-
-    -- The dsIntTable contains statistical data on the peer DSs
-    -- with which the monitored DSs (attempt to) interact.  This
-    -- table  will provide a useful insight into  the   effect of
-    -- neighbours on the DS performance.
-    -- The table keeps track of the last "N" DSs with which  the
-    -- monitored  DSs  has  interacted  (attempted to interact),
-    -- where "N" is a locally-defined constant.
-
-    dsIntTable OBJECT-TYPE
-        SYNTAX  SEQUENCE OF DsIntEntry
-        MAX-ACCESS  not-accessible
-        STATUS  current
-        DESCRIPTION
-          " Each row of this table contains some details
-            related to the history of the interaction
-            of the monitored DSs with their respective
-            peer DSs."
-        ::= { nsldap 3 }
-
-	dsIntEntry OBJECT-TYPE
-        SYNTAX  DsIntEntry
-        MAX-ACCESS  not-accessible
-        STATUS  current
-        DESCRIPTION
-          " Entry containing interaction details of a DS
-            with a peer DS."
-           INDEX { applIndex, dsIntIndex }
-        ::= { dsIntTable 1 }
-
-    DsIntEntry ::= SEQUENCE {
-
-       dsIntIndex
-	        INTEGER,
-       dsName
-                DistinguishedName,
-       dsTimeOfCreation
-                 TimeStamp,
-       dsTimeOfLastAttempt
-                 TimeStamp,
-       dsTimeOfLastSuccess
-                 TimeStamp,
-       dsFailuresSinceLastSuccess
-                 Counter32,
-       dsFailures
-                 Counter32,
-       dsSuccesses
-                 Counter32,
-       dsURL
-                URLString
-
-    }
-
-   dsIntIndex  OBJECT-TYPE
-     SYNTAX INTEGER (1..2147483647)
-     MAX-ACCESS not-accessible
-       STATUS current
-       DESCRIPTION
-         " Together with applIndex it forms the unique key to
-           identify the conceptual row which contains useful info
-            on the (attempted) interaction between the DS (referred
-            to by applIndex) and a peer DS."
-        ::= {dsIntEntry 1}
-
-    dsName  OBJECT-TYPE
-        SYNTAX DistinguishedName
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Distinguished Name of the peer DS to which this
-		      entry pertains."
-        ::= {dsIntEntry 2}
-
-    dsTimeOfCreation  OBJECT-TYPE
-        SYNTAX TimeStamp
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " The value of sysUpTime when this row was created.
-            If the entry was created before the network management
-            subsystem was initialized, this object will contain
-            a value of zero."
-        ::= {dsIntEntry 3}
-
-    dsTimeOfLastAttempt  OBJECT-TYPE
-        SYNTAX TimeStamp
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " The value of sysUpTime when the last attempt was made
-            to contact this DS. If the last attempt was made before
-            the network management subsystem was initialized, this
-            object will contain a value of zero."
-        ::= {dsIntEntry 4}
-
-    dsTimeOfLastSuccess  OBJECT-TYPE
-        SYNTAX TimeStamp
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " The value of sysUpTime when the last attempt made to
-            contact this DS was successful. If there have
-            been no successful attempts this entry will have a value
-            of zero. If the last successful attempt was made before
-            the network management subsystem was initialized, this
-            object will contain a value of zero."
-        ::= {dsIntEntry 5}
-
-	dsFailuresSinceLastSuccess  OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " The number of failures since the last time an
-            attempt to contact this DS was successful. If
-            there has been no successful attempts, this counter
-            will contain the number of failures since this entry
-            was created."
-        ::= {dsIntEntry 6}
-
-    dsFailures  OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Cumulative failures since the creation of
-            this entry."
-        ::= {dsIntEntry 7}
-
-    dsSuccesses  OBJECT-TYPE
-        SYNTAX Counter32
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " Cumulative successes since the creation of
-            this entry."
-        ::= {dsIntEntry 8}
-
-    dsURL  OBJECT-TYPE
-        SYNTAX URLString
-        MAX-ACCESS read-only
-        STATUS current
-        DESCRIPTION
-          " URL of the DS application."
-        ::= {dsIntEntry 9}
-
---
--- Information about this installation of the directory server
--- 
-
-    dsEntityTable OBJECT-TYPE
-        SYNTAX SEQUENCE OF DsEntityEntry
-        MAX-ACCESS not-accessible
-        STATUS current
-        DESCRIPTION
-          "This table holds general information related to an installed
-                   instance of a directory server"
-        ::= {nsldap 5}
-
-    dsEntityEntry OBJECT-TYPE
-        SYNTAX DsEntityEntry
-        MAX-ACCESS not-accessible
-        STATUS current
-        DESCRIPTION
-          "Entry of general information about an installed instance
-           of a directory server"
-        INDEX { applIndex} 
-        ::= {dsEntityTable 1}
-
-    DsEntityEntry ::= SEQUENCE {
-        dsEntityDescr
-	  DisplayString,
-	dsEntityVers
-	  DisplayString,
-	dsEntityOrg
-	  DisplayString,
-  	dsEntityLocation
-	  DisplayString,
-	dsEntityContact
-	  DisplayString,
-	dsEntityName
-	  DisplayString
-    }
-
-    dsEntityDescr	OBJECT-TYPE
-	SYNTAX	DisplayString(SIZE (0..255))
-	ACCESS  read-only
-	STATUS  mandatory
-	DESCRIPTION
-		"A general textual description of this directory server."
-	::= {dsEntityEntry 1}
-
-    dsEntityVers	OBJECT-TYPE
-	SYNTAX	DisplayString(SIZE (0..255))
-	ACCESS  read-only
-	STATUS  mandatory
-	DESCRIPTION
-		"The version of this directory server"
-	::={dsEntityEntry 2}
-
-    dsEntityOrg		OBJECT-TYPE
-	SYNTAX	DisplayString(SIZE (0..255))
-	ACCESS	read-only
-	STATUS  mandatory
-	DESCRIPTION
-		"Organization responsible for directory server at this installation"
-	::={dsEntityEntry 3}
-
-    dsEntityLocation	OBJECT-TYPE
-	SYNTAX	DisplayString(SIZE (0..255))
-	ACCESS	read-only
-	STATUS  mandatory
-	DESCRIPTION
-		"Physical location of this entity (directory server).
-		 For example: hostname, building  number, lab number, etc."
-	::={dsEntityEntry 4}
-
-    dsEntityContact 	OBJECT-TYPE
-	SYNTAX	DisplayString(SIZE (0..255))
-	ACCESS	read-only
-	STATUS  mandatory
-	DESCRIPTION
-		"Contact person(s)responsible for the directory server at this 
-		 installation, together with information on how to conact."
-	::={dsEntityEntry 5}
-	
-    dsEntityName		OBJECT-TYPE
-	SYNTAX	DisplayString(SIZE (0..255))
-	ACCESS	read-only
-	STATUS  mandatory
-	DESCRIPTION
-		"Name assigned to this entity at the installation site"
-	::={dsEntityEntry 6}
-
---
---  Traps 
---
---
-	nsDirectoryServerDown 	TRAP-TYPE
-		ENTERPRISE	netscape
-		VARIABLES	{ dsEntityDescr, dsEntityVers, dsEntityLocation,
-				  dsEntityContact } 
-		DESCRIPTION	"This trap is generated whenever the agent detects the
-				 directory server to be (potentially) Down."
-		::= 7001    
-				
-	nsDirectoryServerStart 	TRAP-TYPE
-		ENTERPRISE	netscape
-		VARIABLES	{ dsEntityDescr, dsEntityVers, dsEntityLocation }
-		DESCRIPTION	"This trap is generated whenever the agent detects the
-				 directory server to have (re)started."
-		::= 7002     
-				
-   END
-
-- 
1.7.7.6

