Update to 1.0. Summary of changes since 0.95:

- improved user interface
- improved vlan support
- improved support for wifi AP and IP phones
- updated snmp mibs
and more ...

5 files changed, 539 insertions, 44 deletions

diff --git a/net/netdisco/Makefile b/net/netdisco/Makefile
index b2b930580af..047883f73e6 100644
--- a/net/netdisco/Makefile
+++ b/net/netdisco/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2009/04/11 23:15:20 sno Exp $
+# $NetBSD: Makefile,v 1.23 2011/03/15 20:36:03 bouyer Exp $
 #
 
-DISTNAME=		netdisco-0.95_with_mibs
-PKGNAME=		netdisco-0.95
-PKGREVISION=		1
+DISTNAME=		netdisco-1.0_with_mibs
+PKGNAME=		netdisco-1.0
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=netdisco/}
 
diff --git a/net/netdisco/PLIST b/net/netdisco/PLIST
index b2b5e148c92..f41724b45c7 100644
--- a/net/netdisco/PLIST
+++ b/net/netdisco/PLIST
@@ -1,12 +1,30 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:09:36 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/03/15 20:36:03 bouyer Exp $
 netdisco/bin/catalyst_mac_vlan.pl
 netdisco/bin/debian_install.sh
 netdisco/bin/doc_munge
+netdisco/bin/firewall_arp
 netdisco/bin/fix_cvsroot
+netdisco/bin/install/0.94/CentOs_install.sh
+netdisco/bin/install/0.94/Debian_3.1_install.sh
+netdisco/bin/install/0.94/FC4_install.sh
+netdisco/bin/install/0.94/FC5_install.sh
+netdisco/bin/install/0.94/readme_centos
+netdisco/bin/install/0.94/readme_cvs
+netdisco/bin/install/0.94/readme_debian
+netdisco/bin/install/0.94/readme_fedora
+netdisco/bin/install/0.95/CentOS5_0.95_install.sh
+netdisco/bin/install/0.95/CentOs_0.95_install.sh
+netdisco/bin/install/0.95/Debian_3.1_install.sh
+netdisco/bin/install/0.95/Debian_4.0_install.sh
+netdisco/bin/install/0.95/FC6_install.sh
+netdisco/bin/install/0.95/FC8_install.sh
+netdisco/bin/install/1.0/FC6_CVS_install.sh
+netdisco/bin/install/README
 netdisco/bin/parse_kismet_ap
 netdisco/bin/parse_mac
 netdisco/bin/pod_arg_link_fix
 netdisco/bin/port_control
+netdisco/bin/snmpv3_key
 netdisco/bin/test_cache.pl
 netdisco/bin/test_cdp.pl
 netdisco/bin/test_dev.pl
@@ -33,6 +51,7 @@ netdisco/html/admin_reconfig.html
 netdisco/html/admin_user.html
 netdisco/html/apache_login.html
 netdisco/html/autohandler
+netdisco/html/bullet.gif
 netdisco/html/change_pw.html
 netdisco/html/corner-bl.png
 netdisco/html/corner-br.png
@@ -40,7 +59,10 @@ netdisco/html/corner-tl.png
 netdisco/html/corner-tr.png
 netdisco/html/device.html
 netdisco/html/device_inv.html
+netdisco/html/device_module.html
+netdisco/html/device_module_search.html
 netdisco/html/device_search.html
+netdisco/html/discoball2.gif
 netdisco/html/doc/INSTALL.html
 netdisco/html/doc/README.html
 netdisco/html/doc/UPGRADE.html
@@ -49,6 +71,7 @@ netdisco/html/doc/index.html
 netdisco/html/doc/netdisco-api-backend.html
 netdisco/html/doc/netdisco-api-shared.html
 netdisco/html/duplex.html
+netdisco/html/frontpanel.html
 netdisco/html/icon_down.gif
 netdisco/html/icon_info.gif
 netdisco/html/icon_lock.gif
@@ -61,15 +84,27 @@ netdisco/html/jack_search.html
 netdisco/html/log.html
 netdisco/html/login.html
 netdisco/html/logout.html
+netdisco/html/minus.gif
+netdisco/html/mktree.css
+netdisco/html/mktree.js
+netdisco/html/netdisco.css
+netdisco/html/netdisco.ico
 netdisco/html/netdiscoball.gif
 netdisco/html/netmap.html
 netdisco/html/node.html
+netdisco/html/plus.gif
 netdisco/html/port_info.html
 netdisco/html/port_report.html
 netdisco/html/portcontrol.html
 netdisco/html/powered_by_mason.jpg
+netdisco/html/public_debugging.html
+netdisco/html/reports.html
+netdisco/html/search.html
 netdisco/html/sidebar.html
 netdisco/html/stats.html
+netdisco/html/svg/zgrviewer-0.8.2.jar
+netdisco/html/svg/zvtm-0.9.8.jar
+netdisco/html/svg/zvtm.license.txt
 netdisco/html/traceroute.html
 netdisco/html/valid-html401.png
 netdisco/html/vcss.gif
@@ -77,11 +112,181 @@ netdisco/mibs/README
 netdisco/mibs/UPGRADE
 netdisco/mibs/allied/ati-mib.mib
 netdisco/mibs/allied/atswtch2.mib
+netdisco/mibs/arista/ARISTA-PRODUCTS-MIB.txt
+netdisco/mibs/arista/ARISTA-SMI-MIB.txt
+netdisco/mibs/aruba/a80sb_mb_private.mib
 netdisco/mibs/aruba/aruba-ap.my
+netdisco/mibs/aruba/aruba-auth.my
+netdisco/mibs/aruba/aruba-cts.my
+netdisco/mibs/aruba/aruba-esi.my
+netdisco/mibs/aruba/aruba-ifext.my
+netdisco/mibs/aruba/aruba-mesh.my
+netdisco/mibs/aruba/aruba-mgmt.my
+netdisco/mibs/aruba/aruba-mobility.my
+netdisco/mibs/aruba/aruba-mon.my
+netdisco/mibs/aruba/aruba-snr.my
 netdisco/mibs/aruba/aruba-switch.my
+netdisco/mibs/aruba/aruba-systemext.my
+netdisco/mibs/aruba/aruba-tc.my
+netdisco/mibs/aruba/aruba-trap.my
+netdisco/mibs/aruba/aruba-user.my
+netdisco/mibs/aruba/aruba-voice.my
+netdisco/mibs/aruba/aruba-wlan.my
 netdisco/mibs/aruba/aruba.my
 netdisco/mibs/asante/ASANTE-AH1012-MIB.txt
 netdisco/mibs/asante/AsanteSwitchMIB.txt
+netdisco/mibs/cabletron/cabletron-traps-irm.txt
+netdisco/mibs/cabletron/cabletron-traps.txt
+netdisco/mibs/cabletron/chassis-mib.txt
+netdisco/mibs/cabletron/community-mib.txt
+netdisco/mibs/cabletron/ct-broadcast-mib.txt
+netdisco/mibs/cabletron/ct-cmmphys-mib.txt
+netdisco/mibs/cabletron/ct-container-mib.txt
+netdisco/mibs/cabletron/ct-els10-mib.txt
+netdisco/mibs/cabletron/ct-fastpath-dhcpserver-mib.txt
+netdisco/mibs/cabletron/ct-fastpath-protected-port-mib.txt
+netdisco/mibs/cabletron/ct-flash-mib.txt
+netdisco/mibs/cabletron/ct-fps-services-mib.txt
+netdisco/mibs/cabletron/ct-hsimphys-mib.txt
+netdisco/mibs/cabletron/ct-pic-mib.txt
+netdisco/mibs/cabletron/ct-priority-classify-mib.txt
+netdisco/mibs/cabletron/ct-priority-queuing-mib.txt
+netdisco/mibs/cabletron/ctatm-config-mib.txt
+netdisco/mibs/cabletron/ctels100-ng-mib.txt
+netdisco/mibs/cabletron/ctfps-mib.txt
+netdisco/mibs/cabletron/ctframer-config-mib.txt
+netdisco/mibs/cabletron/ctif-ext-mib.txt
+netdisco/mibs/cabletron/ctinb-mib.txt
+netdisco/mibs/cabletron/ctinb2-mib.txt
+netdisco/mibs/cabletron/ctrmonxt-mib.txt
+netdisco/mibs/cabletron/ctron-alias-mib.txt
+netdisco/mibs/cabletron/ctron-ap3000-mib.txt
+netdisco/mibs/cabletron/ctron-appletalk-router-mib.txt
+netdisco/mibs/cabletron/ctron-appn-mib.txt
+netdisco/mibs/cabletron/ctron-bdg-mib.txt
+netdisco/mibs/cabletron/ctron-bridge-mib.txt
+netdisco/mibs/cabletron/ctron-bus-mib.txt
+netdisco/mibs/cabletron/ctron-cdp.mib.txt
+netdisco/mibs/cabletron/ctron-chassis-mib.txt
+netdisco/mibs/cabletron/ctron-common-mib.txt
+netdisco/mibs/cabletron/ctron-csmacd-mib.txt
+netdisco/mibs/cabletron/ctron-dcm-mib.txt
+netdisco/mibs/cabletron/ctron-deciv-router-mib.txt
+netdisco/mibs/cabletron/ctron-device-mib.txt
+netdisco/mibs/cabletron/ctron-dhcp-mib.txt
+netdisco/mibs/cabletron/ctron-dlsw-mib.txt
+netdisco/mibs/cabletron/ctron-download-mib.txt
+netdisco/mibs/cabletron/ctron-elan-mib.txt
+netdisco/mibs/cabletron/ctron-entity-state-mib.txt
+netdisco/mibs/cabletron/ctron-entity-state-tc-mib.txt
+netdisco/mibs/cabletron/ctron-environment-mib.txt
+netdisco/mibs/cabletron/ctron-ethernet-parameters.txt
+netdisco/mibs/cabletron/ctron-etwmim-mib.txt
+netdisco/mibs/cabletron/ctron-fddi-fnb-mib.txt
+netdisco/mibs/cabletron/ctron-fddi-stat-mib.txt
+netdisco/mibs/cabletron/ctron-fnbtr-mib.txt
+netdisco/mibs/cabletron/ctron-frontpanel-mib.txt
+netdisco/mibs/cabletron/ctron-if-remap-2-mib.txt
+netdisco/mibs/cabletron/ctron-if-remap-mib.txt
+netdisco/mibs/cabletron/ctron-igmp-mib.txt
+netdisco/mibs/cabletron/ctron-ip-router-mib.txt
+netdisco/mibs/cabletron/ctron-ipx-router-mib.txt
+netdisco/mibs/cabletron/ctron-mib-names.txt
+netdisco/mibs/cabletron/ctron-nat-mib.txt
+netdisco/mibs/cabletron/ctron-oids.mib.txt
+netdisco/mibs/cabletron/ctron-orp-hsim-mib.txt
+netdisco/mibs/cabletron/ctron-portmap-mib.txt
+netdisco/mibs/cabletron/ctron-power-supply-mib.txt
+netdisco/mibs/cabletron/ctron-ppc-bad-packets.txt
+netdisco/mibs/cabletron/ctron-priority-classify-mib.txt
+netdisco/mibs/cabletron/ctron-priority-extensions-mib.txt
+netdisco/mibs/cabletron/ctron-q-bridge-mib-ext.txt
+netdisco/mibs/cabletron/ctron-rate-policing-mib.txt
+netdisco/mibs/cabletron/ctron-remote-access-mib.txt
+netdisco/mibs/cabletron/ctron-routers-internal-mib.txt
+netdisco/mibs/cabletron/ctron-routers-mib.txt
+netdisco/mibs/cabletron/ctron-sfcs-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-base-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-bindery-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-call-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-chassis-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-common-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-conn-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-connection-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-diagstats-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-directory-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-esys-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-eventlog-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-flood-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-include-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-l4ss-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-mcast-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-path-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-pktmgr-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-policy-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-port-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-resolve-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-sflsp-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-size-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-softlink-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-tap-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-topology-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-vlan-mib.txt
+netdisco/mibs/cabletron/ctron-sfps-vstp-mib.txt
+netdisco/mibs/cabletron/ctron-smarttrunk-mib.txt
+netdisco/mibs/cabletron/ctron-ssr-capacity-mib.txt
+netdisco/mibs/cabletron/ctron-ssr-config-mib.txt
+netdisco/mibs/cabletron/ctron-ssr-hardware-mib.txt
+netdisco/mibs/cabletron/ctron-ssr-l2-mib.txt
+netdisco/mibs/cabletron/ctron-ssr-l3-mib.txt
+netdisco/mibs/cabletron/ctron-ssr-policy-mib.txt
+netdisco/mibs/cabletron/ctron-ssr-service-status-mib.txt
+netdisco/mibs/cabletron/ctron-ssr-smi-mib.txt
+netdisco/mibs/cabletron/ctron-ssr-trap-mib.txt
+netdisco/mibs/cabletron/ctron-timed-reset-mib.txt
+netdisco/mibs/cabletron/ctron-translation-mib.txt
+netdisco/mibs/cabletron/ctron-tx-queue-arbitration-mib.txt
+netdisco/mibs/cabletron/ctron-ups-mib.txt
+netdisco/mibs/cabletron/ctron-vlan-classify-mib.txt
+netdisco/mibs/cabletron/ctron-vlan-extensions-mib.txt
+netdisco/mibs/cabletron/ctron-wan-imux-mib.txt
+netdisco/mibs/cabletron/ctron-wan-mib.txt
+netdisco/mibs/cabletron/ctron-wan-multi-imux-mib.txt
+netdisco/mibs/cabletron/ctron-webview-mib.txt
+netdisco/mibs/cabletron/ctsmtmib-mib.txt
+netdisco/mibs/cabletron/cttraplog-mib.txt
+netdisco/mibs/cabletron/dlm-mib.txt
+netdisco/mibs/cabletron/dot5-log-mib.txt
+netdisco/mibs/cabletron/dot5-phys-mib.txt
+netdisco/mibs/cabletron/elh100-mib.txt
+netdisco/mibs/cabletron/els100-s24tx2m-mib.txt
+netdisco/mibs/cabletron/event-actions-mib.txt
+netdisco/mibs/cabletron/fast-ethernet-mib.txt
+netdisco/mibs/cabletron/garp-mib.txt
+netdisco/mibs/cabletron/irm-oids.txt
+netdisco/mibs/cabletron/irm3-mib.txt
+netdisco/mibs/cabletron/netlink-specific-mib.txt
+netdisco/mibs/cabletron/network-diags-mib.txt
+netdisco/mibs/cabletron/rbtws-ap-status-mib.txt
+netdisco/mibs/cabletron/rbtws-ap-tc.txt
+netdisco/mibs/cabletron/rbtws-basic-mib.txt
+netdisco/mibs/cabletron/rbtws-client-session-mib.txt
+netdisco/mibs/cabletron/rbtws-client-session-tc.txt
+netdisco/mibs/cabletron/rbtws-external-server-mib.txt
+netdisco/mibs/cabletron/rbtws-info-rf-detect-mib.txt
+netdisco/mibs/cabletron/rbtws-port-mib.txt
+netdisco/mibs/cabletron/rbtws-registration-mib.txt
+netdisco/mibs/cabletron/rbtws-root-mib.txt
+netdisco/mibs/cabletron/rbtws-system-mib.txt
+netdisco/mibs/cabletron/rbtws-trap-mib.txt
+netdisco/mibs/cabletron/repeater-mib-2.txt
+netdisco/mibs/cabletron/repeater-rev4-mib.txt
+netdisco/mibs/cabletron/router-oids.txt
+netdisco/mibs/cabletron/system-resource-mib.txt
+netdisco/mibs/cabletron/trap-mib.txt
+netdisco/mibs/cabletron/ups2-mib.txt
+netdisco/mibs/cabletron/v2h124-24-mib.txt
+netdisco/mibs/cabletron/ziplock-mib.txt
 netdisco/mibs/chk_dups
 netdisco/mibs/chk_mibs
 netdisco/mibs/chk_mibs_all
@@ -90,6 +295,7 @@ netdisco/mibs/cisco/ACTONA-ACTASTOR-MIB.my
 netdisco/mibs/cisco/ADMIN-AUTH-STATS-MIB.my
 netdisco/mibs/cisco/ADSL-DMT-LINE-MIB.my
 netdisco/mibs/cisco/AIRESPACE-REF-MIB.my
+netdisco/mibs/cisco/AIRESPACE-SWITCHING-MIB.my
 netdisco/mibs/cisco/AIRESPACE-WIRELESS-MIB.my
 netdisco/mibs/cisco/ALTIGA-ADDRESS-STATS-MIB.my
 netdisco/mibs/cisco/ALTIGA-BMGT-STATS-MIB.my
@@ -140,6 +346,7 @@ netdisco/mibs/cisco/CALISTA-DPA-MIB.my
 netdisco/mibs/cisco/CAT2600-MIB.my
 netdisco/mibs/cisco/CISCO-5800-HEALTH-MON-MIB.my
 netdisco/mibs/cisco/CISCO-6400-CHASSIS-MIB.my
+netdisco/mibs/cisco/CISCO-802-TAP-MIB.my
 netdisco/mibs/cisco/CISCO-90-MIB.my
 netdisco/mibs/cisco/CISCO-AAA-CLIENT-MIB.my
 netdisco/mibs/cisco/CISCO-AAA-SERVER-EXT-MIB.my
@@ -153,7 +360,9 @@ netdisco/mibs/cisco/CISCO-ADSL-CAP-LINE-MIB.my
 netdisco/mibs/cisco/CISCO-ADSL-DMT-LINE-MIB.my
 netdisco/mibs/cisco/CISCO-ALPS-MIB.my
 netdisco/mibs/cisco/CISCO-ANNOUNCEMENT-MIB.my
+netdisco/mibs/cisco/CISCO-AON-STATUS-MIB.my
 netdisco/mibs/cisco/CISCO-APPLIANCE-REDUNDANCY-MIB.my
+netdisco/mibs/cisco/CISCO-APPLICATION-ACCELERATION-MIB.my
 netdisco/mibs/cisco/CISCO-APS-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-APS-MIB.my
 netdisco/mibs/cisco/CISCO-ASPP-MIB.my
@@ -166,6 +375,7 @@ netdisco/mibs/cisco/CISCO-ATM-DUAL-PHY-MIB.my
 netdisco/mibs/cisco/CISCO-ATM-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-ATM-IF-MIB.my
 netdisco/mibs/cisco/CISCO-ATM-IF-PHYS-MIB.my
+netdisco/mibs/cisco/CISCO-ATM-NETWORK-CLOCK-MIB.my
 netdisco/mibs/cisco/CISCO-ATM-PVC-MIB.my
 netdisco/mibs/cisco/CISCO-ATM-PVCTRAP-EXTN-MIB.my
 netdisco/mibs/cisco/CISCO-ATM-QOS-MIB.my
@@ -181,6 +391,7 @@ netdisco/mibs/cisco/CISCO-ATM-TRUNK-MIB.my
 netdisco/mibs/cisco/CISCO-ATM-TRUNK-STAT-MIB.my
 netdisco/mibs/cisco/CISCO-ATM-VIRTUAL-IF-MIB.my
 netdisco/mibs/cisco/CISCO-ATM2-MIB.my
+netdisco/mibs/cisco/CISCO-AUTH-FRAMEWORK-MIB.my
 netdisco/mibs/cisco/CISCO-AUTHORIZATION-STATS-MIB.my
 netdisco/mibs/cisco/CISCO-BBSM-MIB.my
 netdisco/mibs/cisco/CISCO-BCP-MIB.my
@@ -188,6 +399,7 @@ netdisco/mibs/cisco/CISCO-BERT-MIB.my
 netdisco/mibs/cisco/CISCO-BGP-POLICY-ACCOUNTING-MIB.my
 netdisco/mibs/cisco/CISCO-BGP4-MIB.my
 netdisco/mibs/cisco/CISCO-BITS-CLOCK-MIB.my
+netdisco/mibs/cisco/CISCO-BRIDGE-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-BSC-MIB.my
 netdisco/mibs/cisco/CISCO-BSTUN-MIB.my
 netdisco/mibs/cisco/CISCO-BULK-FILE-MIB.my
@@ -202,6 +414,7 @@ netdisco/mibs/cisco/CISCO-CABLE-DIAG-MIB.my
 netdisco/mibs/cisco/CISCO-CABLE-METERING-MIB.my
 netdisco/mibs/cisco/CISCO-CABLE-QOS-MONITOR-MIB.my
 netdisco/mibs/cisco/CISCO-CABLE-SPECTRUM-MIB.my
+netdisco/mibs/cisco/CISCO-CABLE-WIDEBAND-MIB.my
 netdisco/mibs/cisco/CISCO-CAC-SYSTEM-MIB.my
 netdisco/mibs/cisco/CISCO-CALL-APPLICATION-MIB.my
 netdisco/mibs/cisco/CISCO-CALL-HISTORY-MIB.my
@@ -217,10 +430,13 @@ netdisco/mibs/cisco/CISCO-CASA-FA-MIB.my
 netdisco/mibs/cisco/CISCO-CASA-MIB.my
 netdisco/mibs/cisco/CISCO-CAT6K-CROSSBAR-MIB.my
 netdisco/mibs/cisco/CISCO-CATOS-ACL-QOS-MIB.my
+netdisco/mibs/cisco/CISCO-CBP-TARGET-MIB.my
+netdisco/mibs/cisco/CISCO-CBP-TARGET-TC-MIB.my
 netdisco/mibs/cisco/CISCO-CCM-MIB.my
 netdisco/mibs/cisco/CISCO-CCME-MIB.my
 netdisco/mibs/cisco/CISCO-CDL-MIB.my
 netdisco/mibs/cisco/CISCO-CDMA-AHDLC-MIB.my
+netdisco/mibs/cisco/CISCO-CDMA-PDSN-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-CDMA-PDSN-MIB.my
 netdisco/mibs/cisco/CISCO-CDP-MIB.my
 netdisco/mibs/cisco/CISCO-CEF-MIB.my
@@ -244,6 +460,8 @@ netdisco/mibs/cisco/CISCO-CONFIG-COPY-MIB.my
 netdisco/mibs/cisco/CISCO-CONFIG-MAN-MIB.my
 netdisco/mibs/cisco/CISCO-CONTENT-ENGINE-MIB.my
 netdisco/mibs/cisco/CISCO-CONTENT-NETWORK-MIB.my
+netdisco/mibs/cisco/CISCO-CONTENT-SERVICES-MIB.my
+netdisco/mibs/cisco/CISCO-CONTEXT-MAPPING-MIB.my
 netdisco/mibs/cisco/CISCO-COPS-CLIENT-MIB.my
 netdisco/mibs/cisco/CISCO-CRYPTO-ACCELERATOR-MIB.my
 netdisco/mibs/cisco/CISCO-CSG-MIB.my
@@ -253,6 +471,7 @@ netdisco/mibs/cisco/CISCO-DEVICE-EXCEPTION-REPORTING-MIB.my
 netdisco/mibs/cisco/CISCO-DHCP-SNOOPING-MIB.my
 netdisco/mibs/cisco/CISCO-DIAL-CONTROL-MIB.my
 netdisco/mibs/cisco/CISCO-DIFFSERV-EXT-MIB.my
+netdisco/mibs/cisco/CISCO-DIGITAL-MEDIA-SYSTEMS-MIB.my
 netdisco/mibs/cisco/CISCO-DIST-DIRECTOR-MIB.my
 netdisco/mibs/cisco/CISCO-DLCSW-MIB.my
 netdisco/mibs/cisco/CISCO-DLSW-EXT-MIB.my
@@ -265,12 +484,16 @@ netdisco/mibs/cisco/CISCO-DOCS-REMOTE-QUERY-MIB.my
 netdisco/mibs/cisco/CISCO-DOT11-ASSOCIATION-MIB.my
 netdisco/mibs/cisco/CISCO-DOT11-CONTEXT-SERVICES-CLIENT-MIB.my
 netdisco/mibs/cisco/CISCO-DOT11-CONTEXT-SERVICES-MIB.my
+netdisco/mibs/cisco/CISCO-DOT11-HT-MAC-MIB.my
+netdisco/mibs/cisco/CISCO-DOT11-HT-PHY-MIB.my
 netdisco/mibs/cisco/CISCO-DOT11-IF-MIB.my
 netdisco/mibs/cisco/CISCO-DOT11-LBS-MIB.my
 netdisco/mibs/cisco/CISCO-DOT11-QOS-MIB.my
+netdisco/mibs/cisco/CISCO-DOT11-RADAR-MIB.my
 netdisco/mibs/cisco/CISCO-DOT11-RADIO-DIAGNOSTIC-MIB.my
 netdisco/mibs/cisco/CISCO-DOT11-SSID-SECURITY-MIB.my
 netdisco/mibs/cisco/CISCO-DOT11-WIDS-MIB.my
+netdisco/mibs/cisco/CISCO-DOT3-OAM-MIB.my
 netdisco/mibs/cisco/CISCO-DS0-CROSS-CONNECT-MIB.my
 netdisco/mibs/cisco/CISCO-DS0BUNDLE-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-DS0BUNDLE-MIB.my
@@ -283,6 +506,7 @@ netdisco/mibs/cisco/CISCO-DYNAMIC-ARP-INSPECTION-MIB.my
 netdisco/mibs/cisco/CISCO-DYNAMIC-PORT-VSAN-MIB.my
 netdisco/mibs/cisco/CISCO-EIGRP-MIB.my
 netdisco/mibs/cisco/CISCO-EMBEDDED-EVENT-MGR-MIB.my
+netdisco/mibs/cisco/CISCO-ENERGYWISE-MIB.my
 netdisco/mibs/cisco/CISCO-ENHANCED-IMAGE-MIB.my
 netdisco/mibs/cisco/CISCO-ENHANCED-IPSEC-FLOW-MIB.my
 netdisco/mibs/cisco/CISCO-ENHANCED-MEMPOOL-MIB.my
@@ -290,17 +514,24 @@ netdisco/mibs/cisco/CISCO-ENHANCED-SLB-MIB.my
 netdisco/mibs/cisco/CISCO-ENHANCED-WRED-MIB.my
 netdisco/mibs/cisco/CISCO-ENTITY-ALARM-MIB.my
 netdisco/mibs/cisco/CISCO-ENTITY-ASSET-MIB.my
+netdisco/mibs/cisco/CISCO-ENTITY-DIAG-MIB.my
+netdisco/mibs/cisco/CISCO-ENTITY-DIAG-TC-MIB.my
 netdisco/mibs/cisco/CISCO-ENTITY-DISPLAY-MIB.my
 netdisco/mibs/cisco/CISCO-ENTITY-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-ENTITY-FRU-CONTROL-MIB.my
 netdisco/mibs/cisco/CISCO-ENTITY-PFE-MIB.my
 netdisco/mibs/cisco/CISCO-ENTITY-PROVISIONING-MIB.my
+netdisco/mibs/cisco/CISCO-ENTITY-REDUNDANCY-MIB.my
+netdisco/mibs/cisco/CISCO-ENTITY-REDUNDANCY-TC-MIB.my
 netdisco/mibs/cisco/CISCO-ENTITY-SENSOR-MIB.my
 netdisco/mibs/cisco/CISCO-ENTITY-VENDORTYPE-OID-MIB.my
 netdisco/mibs/cisco/CISCO-ENVMON-MIB.my
 netdisco/mibs/cisco/CISCO-EPM-NOTIFICATION-MIB.my
+netdisco/mibs/cisco/CISCO-ERM-MIB.my
+netdisco/mibs/cisco/CISCO-ERR-DISABLE-MIB.my
 netdisco/mibs/cisco/CISCO-ETHER-CFM-MIB.my
 netdisco/mibs/cisco/CISCO-ETHERNET-ACCESS-MIB.my
+netdisco/mibs/cisco/CISCO-EVC-MIB.my
 netdisco/mibs/cisco/CISCO-EXT-SCSI-MIB.my
 netdisco/mibs/cisco/CISCO-FABRIC-C12K-MIB.my
 netdisco/mibs/cisco/CISCO-FABRIC-HFR-MIB.my
@@ -311,6 +542,7 @@ netdisco/mibs/cisco/CISCO-FC-DEVICE-ALIAS-MIB.my
 netdisco/mibs/cisco/CISCO-FC-FE-MIB.my
 netdisco/mibs/cisco/CISCO-FC-MULTICAST-MIB.my
 netdisco/mibs/cisco/CISCO-FC-ROUTE-MIB.my
+netdisco/mibs/cisco/CISCO-FC-SDV-MIB.my
 netdisco/mibs/cisco/CISCO-FC-SPAN-MIB.my
 netdisco/mibs/cisco/CISCO-FCC-MIB.my
 netdisco/mibs/cisco/CISCO-FCIP-MGMT-EXT-MIB.my
@@ -332,22 +564,30 @@ netdisco/mibs/cisco/CISCO-FRAME-RELAY-MIB.my
 netdisco/mibs/cisco/CISCO-FSPF-MIB.my
 netdisco/mibs/cisco/CISCO-FTP-CLIENT-MIB.my
 netdisco/mibs/cisco/CISCO-GATEKEEPER-MIB.my
+netdisco/mibs/cisco/CISCO-GGSN-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-GGSN-MIB.my
 netdisco/mibs/cisco/CISCO-GGSN-QOS-MIB.my
 netdisco/mibs/cisco/CISCO-GGSN-SERVICE-AWARE-MIB.my
 netdisco/mibs/cisco/CISCO-GPRS-ACC-PT-MIB.my
 netdisco/mibs/cisco/CISCO-GPRS-CHARGING-MIB.my
 netdisco/mibs/cisco/CISCO-GPRS-GTP-MIB.my
+netdisco/mibs/cisco/CISCO-GSLB-DNS-MIB.my
+netdisco/mibs/cisco/CISCO-GSLB-HEALTH-MON-MIB.my
+netdisco/mibs/cisco/CISCO-GSLB-SYSTEM-MIB.my
+netdisco/mibs/cisco/CISCO-GSLB-TC-MIB.my
 netdisco/mibs/cisco/CISCO-GTP-DIRECTOR-MIB.my
 netdisco/mibs/cisco/CISCO-GTP-MIB.my
 netdisco/mibs/cisco/CISCO-H323-TC-MIB.my
+netdisco/mibs/cisco/CISCO-H324-DIAL-CONTROL-MIB.my
 netdisco/mibs/cisco/CISCO-HC-ALARM-MIB.my
 netdisco/mibs/cisco/CISCO-HEALTH-MONITOR-MIB.my
 netdisco/mibs/cisco/CISCO-HSRP-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-HSRP-MIB.my
 netdisco/mibs/cisco/CISCO-ICSUDSU-MIB.my
 netdisco/mibs/cisco/CISCO-IDSL-LINE-MIB.my
+netdisco/mibs/cisco/CISCO-IEEE8021-CFM-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-ATM2-PVCTRAP-MIB.my
+netdisco/mibs/cisco/CISCO-IETF-BFD-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-DHCP-SERVER-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-DHCP-SERVER-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-DOT11-QOS-EXT-MIB.my
@@ -359,6 +599,7 @@ netdisco/mibs/cisco/CISCO-IETF-IPMROUTE-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-ISIS-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-ISNS-MGMT-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-MEGACO-MIB.my
+netdisco/mibs/cisco/CISCO-IETF-MSDP-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-NAT-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-PIM-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-PIM-MIB.my
@@ -370,6 +611,9 @@ netdisco/mibs/cisco/CISCO-IETF-PW-TC-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-SCTP-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-SCTP-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-VDSL-LINE-MIB.my
+netdisco/mibs/cisco/CISCO-IETF-VPLS-BGP-EXT-MIB.my
+netdisco/mibs/cisco/CISCO-IETF-VPLS-GENERIC-MIB.my
+netdisco/mibs/cisco/CISCO-IETF-VPLS-LDP-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-VRRP-MIB.my
 netdisco/mibs/cisco/CISCO-IF-CALL-SERVICE-MIB.my
 netdisco/mibs/cisco/CISCO-IF-EXTENSION-MIB.my
@@ -386,13 +630,17 @@ netdisco/mibs/cisco/CISCO-IMAGE-CHECK-MIB.my
 netdisco/mibs/cisco/CISCO-IMAGE-MIB.my
 netdisco/mibs/cisco/CISCO-IMAGE-TC.my
 netdisco/mibs/cisco/CISCO-IMAGE-UPGRADE-MIB.my
+netdisco/mibs/cisco/CISCO-INTERFACETOPN-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-IP-ENCRYPTION-MIB.my
 netdisco/mibs/cisco/CISCO-IP-IF-MIB.my
 netdisco/mibs/cisco/CISCO-IP-LOCAL-POOL-MIB.my
 netdisco/mibs/cisco/CISCO-IP-NW-DISCOVERY-MIB.my
 netdisco/mibs/cisco/CISCO-IP-PROTOCOL-FILTER-MIB.my
+netdisco/mibs/cisco/CISCO-IP-RAN-BACKHAUL-MIB.my
 netdisco/mibs/cisco/CISCO-IP-STAT-MIB.my
+netdisco/mibs/cisco/CISCO-IP-TAP-MIB.my
 netdisco/mibs/cisco/CISCO-IP-UPLINK-REDIRECT-MIB.my
+netdisco/mibs/cisco/CISCO-IP-URPF-MIB.my
 netdisco/mibs/cisco/CISCO-IPMCAST-MIB.my
 netdisco/mibs/cisco/CISCO-IPMROUTE-MIB.my
 netdisco/mibs/cisco/CISCO-IPSEC-FLOW-MONITOR-MIB.my
@@ -401,6 +649,7 @@ netdisco/mibs/cisco/CISCO-IPSEC-POLICY-MAP-MIB.my
 netdisco/mibs/cisco/CISCO-IPSEC-PROVISIONING-MIB.my
 netdisco/mibs/cisco/CISCO-IPSEC-SIGNALING-MIB.my
 netdisco/mibs/cisco/CISCO-IPSEC-TC.my
+netdisco/mibs/cisco/CISCO-IPSLA-ETHERNET-MIB.my
 netdisco/mibs/cisco/CISCO-ISCSI-GW-MIB.my
 netdisco/mibs/cisco/CISCO-ISCSI-MIB.my
 netdisco/mibs/cisco/CISCO-ISDN-MIB.my
@@ -428,6 +677,7 @@ netdisco/mibs/cisco/CISCO-L2-CONTROL-MIB.my
 netdisco/mibs/cisco/CISCO-L2-DEV-MONITORING-MIB.my
 netdisco/mibs/cisco/CISCO-L2-TUNNEL-CONFIG-MIB.my
 netdisco/mibs/cisco/CISCO-L2L3-INTERFACE-CONFIG-MIB.my
+netdisco/mibs/cisco/CISCO-L4L7MODULE-REDUNDANCY-MIB.my
 netdisco/mibs/cisco/CISCO-L4L7MODULE-RESOURCE-LIMIT-MIB.my
 netdisco/mibs/cisco/CISCO-LAG-MIB.my
 netdisco/mibs/cisco/CISCO-LATITUDE-MIB.my
@@ -435,28 +685,46 @@ netdisco/mibs/cisco/CISCO-LEC-DATA-VCC-MIB.my
 netdisco/mibs/cisco/CISCO-LEC-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-LECS-MIB.my
 netdisco/mibs/cisco/CISCO-LES-MIB.my
+netdisco/mibs/cisco/CISCO-LICENSE-MGMT-MIB.my
 netdisco/mibs/cisco/CISCO-LICENSE-MGR-MIB.my
 netdisco/mibs/cisco/CISCO-LICENSE-MIB.my
 netdisco/mibs/cisco/CISCO-LINK-ERROR-MONITOR-MIB.my
 netdisco/mibs/cisco/CISCO-LOCAL-DIRECTOR-MIB.my
 netdisco/mibs/cisco/CISCO-LRE-CPE-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-AAA-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-ACL-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-AP-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-CCX-RM-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-CDP-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-CLIENT-ROAMING-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-DOT11-CLIENT-CALIB-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-DOT11-CLIENT-CCX-TC-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-DOT11-CLIENT-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-DOT11-LDAP-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-DOT11-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-IDS-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-LINKTEST-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-LOCAL-AUTH-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-MESH-BATTERY-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-MESH-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-MESH-STATS-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-MFP-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-MOBILITY-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-QOS-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-REAP-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-ROGUE-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-RRM-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-SYS-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-TC-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-TSM-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-WEBAUTH-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-WLAN-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-WLAN-SECURITY-MIB.my
+netdisco/mibs/cisco/CISCO-MAC-AUTH-BYPASS-MIB.my
 netdisco/mibs/cisco/CISCO-MAC-NOTIFICATION-MIB.my
 netdisco/mibs/cisco/CISCO-MAU-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-MEDIA-GATEWAY-MIB.my
+netdisco/mibs/cisco/CISCO-MEGACO-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-MEMORY-POOL-MIB.my
 netdisco/mibs/cisco/CISCO-METRO-PHY-MIB.my
 netdisco/mibs/cisco/CISCO-MGC-MIB.my
@@ -474,15 +742,19 @@ netdisco/mibs/cisco/CISCO-MGX82XX-RPM-SUBIF-MIB.my
 netdisco/mibs/cisco/CISCO-MGX82XX-VIRTUAL-PORT-MIB.my
 netdisco/mibs/cisco/CISCO-MGX8800-IF-MAPPING-MIB.my
 netdisco/mibs/cisco/CISCO-MMAIL-DIAL-CONTROL-MIB.my
+netdisco/mibs/cisco/CISCO-MMODAL-CONTACT-APPS-MIB.my
 netdisco/mibs/cisco/CISCO-MOBILE-IP-MIB.my
 netdisco/mibs/cisco/CISCO-MODEM-MGMT-MIB.my
 netdisco/mibs/cisco/CISCO-MODULE-AUTO-SHUTDOWN-MIB.my
 netdisco/mibs/cisco/CISCO-MODULE-VIRTUALIZATION-MIB.my
 netdisco/mibs/cisco/CISCO-MVPN-MIB.my
 netdisco/mibs/cisco/CISCO-NAC-NAD-MIB.my
+netdisco/mibs/cisco/CISCO-NAC-TC-MIB.my
+netdisco/mibs/cisco/CISCO-NAT-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-NBAR-PROTOCOL-DISCOVERY-MIB.my
 netdisco/mibs/cisco/CISCO-NDE-MIB.my
 netdisco/mibs/cisco/CISCO-NETFLOW-MIB.my
+netdisco/mibs/cisco/CISCO-NETINT-MIB.my
 netdisco/mibs/cisco/CISCO-NETWORK-REGISTRAR-MIB.my
 netdisco/mibs/cisco/CISCO-NMS-APPL-HEALTH-MIB.my
 netdisco/mibs/cisco/CISCO-NS-MIB.my
@@ -496,7 +768,10 @@ netdisco/mibs/cisco/CISCO-OPTICAL-PATCH-MIB.my
 netdisco/mibs/cisco/CISCO-OSCP-MIB.my
 netdisco/mibs/cisco/CISCO-OSPF-MIB.my
 netdisco/mibs/cisco/CISCO-OSPF-TRAP-MIB.my
+netdisco/mibs/cisco/CISCO-OTN-IF-MIB.my
 netdisco/mibs/cisco/CISCO-OUTAGE-MONITOR-MIB.my
+netdisco/mibs/cisco/CISCO-P2P-IF-MIB.my
+netdisco/mibs/cisco/CISCO-PACKET-CAPTURE-MIB.my
 netdisco/mibs/cisco/CISCO-PAE-MIB.my
 netdisco/mibs/cisco/CISCO-PAGP-MIB.my
 netdisco/mibs/cisco/CISCO-PIM-MIB.my
@@ -504,6 +779,7 @@ netdisco/mibs/cisco/CISCO-PING-MIB.my
 netdisco/mibs/cisco/CISCO-PKI-PARTICIPATION-MIB.my
 netdisco/mibs/cisco/CISCO-PNNI-MIB.my
 netdisco/mibs/cisco/CISCO-POE-PD-MIB.my
+netdisco/mibs/cisco/CISCO-POLICY-GROUP-MIB.my
 netdisco/mibs/cisco/CISCO-POP-MGMT-MIB.my
 netdisco/mibs/cisco/CISCO-PORT-CHANNEL-MIB.my
 netdisco/mibs/cisco/CISCO-PORT-QOS-MIB.my
@@ -512,6 +788,7 @@ netdisco/mibs/cisco/CISCO-PORT-STORM-CONTROL-MIB.my
 netdisco/mibs/cisco/CISCO-PORT-TRACK-MIB.my
 netdisco/mibs/cisco/CISCO-POWER-ETHERNET-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-PPPOE-MIB.my
+netdisco/mibs/cisco/CISCO-PREFERRED-PATH-MIB.my
 netdisco/mibs/cisco/CISCO-PRIVATE-VLAN-MIB.my
 netdisco/mibs/cisco/CISCO-PROCESS-MIB.my
 netdisco/mibs/cisco/CISCO-PRODUCTS-MIB.my
@@ -525,10 +802,12 @@ netdisco/mibs/cisco/CISCO-QINQ-VLAN-MIB.my
 netdisco/mibs/cisco/CISCO-QLLC01-MIB.my
 netdisco/mibs/cisco/CISCO-QOS-PIB-MIB.my
 netdisco/mibs/cisco/CISCO-QOS-POLICY-CONFIG-MIB.my
+netdisco/mibs/cisco/CISCO-QOS-TC-MIB.my
 netdisco/mibs/cisco/CISCO-QUEUE-MIB.my
 netdisco/mibs/cisco/CISCO-RADIUS-MIB.my
 netdisco/mibs/cisco/CISCO-REMOTE-ACCESS-MONITOR-MIB.my
 netdisco/mibs/cisco/CISCO-REPEATER-MIB.my
+netdisco/mibs/cisco/CISCO-RESILIENT-ETHERNET-PROTOCOL-MIB.my
 netdisco/mibs/cisco/CISCO-RF-MIB.my
 netdisco/mibs/cisco/CISCO-RF-SUPPLEMENTAL-MIB.my
 netdisco/mibs/cisco/CISCO-RHINO-MIB.my
@@ -537,6 +816,7 @@ netdisco/mibs/cisco/CISCO-RPMS-MIB.my
 netdisco/mibs/cisco/CISCO-RSCN-MIB.my
 netdisco/mibs/cisco/CISCO-RSRB-MIB.my
 netdisco/mibs/cisco/CISCO-RTTMON-ICMP-MIB.my
+netdisco/mibs/cisco/CISCO-RTTMON-IP-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-RTTMON-MIB.my
 netdisco/mibs/cisco/CISCO-RTTMON-RTP-MIB.my
 netdisco/mibs/cisco/CISCO-RTTMON-TC-MIB.my
@@ -548,6 +828,14 @@ netdisco/mibs/cisco/CISCO-SCTP-MIB.my
 netdisco/mibs/cisco/CISCO-SDLLC-MIB.my
 netdisco/mibs/cisco/CISCO-SDSL-LINE-MIB.my
 netdisco/mibs/cisco/CISCO-SECURE-SHELL-MIB.my
+netdisco/mibs/cisco/CISCO-SERVICE-CONTROL-ATTACK-MIB.my
+netdisco/mibs/cisco/CISCO-SERVICE-CONTROL-LINK-MIB.my
+netdisco/mibs/cisco/CISCO-SERVICE-CONTROL-RDR-MIB.my
+netdisco/mibs/cisco/CISCO-SERVICE-CONTROL-SUBSCRIBERS-MIB.my
+netdisco/mibs/cisco/CISCO-SERVICE-CONTROL-TP-STATS-MIB.my
+netdisco/mibs/cisco/CISCO-SERVICE-CONTROLLER-MIB.my
+netdisco/mibs/cisco/CISCO-SESS-BORDER-CTRLR-CALL-STATS-MIB.my
+netdisco/mibs/cisco/CISCO-SESS-BORDER-CTRLR-EVENT-MIB.my
 netdisco/mibs/cisco/CISCO-SIBU-FLASH-MIB.my
 netdisco/mibs/cisco/CISCO-SIBU-MANAGERS-MIB.my
 netdisco/mibs/cisco/CISCO-SIBU-STACKABLE-DUAL-SPEED-HUB-MIB.my
@@ -556,11 +844,13 @@ netdisco/mibs/cisco/CISCO-SLB-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-SLB-HEALTH-MON-MIB.my
 netdisco/mibs/cisco/CISCO-SLB-MIB.my
 netdisco/mibs/cisco/CISCO-SM-FILE-DOWNLOAD-MIB.my
+netdisco/mibs/cisco/CISCO-SME-MIB.my
 netdisco/mibs/cisco/CISCO-SMI.my
 netdisco/mibs/cisco/CISCO-SNA-LLC-MIB.my
 netdisco/mibs/cisco/CISCO-SNAPSHOT-MIB.my
 netdisco/mibs/cisco/CISCO-SNMP-NOTIFICATION-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-SNMP-TARGET-EXT-MIB.my
+netdisco/mibs/cisco/CISCO-SNMP-USM-OIDS-MIB.my
 netdisco/mibs/cisco/CISCO-SNMP-VACM-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-SONET-MIB.my
 netdisco/mibs/cisco/CISCO-SP-MIB.my
@@ -579,6 +869,9 @@ netdisco/mibs/cisco/CISCO-SVC-INTERFACE-MIB.my
 netdisco/mibs/cisco/CISCO-SVI-AUTOSTATE-MIB.my
 netdisco/mibs/cisco/CISCO-SWITCH-CGMP-MIB.my
 netdisco/mibs/cisco/CISCO-SWITCH-ENGINE-MIB.my
+netdisco/mibs/cisco/CISCO-SWITCH-HARDWARE-CAPACITY-MIB.my
+netdisco/mibs/cisco/CISCO-SWITCH-MULTICAST-MIB.my
+netdisco/mibs/cisco/CISCO-SWITCH-QOS-MIB.my
 netdisco/mibs/cisco/CISCO-SWITCH-USAGE-MIB.my
 netdisco/mibs/cisco/CISCO-SYS-INFO-LOG-MIB.my
 netdisco/mibs/cisco/CISCO-SYSLOG-EVENT-EXT-MIB.my
@@ -593,6 +886,9 @@ netdisco/mibs/cisco/CISCO-TC-NO-U32.my
 netdisco/mibs/cisco/CISCO-TC.my
 netdisco/mibs/cisco/CISCO-TCP-MIB.my
 netdisco/mibs/cisco/CISCO-TCPOFFLOAD-MIB.my
+netdisco/mibs/cisco/CISCO-TELEPRESENCE-CALL-MIB.my
+netdisco/mibs/cisco/CISCO-TELEPRESENCE-MIB.my
+netdisco/mibs/cisco/CISCO-TELNET-SERVER-MIB.my
 netdisco/mibs/cisco/CISCO-TN3270SERVER-MIB.my
 netdisco/mibs/cisco/CISCO-TPC-MIB.my
 netdisco/mibs/cisco/CISCO-TRANSACTION-CONNECTION-MIB.my
@@ -600,8 +896,10 @@ netdisco/mibs/cisco/CISCO-TS-STACK-MIB.my
 netdisco/mibs/cisco/CISCO-UDLDP-MIB.my
 netdisco/mibs/cisco/CISCO-UNIFIED-FIREWALL-MIB.my
 netdisco/mibs/cisco/CISCO-UNITY-EXPRESS-MIB.my
+netdisco/mibs/cisco/CISCO-USER-CONNECTION-TAP-MIB.my
 netdisco/mibs/cisco/CISCO-VINES-MIB.my
 netdisco/mibs/cisco/CISCO-VIRTUAL-NW-IF-MIB.my
+netdisco/mibs/cisco/CISCO-VIRTUAL-SWITCH-MIB.my
 netdisco/mibs/cisco/CISCO-VISM-ATM-TRUNK-MIB.my
 netdisco/mibs/cisco/CISCO-VISM-CAC-MIB.my
 netdisco/mibs/cisco/CISCO-VISM-CAS-MIB.my
@@ -618,12 +916,13 @@ netdisco/mibs/cisco/CISCO-VISM-SESSION-MIB.my
 netdisco/mibs/cisco/CISCO-VISM-SVC-MIB.my
 netdisco/mibs/cisco/CISCO-VISM-TRAPS-MIB.my
 netdisco/mibs/cisco/CISCO-VISM-XGCP-EXT.my
-netdisco/mibs/cisco/CISCO-VLAN-BRIDGE-MIB.my
+netdisco/mibs/cisco/CISCO-VLAN-BRIDGING-MIB.my
 netdisco/mibs/cisco/CISCO-VLAN-IFTABLE-RELATIONSHIP-MIB.my
 netdisco/mibs/cisco/CISCO-VLAN-MEMBERSHIP-MIB.my
 netdisco/mibs/cisco/CISCO-VLAN-TRANSLATION-MIB.my
 netdisco/mibs/cisco/CISCO-VMPS-MIB.my
 netdisco/mibs/cisco/CISCO-VOA-MIB.my
+netdisco/mibs/cisco/CISCO-VOICE-AALX-PROFILE-MIB.my
 netdisco/mibs/cisco/CISCO-VOICE-ANALOG-IF-MIB.my
 netdisco/mibs/cisco/CISCO-VOICE-APPLICATIONS-OID-MIB.my
 netdisco/mibs/cisco/CISCO-VOICE-APPS-MIB.my
@@ -644,6 +943,7 @@ netdisco/mibs/cisco/CISCO-VSAN-MIB.my
 netdisco/mibs/cisco/CISCO-VSI-CONTROLLER-MIB.my
 netdisco/mibs/cisco/CISCO-VSIMASTER-MIB.my
 netdisco/mibs/cisco/CISCO-VTP-MIB.my
+netdisco/mibs/cisco/CISCO-WAN-3G-MIB.my
 netdisco/mibs/cisco/CISCO-WAN-AAL2-PROFILES-MIB.my
 netdisco/mibs/cisco/CISCO-WAN-ANNOUNCEMENT-MIB.my
 netdisco/mibs/cisco/CISCO-WAN-ATM-CONN-MIB.my
@@ -709,22 +1009,36 @@ netdisco/mibs/cisco/CISCO-ZS-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-ZS-MIB.my
 netdisco/mibs/cisco/CISCOWAN-SMI.my
 netdisco/mibs/cisco/CISCOWORKS-MIB.my
+netdisco/mibs/cisco/CLAB-DEF-MIB.my
+netdisco/mibs/cisco/CLAB-TOPO-MIB.my
 netdisco/mibs/cisco/COMPAT-MIB.my
 netdisco/mibs/cisco/DOCS-BPI-PLUS-MIB.my
 netdisco/mibs/cisco/DOCS-CABLE-DEVICE-TRAP-MIB.my
+netdisco/mibs/cisco/DOCS-DIAG-MIB.my
+netdisco/mibs/cisco/DOCS-DRF-MIB.my
+netdisco/mibs/cisco/DOCS-DSG-IF-MIB.my
 netdisco/mibs/cisco/DOCS-IF-EXT-MIB.my
+netdisco/mibs/cisco/DOCS-IF3-MIB.my
+netdisco/mibs/cisco/DOCS-IFEXT2-MIB.my
+netdisco/mibs/cisco/DOCS-L2VPN-MIB.my
 netdisco/mibs/cisco/DOCS-QOS-MIB.my
+netdisco/mibs/cisco/DOCS-QOS3-MIB.my
 netdisco/mibs/cisco/DOCS-SUBMGT-MIB.my
+netdisco/mibs/cisco/DOCS-TEST-MIB.my
 netdisco/mibs/cisco/ERR-STATUS-MIB.my
 netdisco/mibs/cisco/ESMODULE-MIB.my
 netdisco/mibs/cisco/ESSWITCH-MIB.my
 netdisco/mibs/cisco/ETHERLIKE-MIB.my
 netdisco/mibs/cisco/EXPRESSION-MIB.my
 netdisco/mibs/cisco/GENERICOBJECT-MIB.my
-netdisco/mibs/cisco/IBM-6611-APPN-MIB.my
+netdisco/mibs/cisco/IEEE-802DOT17-RPR-MIB.my
+netdisco/mibs/cisco/IEEE8021-CFM-MIB.my
+netdisco/mibs/cisco/IEEE8021-CFM-V2-MIB.my
+netdisco/mibs/cisco/IEEE8021-TC-MIB.my
 netdisco/mibs/cisco/IGMP-MIB.my
 netdisco/mibs/cisco/IMA-MIB.my
 netdisco/mibs/cisco/IPMROUTE-MIB.my
+netdisco/mibs/cisco/ISIS-CAPABILTY-MIB.my
 netdisco/mibs/cisco/LAN-EMULATION-CLIENT-MIB.my
 netdisco/mibs/cisco/LANOPTICS-ALERTS-MIB.my
 netdisco/mibs/cisco/LANOPTICS-BRIDGE-OPTION-MIB.my
@@ -737,7 +1051,6 @@ netdisco/mibs/cisco/LS2020-R2-MIB.my
 netdisco/mibs/cisco/MADGEBOX-MIB.my
 netdisco/mibs/cisco/MADGERSW-MIB.my
 netdisco/mibs/cisco/METRO1500-MIB.my
-netdisco/mibs/cisco/MPLS-L3VPN-STD-MIB.my
 netdisco/mibs/cisco/MPLS-LDP-MIB.my
 netdisco/mibs/cisco/MPLS-LSR-MIB.my
 netdisco/mibs/cisco/MPLS-TE-MIB.my
@@ -777,6 +1090,14 @@ netdisco/mibs/cisco/v1-readme
 netdisco/mibs/cisco/v2-readme
 netdisco/mibs/cisco1.diff
 netdisco/mibs/cisco2.diff
+netdisco/mibs/cisco_remove
+netdisco/mibs/cyclades/CYCLADES-ACS-ADM-MIB.mib
+netdisco/mibs/cyclades/CYCLADES-ACS-CONF-MIB.mib
+netdisco/mibs/cyclades/CYCLADES-ACS-INFO-MIB.mib
+netdisco/mibs/cyclades/CYCLADES-ACS-MIB.mib
+netdisco/mibs/cyclades/CYCLADES-ACS-PM-MIB.mib
+netdisco/mibs/cyclades/CYCLADES-ACS-SYS-MIB.mib
+netdisco/mibs/cyclades/CYCLADES-MIB.mib
 netdisco/mibs/dell/apollo.mib
 netdisco/mibs/dell/dell_ita.mib
 netdisco/mibs/dell/env_mib.mib
@@ -812,10 +1133,70 @@ netdisco/mibs/dell/rludp.mib
 netdisco/mibs/dell/rlvlan.mib
 netdisco/mibs/dell/trunk.mib
 netdisco/mibs/diff_dir
+netdisco/mibs/enterasys/enterasys-8021x-extensions-mib.txt
+netdisco/mibs/enterasys/enterasys-8021x-rekeying-mib.txt
+netdisco/mibs/enterasys/enterasys-802dot11ext.txt
+netdisco/mibs/enterasys/enterasys-R2Management.txt
+netdisco/mibs/enterasys/enterasys-aaa-policy-mib.txt
+netdisco/mibs/enterasys/enterasys-activation-mib.txt
+netdisco/mibs/enterasys/enterasys-class-of-service-mib.txt
+netdisco/mibs/enterasys/enterasys-configuration-change-mib.txt
+netdisco/mibs/enterasys/enterasys-configuration-management-mib.txt
+netdisco/mibs/enterasys/enterasys-convergence-end-point-mib.txt
+netdisco/mibs/enterasys/enterasys-diagnostic-message-mib.txt
+netdisco/mibs/enterasys/enterasys-encr-8021x-config-mib.txt
+netdisco/mibs/enterasys/enterasys-encr-8021x-rekeying-mib.txt
+netdisco/mibs/enterasys/enterasys-eswitch-mib.txt
+netdisco/mibs/enterasys/enterasys-firewall-mib.txt
+netdisco/mibs/enterasys/enterasys-flow-limiting-mib.txt
+netdisco/mibs/enterasys/enterasys-ieee8023-lag-mib-ext-mib.txt
+netdisco/mibs/enterasys/enterasys-ietf-bridge-mib-ext-mib.txt
+netdisco/mibs/enterasys/enterasys-ietf-p-bridge-mib-ext-mib.txt
+netdisco/mibs/enterasys/enterasys-if-mib-ext-mib.txt
+netdisco/mibs/enterasys/enterasys-image-validation-mib.txt
+netdisco/mibs/enterasys/enterasys-jumbo-ethernet-frame-mib.txt
+netdisco/mibs/enterasys/enterasys-license-key-mib.txt
+netdisco/mibs/enterasys/enterasys-license-key-oids-mib.txt
+netdisco/mibs/enterasys/enterasys-link-flap-mib.txt
+netdisco/mibs/enterasys/enterasys-mac-authentication-mib.txt
+netdisco/mibs/enterasys/enterasys-mac-locking-mib.txt
+netdisco/mibs/enterasys/enterasys-mau-mib-ext-mib.txt
+netdisco/mibs/enterasys/enterasys-mgmt-auth-notification-mib.txt
+netdisco/mibs/enterasys/enterasys-mib-names.mib.txt
+netdisco/mibs/enterasys/enterasys-mib-org.mib.txt
+netdisco/mibs/enterasys/enterasys-mstp-mib.txt
+netdisco/mibs/enterasys/enterasys-multi-auth-mib.txt
+netdisco/mibs/enterasys/enterasys-multi-user-8021x-mib.txt
+netdisco/mibs/enterasys/enterasys-netflow-mib.txt
+netdisco/mibs/enterasys/enterasys-oids-mib.txt
+netdisco/mibs/enterasys/enterasys-policy-profile-mib.txt
+netdisco/mibs/enterasys/enterasys-power-ethernet-mib-ext-mib.txt
+netdisco/mibs/enterasys/enterasys-pwa-mib.txt
+netdisco/mibs/enterasys/enterasys-radius-acct-client-ext-mib.txt
+netdisco/mibs/enterasys/enterasys-radius-auth-client-encrypt-mib.txt
+netdisco/mibs/enterasys/enterasys-radius-auth-client-mib.txt
+netdisco/mibs/enterasys/enterasys-resource-utilization-mib.txt
+netdisco/mibs/enterasys/enterasys-secure-shell-server-mib.txt
+netdisco/mibs/enterasys/enterasys-service-level-reporting-mib.txt
+netdisco/mibs/enterasys/enterasys-snmp-persistence-mib.txt
+netdisco/mibs/enterasys/enterasys-sntp-client-mib.txt
+netdisco/mibs/enterasys/enterasys-spanning-tree-diagnostic-mib.txt
+netdisco/mibs/enterasys/enterasys-ssh-server-mib.txt
+netdisco/mibs/enterasys/enterasys-syslog-client-mib.txt
+netdisco/mibs/enterasys/enterasys-threat-notification-mib.txt
+netdisco/mibs/enterasys/enterasys-tls-mib.txt
+netdisco/mibs/enterasys/enterasys-upn-tc-mib.txt
+netdisco/mibs/enterasys/enterasys-vlan-authorization-mib.txt
+netdisco/mibs/enterasys/enterasys-vlan-interface-mib.txt
+netdisco/mibs/enterasys/enterasys-wifi-protected-access-mib.txt
 netdisco/mibs/extreme/extreme-base.mib
+netdisco/mibs/extreme/extreme-cable.mib
 netdisco/mibs/extreme/extreme-dlcs.mib
+netdisco/mibs/extreme/extreme-dos.mib
 netdisco/mibs/extreme/extreme-eaps.mib
 netdisco/mibs/extreme/extreme-edp.mib
+netdisco/mibs/extreme/extreme-enh-dos.mib
+netdisco/mibs/extreme/extreme-entity.mib
 netdisco/mibs/extreme/extreme-esrp.mib
 netdisco/mibs/extreme/extreme-fdb.mib
 netdisco/mibs/extreme/extreme-filetransfer.mib
@@ -831,6 +1212,7 @@ netdisco/mibs/extreme/extreme-rtstats.mib
 netdisco/mibs/extreme/extreme-services.mib
 netdisco/mibs/extreme/extreme-slb.mib
 netdisco/mibs/extreme/extreme-snmpv3.mib
+netdisco/mibs/extreme/extreme-stacking.mib
 netdisco/mibs/extreme/extreme-stp-extensions.mib
 netdisco/mibs/extreme/extreme-system.mib
 netdisco/mibs/extreme/extreme-trap.mib
@@ -838,6 +1220,9 @@ netdisco/mibs/extreme/extreme-trappoll.mib
 netdisco/mibs/extreme/extreme-v2trap.mib
 netdisco/mibs/extreme/extreme-vc.mib
 netdisco/mibs/extreme/extreme-vlan.mib
+netdisco/mibs/extreme/extreme-wireless.mib
+netdisco/mibs/extreme/extremedot11ap.mib
+netdisco/mibs/extreme/extremedot11f.mib
 netdisco/mibs/foundry/FOUNDRY-CAR-MIB.mib
 netdisco/mibs/foundry/FOUNDRY-SN-AGENT-MIB.mib
 netdisco/mibs/foundry/FOUNDRY-SN-APPLETALK-MIB.mib
@@ -857,6 +1242,9 @@ netdisco/mibs/foundry/FOUNDRY-SN-TRAP-MIB.mib
 netdisco/mibs/foundry/FOUNDRY-SN-VSRP-MIB.mib
 netdisco/mibs/foundry/FOUNDRY-SN-WIRELESS-GROUP-MIB.mib
 netdisco/mibs/foundry/FOUNDRY-VLAN-CAR-MIB.mib
+netdisco/mibs/foundry/foundry-sn-mac-authentication.mib
+netdisco/mibs/foundry/foundry-sn-mac-vlan.mib
+netdisco/mibs/foundry/foundry-sn-mrp.mib
 netdisco/mibs/hp/h2r07604c.mib
 netdisco/mibs/hp/hp-sn-agent.mib
 netdisco/mibs/hp/hp-sn-appletalk.mib
@@ -876,6 +1264,9 @@ netdisco/mibs/hp/hpacmxlsystem.mib
 netdisco/mibs/hp/hpentmib.mib
 netdisco/mibs/hp/hphttpmg.mib
 netdisco/mibs/hp/hpicf8023rptr.mib
+netdisco/mibs/hp/hpicfarpprotect.mib
+netdisco/mibs/hp/hpicfautorun.mib
+netdisco/mibs/hp/hpicfautz.mib
 netdisco/mibs/hp/hpicfbasic.mib
 netdisco/mibs/hp/hpicfbridge.mib
 netdisco/mibs/hp/hpicfchain.mib
@@ -886,21 +1277,30 @@ netdisco/mibs/hp/hpicfdownload.mib
 netdisco/mibs/hp/hpicfetwist.mib
 netdisco/mibs/hp/hpicfff.mib
 netdisco/mibs/hp/hpicfgenrptr.mib
+netdisco/mibs/hp/hpicfgppc.mib
+netdisco/mibs/hp/hpicfhighavailability.mib
+netdisco/mibs/hp/hpicfinstmon.mib
 netdisco/mibs/hp/hpicfipaddress.mib
 netdisco/mibs/hp/hpicfiproute.mib
 netdisco/mibs/hp/hpicfjumbo.mib
+netdisco/mibs/hp/hpicfl3macconfig.mib
 netdisco/mibs/hp/hpicflinktest.mib
+netdisco/mibs/hp/hpicfmld.mib
 netdisco/mibs/hp/hpicfoid.mib
 netdisco/mibs/hp/hpicfospf.mib
 netdisco/mibs/hp/hpicfpim.mib
+netdisco/mibs/hp/hpicfproviderbridge.mib
 netdisco/mibs/hp/hpicfratelimit.mib
 netdisco/mibs/hp/hpicfrip.mib
 netdisco/mibs/hp/hpicfsecurity.mib
+netdisco/mibs/hp/hpicfsnmp.mib
 netdisco/mibs/hp/hpicfsntp.mib
 netdisco/mibs/hp/hpicfstack.mib
 netdisco/mibs/hp/hpicftc.mib
+netdisco/mibs/hp/hpicfudld.mib
 netdisco/mibs/hp/hpicfudpforward.mib
 netdisco/mibs/hp/hpicfusrauth.mib
+netdisco/mibs/hp/hpicfusrprof.mib
 netdisco/mibs/hp/hpicfvg.mib
 netdisco/mibs/hp/hpicfvgrptr.mib
 netdisco/mibs/hp/hpicfvrrp.mib
@@ -915,8 +1315,8 @@ netdisco/mibs/hp/hpswitchstat.mib
 netdisco/mibs/hp/hpvlan.mib
 netdisco/mibs/hp/ipx.mib
 netdisco/mibs/hp/orinoco.mib
-netdisco/mibs/hp/sflow.mib
 netdisco/mibs/hp1.diff
+netdisco/mibs/ianalist
 netdisco/mibs/juniper/mib-jnx-atm-cos.txt
 netdisco/mibs/juniper/mib-jnx-atm.txt
 netdisco/mibs/juniper/mib-jnx-bgpmib2.txt
@@ -957,8 +1357,10 @@ netdisco/mibs/net-snmp/NET-SNMP-EXAMPLES-MIB.txt
 netdisco/mibs/net-snmp/NET-SNMP-EXTEND-MIB.txt
 netdisco/mibs/net-snmp/NET-SNMP-MIB.txt
 netdisco/mibs/net-snmp/NET-SNMP-MONITOR-MIB.txt
+netdisco/mibs/net-snmp/NET-SNMP-PASS-MIB.txt
 netdisco/mibs/net-snmp/NET-SNMP-SYSTEM-MIB.txt
 netdisco/mibs/net-snmp/NET-SNMP-TC.txt
+netdisco/mibs/net-snmp/NET-SNMP-VACM-MIB.txt
 netdisco/mibs/net-snmp/RFC-1215.txt
 netdisco/mibs/net-snmp/UCD-DEMO-MIB.txt
 netdisco/mibs/net-snmp/UCD-DISKIO-MIB.txt
@@ -974,23 +1376,40 @@ netdisco/mibs/netscreen/NETSCREEN-PRODUCTS-MIB.mib
 netdisco/mibs/netscreen/NETSCREEN-RESOURCE-MIB.mib
 netdisco/mibs/netscreen/NETSCREEN-SET-GEN-MIB.mib
 netdisco/mibs/netscreen/NETSCREEN-SMI.mib
+netdisco/mibs/nortel.diff
 netdisco/mibs/nortel/AAC.mib
 netdisco/mibs/nortel/CSMACD.MIB
 netdisco/mibs/nortel/Commgmt.mib
 netdisco/mibs/nortel/HARDWARE.MIB
 netdisco/mibs/nortel/L2mgmt.mib
 netdisco/mibs/nortel/L3mgmt.mib
+netdisco/mibs/nortel/MODULE.MIB
 netdisco/mibs/nortel/OSPF.MIB
 netdisco/mibs/nortel/PriL3mgmt.mib
 netdisco/mibs/nortel/SSH.mib
 netdisco/mibs/nortel/TAG1Q.MIB
 netdisco/mibs/nortel/WFCOMMON.MIB
-netdisco/mibs/nortel/WSS2270-SW20-switching.mib
 netdisco/mibs/nortel/altroot.mib
+netdisco/mibs/nortel/aosbwm.mib
+netdisco/mibs/nortel/aoslayer4.mib
+netdisco/mibs/nortel/aoslayer7.mib
+netdisco/mibs/nortel/aosnetwork.mib
+netdisco/mibs/nortel/aosphysical.mib
+netdisco/mibs/nortel/aosswitch.mib
+netdisco/mibs/nortel/baystack.mib
 netdisco/mibs/nortel/baystackadac.mib
+netdisco/mibs/nortel/baystackarpinspection.mib
+netdisco/mibs/nortel/baystackdhcpsnooping.mib
+netdisco/mibs/nortel/baystackecmp.mib
+netdisco/mibs/nortel/baystackerrormessage.mib
 netdisco/mibs/nortel/baystacklacpext.mib
 netdisco/mibs/nortel/baystackmulticastflooding.mib
+netdisco/mibs/nortel/baystackospfext.mib
 netdisco/mibs/nortel/baystackpethext.mib
+netdisco/mibs/nortel/baystackradius.mib
+netdisco/mibs/nortel/baystacksourceguard.mib
+netdisco/mibs/nortel/baystackstats.mib
+netdisco/mibs/nortel/baystackvrrpext.mib
 netdisco/mibs/nortel/bayxlr.mib
 netdisco/mibs/nortel/bnlog.mib
 netdisco/mibs/nortel/bsee.mib
@@ -1002,8 +1421,10 @@ netdisco/mibs/nortel/dvmrp.mib
 netdisco/mibs/nortel/mcast201.mib
 netdisco/mibs/nortel/nnmst.mib
 netdisco/mibs/nortel/nnrst.mib
+netdisco/mibs/nortel/nortelsecurenetworkaccess.mib
 netdisco/mibs/nortel/ntwlanap006.mib
 netdisco/mibs/nortel/rapid_city.mib
+netdisco/mibs/nortel/rcmlt.mib
 netdisco/mibs/nortel/s3com.mib
 netdisco/mibs/nortel/s3eth.mib
 netdisco/mibs/nortel/s5age.mib
@@ -1028,7 +1449,10 @@ netdisco/mibs/rfc/ACCOUNTING-CONTROL-MIB.txt
 netdisco/mibs/rfc/ADSL-LINE-EXT-MIB.txt
 netdisco/mibs/rfc/ADSL-LINE-MIB.txt
 netdisco/mibs/rfc/ADSL-TC-MIB.txt
+netdisco/mibs/rfc/ADSL2-LINE-MIB.txt
+netdisco/mibs/rfc/ADSL2-LINE-TC-MIB.txt
 netdisco/mibs/rfc/AGENTX-MIB.txt
+netdisco/mibs/rfc/AGGREGATE-MIB.txt
 netdisco/mibs/rfc/ALARM-MIB.txt
 netdisco/mibs/rfc/APM-MIB.txt
 netdisco/mibs/rfc/APPC-MIB.txt
@@ -1068,16 +1492,23 @@ netdisco/mibs/rfc/DNS-SERVER-MIB.txt
 netdisco/mibs/rfc/DOCS-BPI-MIB.txt
 netdisco/mibs/rfc/DOCS-CABLE-DEVICE-MIB.txt
 netdisco/mibs/rfc/DOCS-IETF-BPI2-MIB.txt
+netdisco/mibs/rfc/DOCS-IETF-CABLE-DEVICE-NOTIFICATION-MIB.txt
+netdisco/mibs/rfc/DOCS-IETF-QOS-MIB.txt
 netdisco/mibs/rfc/DOCS-IETF-SUBMGT-MIB.txt
 netdisco/mibs/rfc/DOCS-IF-MIB.txt
 netdisco/mibs/rfc/DOT12-IF-MIB.txt
 netdisco/mibs/rfc/DOT12-RPTR-MIB.txt
+netdisco/mibs/rfc/DOT3-EPON-MIB.txt
+netdisco/mibs/rfc/DOT3-OAM-MIB.txt
+netdisco/mibs/rfc/DPI20-MIB.txt
 netdisco/mibs/rfc/DS0-MIB.txt
 netdisco/mibs/rfc/DS0BUNDLE-MIB.txt
 netdisco/mibs/rfc/DS1-MIB.txt
 netdisco/mibs/rfc/DS3-MIB.txt
 netdisco/mibs/rfc/DSA-MIB.txt
+netdisco/mibs/rfc/DSMON-MIB.txt
 netdisco/mibs/rfc/EBN-MIB.txt
+netdisco/mibs/rfc/EFM-CU-MIB.txt
 netdisco/mibs/rfc/ENTITY-MIB.txt
 netdisco/mibs/rfc/ENTITY-SENSOR-MIB.txt
 netdisco/mibs/rfc/ENTITY-STATE-MIB.txt
@@ -1086,6 +1517,7 @@ netdisco/mibs/rfc/ETHER-CHIPSET-MIB.txt
 netdisco/mibs/rfc/ETHER-WIS.txt
 netdisco/mibs/rfc/EtherLike-MIB.txt
 netdisco/mibs/rfc/FC-MGMT-MIB.txt
+netdisco/mibs/rfc/FCIP-MGMT-MIB.txt
 netdisco/mibs/rfc/FDDI-SMT73-MIB.txt
 netdisco/mibs/rfc/FIBRE-CHANNEL-FE-MIB.txt
 netdisco/mibs/rfc/FLOW-METER-MIB.txt
@@ -1095,6 +1527,10 @@ netdisco/mibs/rfc/FRAME-RELAY-DTE-MIB.txt
 netdisco/mibs/rfc/FRNETSERV-MIB.txt
 netdisco/mibs/rfc/FRSLD-MIB.txt
 netdisco/mibs/rfc/Finisher-MIB.txt
+netdisco/mibs/rfc/GMPLS-LABEL-STD-MIB.txt
+netdisco/mibs/rfc/GMPLS-LSR-STD-MIB.txt
+netdisco/mibs/rfc/GMPLS-TC-STD-MIB.txt
+netdisco/mibs/rfc/GMPLS-TE-STD-MIB.txt
 netdisco/mibs/rfc/GSMP-MIB.txt
 netdisco/mibs/rfc/HC-ALARM-MIB.txt
 netdisco/mibs/rfc/HC-PerfHist-TC-MIB.txt
@@ -1108,18 +1544,23 @@ netdisco/mibs/rfc/HPR-MIB.txt
 netdisco/mibs/rfc/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
 netdisco/mibs/rfc/IANA-CHARSET-MIB.txt
 netdisco/mibs/rfc/IANA-FINISHER-MIB.txt
+netdisco/mibs/rfc/IANA-GMPLS-TC-MIB.txt
 netdisco/mibs/rfc/IANA-ITU-ALARM-TC-MIB.txt
 netdisco/mibs/rfc/IANA-LANGUAGE-MIB.txt
 netdisco/mibs/rfc/IANA-MALLOC-MIB.txt
+netdisco/mibs/rfc/IANA-MAU-MIB.txt
 netdisco/mibs/rfc/IANA-PRINTER-MIB.txt
 netdisco/mibs/rfc/IANA-RTPROTO-MIB.txt
 netdisco/mibs/rfc/IANATn3270eTC-MIB.txt
 netdisco/mibs/rfc/IANAifType-MIB.txt
+netdisco/mibs/rfc/IBM-6611-APPN-MIB.txt
 netdisco/mibs/rfc/IEEE8021-PAE-MIB.my
 netdisco/mibs/rfc/IEEE8023-LAG-MIB.my
 netdisco/mibs/rfc/IEEE802dot11-MIB.my
+netdisco/mibs/rfc/IF-CAP-STACK-MIB.txt
 netdisco/mibs/rfc/IF-INVERTED-STACK-MIB.txt
 netdisco/mibs/rfc/IF-MIB.txt
+netdisco/mibs/rfc/IFCP-MGMT-MIB.txt
 netdisco/mibs/rfc/IGMP-STD-MIB.txt
 netdisco/mibs/rfc/INET-ADDRESS-MIB.txt
 netdisco/mibs/rfc/INT-SERV-GUARANTEED-MIB.my
@@ -1130,8 +1571,11 @@ netdisco/mibs/rfc/INTERFACETOPN-MIB.txt
 netdisco/mibs/rfc/IP-FORWARD-MIB.txt
 netdisco/mibs/rfc/IP-MIB.txt
 netdisco/mibs/rfc/IPATM-IPMC-MIB.txt
+netdisco/mibs/rfc/IPMCAST-MIB.txt
 netdisco/mibs/rfc/IPMROUTE-STD-MIB.txt
 netdisco/mibs/rfc/IPOA-MIB.txt
+netdisco/mibs/rfc/IPS-AUTH-MIB.txt
+netdisco/mibs/rfc/IPSEC-SPD-MIB.txt
 netdisco/mibs/rfc/IPV6-FLOW-LABEL-MIB.txt
 netdisco/mibs/rfc/IPV6-ICMP-MIB.txt
 netdisco/mibs/rfc/IPV6-MIB.txt
@@ -1139,16 +1583,27 @@ netdisco/mibs/rfc/IPV6-MLD-MIB.txt
 netdisco/mibs/rfc/IPV6-TC.txt
 netdisco/mibs/rfc/IPV6-TCP-MIB.txt
 netdisco/mibs/rfc/IPV6-UDP-MIB.txt
+netdisco/mibs/rfc/ISCSI-MIB.txt
 netdisco/mibs/rfc/ISDN-MIB.txt
+netdisco/mibs/rfc/ISIS-MIB.txt
+netdisco/mibs/rfc/ISNS-MIB.txt
 netdisco/mibs/rfc/ITU-ALARM-MIB.txt
 netdisco/mibs/rfc/ITU-ALARM-TC-MIB.txt
 netdisco/mibs/rfc/Job-Monitoring-MIB.txt
 netdisco/mibs/rfc/L2TP-MIB.txt
+netdisco/mibs/rfc/LANGTAG-TC-MIB.txt
+netdisco/mibs/rfc/LMP-MIB.txt
 netdisco/mibs/rfc/MALLOC-MIB.txt
 netdisco/mibs/rfc/MAU-MIB.txt
+netdisco/mibs/rfc/MGMD-STD-MIB.txt
+netdisco/mibs/rfc/MIDCOM-MIB.txt
 netdisco/mibs/rfc/MIOX25-MIB.txt
 netdisco/mibs/rfc/MIP-MIB.txt
+netdisco/mibs/rfc/MOBILEIPV6-MIB.txt
 netdisco/mibs/rfc/MPLS-FTN-STD-MIB.txt
+netdisco/mibs/rfc/MPLS-L3VPN-STD-MIB.txt
+netdisco/mibs/rfc/MPLS-LC-ATM-STD-MIB.txt
+netdisco/mibs/rfc/MPLS-LC-FR-STD-MIB.txt
 netdisco/mibs/rfc/MPLS-LDP-ATM-STD-MIB.txt
 netdisco/mibs/rfc/MPLS-LDP-FRAME-RELAY-STD-MIB.txt
 netdisco/mibs/rfc/MPLS-LDP-GENERIC-STD-MIB.txt
@@ -1156,9 +1611,11 @@ netdisco/mibs/rfc/MPLS-LDP-STD-MIB.txt
 netdisco/mibs/rfc/MPLS-LSR-STD-MIB.txt
 netdisco/mibs/rfc/MPLS-TC-STD-MIB.txt
 netdisco/mibs/rfc/MPLS-TE-STD-MIB.txt
+netdisco/mibs/rfc/MSDP-MIB.txt
 netdisco/mibs/rfc/MTA-MIB.txt
 netdisco/mibs/rfc/Modem-MIB.txt
 netdisco/mibs/rfc/NAT-MIB.txt
+netdisco/mibs/rfc/NEMO-MIB.txt
 netdisco/mibs/rfc/NETWORK-SERVICES-MIB.txt
 netdisco/mibs/rfc/NHRP-MIB.txt
 netdisco/mibs/rfc/NOTIFICATION-LOG-MIB.txt
@@ -1167,8 +1624,13 @@ netdisco/mibs/rfc/OSPF-MIB.txt
 netdisco/mibs/rfc/OSPF-TRAP-MIB.txt
 netdisco/mibs/rfc/P-BRIDGE-MIB.txt
 netdisco/mibs/rfc/PARALLEL-MIB.txt
+netdisco/mibs/rfc/PIM-BSR-MIB.txt
 netdisco/mibs/rfc/PIM-MIB.txt
+netdisco/mibs/rfc/PIM-STD-MIB.txt
 netdisco/mibs/rfc/PINT-MIB.txt
+netdisco/mibs/rfc/PKTC-IETF-EVENT-MIB.txt
+netdisco/mibs/rfc/PKTC-IETF-MTA-MIB.txt
+netdisco/mibs/rfc/PKTC-IETF-SIG-MIB.txt
 netdisco/mibs/rfc/POLICY-BASED-MANAGEMENT-MIB.txt
 netdisco/mibs/rfc/POWER-ETHERNET-MIB.txt
 netdisco/mibs/rfc/PPP-BRIDGE-NCP-MIB.txt
@@ -1183,6 +1645,10 @@ netdisco/mibs/rfc/RADIUS-ACC-CLIENT-MIB.txt
 netdisco/mibs/rfc/RADIUS-ACC-SERVER-MIB.txt
 netdisco/mibs/rfc/RADIUS-AUTH-CLIENT-MIB.txt
 netdisco/mibs/rfc/RADIUS-AUTH-SERVER-MIB.txt
+netdisco/mibs/rfc/RADIUS-DYNAUTH-CLIENT-MIB.txt
+netdisco/mibs/rfc/RADIUS-DYNAUTH-SERVER-MIB.txt
+netdisco/mibs/rfc/RAQMON-MIB.txt
+netdisco/mibs/rfc/RAQMON-RDS-MIB.txt
 netdisco/mibs/rfc/RDBMS-MIB.txt
 netdisco/mibs/rfc/RFC1155-SMI.txt
 netdisco/mibs/rfc/RFC1213-MIB.txt
@@ -1204,10 +1670,18 @@ netdisco/mibs/rfc/ROHC-MIB.txt
 netdisco/mibs/rfc/ROHC-RTP-MIB.txt
 netdisco/mibs/rfc/ROHC-UNCOMPRESSED-MIB.txt
 netdisco/mibs/rfc/RS-232-MIB.txt
+netdisco/mibs/rfc/RSERPOOL-MIB.txt
+netdisco/mibs/rfc/RSTP-MIB.txt
 netdisco/mibs/rfc/RSVP-MIB.txt
 netdisco/mibs/rfc/RTP-MIB.txt
+netdisco/mibs/rfc/SCSI-MIB.txt
 netdisco/mibs/rfc/SCTP-MIB.txt
+netdisco/mibs/rfc/SFLOW-MIB.txt
+netdisco/mibs/rfc/SIP-COMMON-MIB.txt
 netdisco/mibs/rfc/SIP-MIB.txt
+netdisco/mibs/rfc/SIP-SERVER-MIB.txt
+netdisco/mibs/rfc/SIP-TC-MIB.txt
+netdisco/mibs/rfc/SIP-UA-MIB.txt
 netdisco/mibs/rfc/SLAPM-MIB.txt
 netdisco/mibs/rfc/SMON-MIB.txt
 netdisco/mibs/rfc/SMUX-MIB.txt
@@ -1215,6 +1689,7 @@ netdisco/mibs/rfc/SNA-NAU-MIB.txt
 netdisco/mibs/rfc/SNA-SDLC-MIB.txt
 netdisco/mibs/rfc/SNMP-COMMUNITY-MIB.txt
 netdisco/mibs/rfc/SNMP-FRAMEWORK-MIB.txt
+netdisco/mibs/rfc/SNMP-IEEE802-TM-MIB.txt
 netdisco/mibs/rfc/SNMP-MPD-MIB.txt
 netdisco/mibs/rfc/SNMP-NOTIFICATION-MIB.txt
 netdisco/mibs/rfc/SNMP-PROXY-MIB.txt
@@ -1225,27 +1700,53 @@ netdisco/mibs/rfc/SNMP-USM-AES-MIB.txt
 netdisco/mibs/rfc/SNMP-USM-DH-OBJECTS-MIB.txt
 netdisco/mibs/rfc/SNMP-VIEW-BASED-ACM-MIB.txt
 netdisco/mibs/rfc/SNMPv2-CONF.txt
+netdisco/mibs/rfc/SNMPv2-M2M-MIB.txt
 netdisco/mibs/rfc/SNMPv2-MIB.txt
+netdisco/mibs/rfc/SNMPv2-PARTY-MIB.txt
 netdisco/mibs/rfc/SNMPv2-SMI.txt
 netdisco/mibs/rfc/SNMPv2-TC.txt
 netdisco/mibs/rfc/SNMPv2-TM.txt
+netdisco/mibs/rfc/SNMPv2-USEC-MIB.txt
 netdisco/mibs/rfc/SONET-MIB.txt
 netdisco/mibs/rfc/SOURCE-ROUTING-MIB.txt
 netdisco/mibs/rfc/SSPM-MIB.txt
 netdisco/mibs/rfc/SYSAPPL-MIB.txt
+netdisco/mibs/rfc/SYSLOG-TC-MIB.txt
+netdisco/mibs/rfc/T11-FC-FABRIC-ADDR-MGR-MIB.txt
+netdisco/mibs/rfc/T11-FC-FABRIC-CONFIG-SERVER-MIB.txt
+netdisco/mibs/rfc/T11-FC-FABRIC-LOCK-MIB.txt
+netdisco/mibs/rfc/T11-FC-FSPF-MIB.txt
+netdisco/mibs/rfc/T11-FC-NAME-SERVER-MIB.txt
+netdisco/mibs/rfc/T11-FC-ROUTE-MIB.txt
+netdisco/mibs/rfc/T11-FC-RSCN-MIB.txt
+netdisco/mibs/rfc/T11-FC-SP-AUTHENTICATION-MIB.txt
+netdisco/mibs/rfc/T11-FC-SP-POLICY-MIB.txt
+netdisco/mibs/rfc/T11-FC-SP-SA-MIB.txt
+netdisco/mibs/rfc/T11-FC-SP-TC-MIB.txt
+netdisco/mibs/rfc/T11-FC-SP-ZONING-MIB.txt
+netdisco/mibs/rfc/T11-FC-VIRTUAL-FABRIC-MIB.txt
+netdisco/mibs/rfc/T11-FC-ZONE-SERVER-MIB.txt
+netdisco/mibs/rfc/T11-TC-MIB.txt
+netdisco/mibs/rfc/TCP-ESTATS-MIB.txt
 netdisco/mibs/rfc/TCP-MIB.txt
 netdisco/mibs/rfc/TCPIPX-MIB.txt
 netdisco/mibs/rfc/TE-LINK-STD-MIB.txt
 netdisco/mibs/rfc/TE-MIB.txt
+netdisco/mibs/rfc/TIME-AGGREGATE-MIB.txt
 netdisco/mibs/rfc/TN3270E-MIB.txt
 netdisco/mibs/rfc/TN3270E-RT-MIB.txt
 netdisco/mibs/rfc/TOKEN-RING-RMON-MIB.txt
 netdisco/mibs/rfc/TOKENRING-MIB.txt
 netdisco/mibs/rfc/TOKENRING-STATION-SR-MIB.txt
+netdisco/mibs/rfc/TPM-MIB.txt
 netdisco/mibs/rfc/TRANSPORT-ADDRESS-MIB.txt
+netdisco/mibs/rfc/TRIP-MIB.txt
+netdisco/mibs/rfc/TRIP-TC-MIB.txt
 netdisco/mibs/rfc/TUNNEL-MIB.txt
 netdisco/mibs/rfc/UDP-MIB.txt
+netdisco/mibs/rfc/UDPLITE-MIB.txt
 netdisco/mibs/rfc/UPS-MIB.txt
+netdisco/mibs/rfc/URI-TC-MIB.txt
 netdisco/mibs/rfc/VDSL-LINE-EXT-MCM-MIB.txt
 netdisco/mibs/rfc/VDSL-LINE-EXT-SCM-MIB.txt
 netdisco/mibs/rfc/VDSL-LINE-MIB.txt
@@ -1256,9 +1757,11 @@ netdisco/mibs/rfc/lldp.mib
 netdisco/mibs/rfc/lldp_dot1.mib
 netdisco/mibs/rfc/lldp_dot3.mib
 netdisco/mibs/rfc1.diff
+netdisco/mibs/rfclist
 netdisco/mibs/rm_cisco_dups
 netdisco/mibs/snmp.conf
 netdisco/mibs/snmpwalkmib
+netdisco/mibs/split-extreme
 netdisco/mibs/to_locase
 netdisco/mibs/walk_all
 netdisco/netdisco
@@ -1266,20 +1769,30 @@ netdisco/netdisco.pm
 netdisco/sql/admin.sql
 netdisco/sql/device.sql
 netdisco/sql/device_ip.sql
+netdisco/sql/device_module.sql
 netdisco/sql/device_port.sql
 netdisco/sql/device_port_log.sql
+netdisco/sql/device_port_power.sql
 netdisco/sql/device_port_ssid.sql
+netdisco/sql/device_port_vlan.sql
+netdisco/sql/device_port_wireless.sql
+netdisco/sql/device_power.sql
+netdisco/sql/device_vlan.sql
 netdisco/sql/log.sql
 netdisco/sql/node.sql
 netdisco/sql/node_ip.sql
+netdisco/sql/node_monitor.sql
 netdisco/sql/node_nbt.sql
+netdisco/sql/node_wireless.sql
 netdisco/sql/oui.sql
 netdisco/sql/pg
+netdisco/sql/process.sql
 netdisco/sql/sessions.sql
 netdisco/sql/subnets.sql
 netdisco/sql/upgrade-0.92-to-0.93.sql
 netdisco/sql/upgrade-0.93-to-0.94.sql
 netdisco/sql/upgrade-0.94-to-0.95.sql
+netdisco/sql/upgrade-0.95-to-1.0.sql
 netdisco/sql/user_log.sql
 netdisco/sql/users.sql
 share/examples/netdisco/netdisco-topology.txt
diff --git a/net/netdisco/distinfo b/net/netdisco/distinfo
index 6e7702c8129..b48b1af2faa 100644
--- a/net/netdisco/distinfo
+++ b/net/netdisco/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2006/12/16 15:25:41 bouyer Exp $
+$NetBSD: distinfo,v 1.5 2011/03/15 20:36:03 bouyer Exp $
 
-SHA1 (netdisco-0.95_with_mibs.tar.gz) = 0aedc3ba409be8f6697b18eac9f839ea22cb6d53
-RMD160 (netdisco-0.95_with_mibs.tar.gz) = 138dba8d7e31d6f0ea35a0b41f3d76d705637713
-Size (netdisco-0.95_with_mibs.tar.gz) = 8318725 bytes
-SHA1 (patch-aa) = 8b235fd46284866cc5e2b5f8c682c316900c9b04
-SHA1 (patch-ad) = 88afec93b9d2e642a88ca9a422a3a511d2f5f4a3
+SHA1 (netdisco-1.0_with_mibs.tar.gz) = ee4903c72ca49403dc362f2457f7ecee270505d5
+RMD160 (netdisco-1.0_with_mibs.tar.gz) = 318d1c3e3dfd1abd8bd42f23d5f3c41fdaea0ff4
+Size (netdisco-1.0_with_mibs.tar.gz) = 12701473 bytes
+SHA1 (patch-aa) = 7f0f1bf04754aa9b1ee722b3f5137ef820737485
+SHA1 (patch-ad) = 74a867d4774860a812bce1df4e78213ab6438ab7
diff --git a/net/netdisco/patches/patch-aa b/net/netdisco/patches/patch-aa
index e184899e590..41bb087f459 100644
--- a/net/netdisco/patches/patch-aa
+++ b/net/netdisco/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/05/25 17:06:49 bouyer Exp $
+$NetBSD: patch-aa,v 1.2 2011/03/15 20:36:03 bouyer Exp $
 
---- netdisco.conf.orig	2004-11-16 20:18:10.000000000 +0100
-+++ netdisco.conf	2005-05-24 17:38:14.000000000 +0200
-@@ -29,7 +29,7 @@
+--- netdisco.conf.orig	2009-06-11 23:44:23.000000000 +0200
++++ netdisco.conf	2011-03-14 17:03:43.000000000 +0100
+@@ -61,7 +61,7 @@
  
  # ---- Admin Panel Daemon Settings ----
  daemon_bg       = true
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/05/25 17:06:49 bouyer Exp $
  daemon_poll     = 2
  
  # ---- Port Control Settings ---
-@@ -44,7 +44,7 @@
+@@ -76,7 +76,7 @@
  # Data Archiving and Logging
  compresslogs    = true
  compress        = /usr/bin/gzip -f
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/05/25 17:06:49 bouyer Exp $
  logextension    = txt
  #nmis_dump       = netdisco_nmis
  
-@@ -100,8 +100,8 @@
+@@ -188,8 +188,8 @@
  graph_y         = 30
  
  node_fillcolor  = dimgrey
diff --git a/net/netdisco/patches/patch-ad b/net/netdisco/patches/patch-ad
index cb10d74b335..927bd7a8e64 100644
--- a/net/netdisco/patches/patch-ad
+++ b/net/netdisco/patches/patch-ad
@@ -1,32 +1,15 @@
-$NetBSD: patch-ad,v 1.2 2006/12/16 15:25:41 bouyer Exp $
+$NetBSD: patch-ad,v 1.3 2011/03/15 20:36:03 bouyer Exp $
 
---- netdisco_apache.conf.orig	2006-11-14 01:27:14.000000000 +0100
-+++ netdisco_apache.conf	2006-12-06 22:08:24.000000000 +0100
-@@ -14,8 +14,10 @@
+--- netdisco_apache.conf.orig	2009-06-03 01:27:02.000000000 +0200
++++ netdisco_apache.conf	2011-03-14 17:00:47.000000000 +0100
+@@ -12,8 +12,10 @@
  
  # Pool Database Connections
  PerlModule Apache::DBI
 +@APACHE2@PerlModule CGI
 +@APACHE2@PerlModule Apache2::Request
  
--<Directory /usr/local/netdisco/html>
-+<Directory /usr/pkg/netdisco/html>
+ <Directory /usr/local/netdisco/html>
  	order allow,deny
  	allow from all
  </Directory>
-@@ -24,12 +26,12 @@
- # Preload the netdisco module into global server space.
- #   and parse the config file only once.
- { package HTML::Mason::Commands;
--    use lib '/usr/local/netdisco';
-+    use lib '/usr/pkg/netdisco';
-     use netdisco qw/:all/;
--    &netdisco::config('/usr/local/netdisco/netdisco.conf');
-+    &netdisco::config('/usr/pkg/netdisco/netdisco.conf');
- 
-     # Uncomment next two lines to setup switch reverse proxy.
--    #use lib '/usr/local/netdisco/switch';
-+    #use lib '/usr/pkg/netdisco/switch';
-     #use Apache::ProxyRewriteMax;
- }
-