Merge branch 'V5-4-patches' into V5-5-patches

* V5-4-patches:
  fix the run-autoconf program
diff --git a/AGENT.txt b/AGENT.txt
index 4d8d323..37eb279 100644
--- a/AGENT.txt
+++ b/AGENT.txt
@@ -418,14 +418,16 @@
 
    * a magic number (the #defined integer constant described above)
    * a type indicator (from the values listed in <snmplib/snmp_impl.h>)
-   * an access indicator (essentially RWRITE or RONLY)
+   * an access indicator (essentially NETSNMP_OLDAPI_RWRITE or
+     NETSNMP_OLDAPI_RONLY)
    * the name of the routine used to handle this entry
    * the length of the OID suffix used, and
    * an array of integers specifying this suffix (more on this in a moment)
 
 Thus a typical variable entry would look like:
 
-        { EXAMPLESTRING, ASN_OCTET_STR, RONLY, var_example, 1, {1}}
+        { EXAMPLESTRING, ASN_OCTET_STR, NETSNMP_OLDAPI_RONLY,
+          var_example, 1, {1}}
 
 If the magic numbers have not been defined in the header file, then they
 should be defined here, usually comming immediately before the corresponding
diff --git a/CHANGES b/CHANGES
index 8d96747..72c5233 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,137 +1,318 @@
 This file contains a list of specific bugs that have been fixed, and patches
 that have been applied in released versions.  Please see the NEWS file for
 a summary of the major changes, and the ChangeLog file for a comprehensive
-listing of all changes made to the code. 
-      
-* 5.4.4 *
+listing of all changes made to the code.
+
+
+*5.5.2*
 
     snmplib:
-      - [BUG 3134323]: Fix crash when comparing invalid OIDs
-      - [BUG 3171878]: Using SNMPv3 context does not work
-      - [BUG 3182985]: Fix calculation of common OID prefix length
-      - [BUG 3234754]: Ensure old f_create_from_tstring hook is initialized to NULL
-      - [BUG 3264852]: Recognise missing report types
-      - [PATCH 3058645]: Use MSG_DONTWAIT for the unix domain socket
-      - [PATCH 3067540]: Fix IPv4 OID indexes on 64-bit big-endian systems
-      - [PATCH 3165878]: Catch buffer overrun on 64-bit systems
+      - [PATCH 2835577]: Replace SNMP_ZERO of arrays with a memset.
       - [PATCH 3183000]: Fix calculation of common OID prefix length
-      - Added public declaration for netsnmp_table_data_delete_table()
-      - Added function netsnmp_delete_table_data_set().
-      - Added function snmp_sess_session_lookup()
-      - Added macro netsnmp_static_assert()
-      - Avoid Valgrind complaints about uninitialized data
-      - Check the return value of strdup in netsnmp_create_data_list
-      - Fix double-free crash when releasing duplicated handlers
-      - Fixed a memory leak in snmp_free_session()
-      - Fixed memory corruption triggered by snmpd.conf "enum" keyword
-      - Fixed bugs in building/parsing 64-bit integers
-      - Fixed leaks-at-exit triggered by using the snmp_enum code
-      - Fixed memory leak in netsnmp_table_data_delete_table()
-      - Fixed memory leak triggered by duplicate se_add_pair_to_list()
-      - Fix issue with USM using inactive users
-      - Fixed potential buffer overflow when generating temp file names
-      - Invoking se_clear_slist() no longer creates a dangling pointer
-      - Use realloc+init instead of calloc
+      - [PATCH 3526599]: Don't hang on retried failing SNMPv3 responses
+      - Avoid unnecessary casts when using netsnmp_set_row_column()
+      - Declare "type" argument of se_store_xxx() as const
+      - Make it explicit that MAX_SUBID is an unsigned constant
+      - Prevent gcc ped-warning for NETSNMP_REMOVE_CONST
+      - Simplify implementation of functions manipulating 64-bit numbers.
+      - Simplify the se_store_enum_list() implementation
 
     snmpd:
-      - [BUG 1840230]: Don't include nlmLogVariableIndex as (pseudo-)accessing column
-      - [BUG 2972579]: fixed checking of snmpTargetAddrRowStatus SET requests
-      - [BUG 3003981]: Protect against config parsing buffer overflow
-      - [BUG 3019243]: Register execFix compatability directive correctly
-      - [BUG 3058101]: Writeable 'int' instances don't work on 64-bit systems
+      - [BUG 3439234]: Correct dependencies of ucd-snmp/{pass,pass_persist}
+      - [BUG 3439234]: Move netsnmp_pass_str_to_errno to pass_common
+      - [BUG 3440752]: Report speed correctly for unusual E'net interfaces
+      - [BUG 3463767]: Handle parsing subidentifiers > 2^31
+      - [BUG 3526549]: CVE-2012-2141 Array index error leading to crash
+      - [BUG 3532090]: Fix high ifIndex values crashing hrDeviceDescr
+      - [PATCH 3175640]: Use IP_RECVDSTADDR sockopt where available (*BSD)
+      - [PATCH 3198781]: Fix compilation of disman/{ping,traceroute} modules
+      - [PATCH 3402376]: Recognise ReiserFS systems
+      - [PATCH 3410050]: Skip already-'processed' varbinds
+      - [PATCH 3410059]: Fix sparsely augmenting trigger tables
+      - [PATCH 3447444]: Fix SIG_PIPE handling
+      - [PATCH 3447671]: Fix override handling of OID values
+      - [PATCH 3453868]: Factor common code into pass_common
+      - [PATCH 3479740]: Fix hrSWRunPerf statistics
+      - [PATCH 3487919]: Fix compilation when caching is disabled
+      - [PATCH 3487867]: Don't skip missing ifXTable entries (ifConnectorPresent FALSE)
+      - [PATCH 3495697]: Store persistent snmpTarget table changes
+      - Added OCFS2 (Oracle Cluster FS) to hrStorageTable and hrFSTable
+      - DISMAN-SCHEDULER-MIB: Handle 32-char contextName values correctly.
+      - IF-MIB::ifType: Report InfiniBand interfaces correctly
+      - UDP-MIB: Report proper address in udpLocalAddress instead of 0.0.0.0.
+      - Eliminate various dead variables
+      - Return error instead of exiting on init problems
+      - Make the configuration of the dlmod module fail rather than
+	generate a dummy module if the dlopen function isn't available.
+      - Smux: simplify smux_list_detach()
+
+    snmpdx:
+      - [PATCH 3445437]: Log AgentX disconnections (in line with connections)
+
+    snmptrapd:
+      - Add missing newline character in a log message
+      - Avoid crash during shutdown due to invoking perl_destruct(NULL)
+      - Invoke shutdown_perl() when shutting down
+      - Don't invoke shutdown_perl() from SIGTERM handler
+      - Handle changes to libmysqlclient API (affects Fedora 15/16)
+
+    apps :
+      - [PATCH 2835577]: Replace SNMP_ZERO of arrays with a memset.
+
+    mib2c:
+      - [PATCH 3211484]: Support enumerations in notification varbinds
+
+    perl:
+      - Eliminate various dead variables
+      - Fix spelling in the documentation of the SNMP module
+      - Fixed segmentation fault when handler registration fails.
+      - Make sure constant SNMP_DEFAULT_RETRIES is recognized
+      - Add constants NETSNMP_CALLBACK_OP_{RECEIVED_MESSAGE,TIMED_OUT}
+
+    python:
+      - [PATCH 3185085]: Fix segfault on 64-bit systems
+
+    Build/install:
+      - Install util_funcs subheaders
+
+    man:
+      - [BUG 3190725]: Document snmp{,_sess}synch_response & snmp_async_send
+
+    testing:
+      - Fix Perl regression test failures
+      - Don't fail skipped Perl tests.
+
+    BSD:
+      - [PATCH 3383965]: Fix if-mib agent compile warnings on *BSD
+
+    FreeBSD:
+      - [PATCH 3489387]: Install FreeBSD 10 header file (plus other missing versions)
+    Linux:
+      - [PATCH 3525998]: Don't use an uninitialised value in error message
+
+    MinGW:
+      - Avoid "pragma comment" warnings in <net-snmp/net-snmp-config.h>
+      - Header file <net-snmp/net-snmp-config.h> now usable with MinGW
+      - Made regression test output independent of Windows registry settings
+
+    Windows:
+      - Avoid problems if Net-SNMP Perl modules are built with a different
+        version of Microsoft Visual Studio than that used for ActivePerl
+      - Avoid problems with PACKAGE_* macros, when using GNU autotools
+      - Now builds correctly with a 64-bit compiler
+      - build.bat: Generate PDB files in release mode
+      - build.bat: Install netsnmp.dll before running Perl regression tests
+      - Make linking with recent OpenSSL binaries succeed.
+      - Make netsnmp_large_fd_set_resize() robust against memalloc failures.
+      - Perl modules build now with IPv6 enabled.
+      - Snmpd: Remove dlmod
+      - Snmptrapd: Make the IP address to hostname conversion work
+
+
+*5.5.1*
+
+    snmplib:
+      - [BUG 2838243]: Correct the output of unsigned values
+      - [BUG 2919320]: Avoid accessing freed memory Reported by Tomasz Lis
+      - [BUG 2922390]: Fix test for missing contextName parameter
+      - [BUG 3093199]: Fixed bugs in 64-bit integer parsing
+      - [BUG 3134323]: Fix crash when comparing invalid OIDs
+      - [BUG 3171878]: Using SNMPv3 context does not work
+      - [PATCH 2871747]: plug memory leak in OID processing
+      - [PATCH 2952140]: Fix overflow of counter32 and gauge32 on 64bit systems
+      - [PATCH 2971270]: refuse to parse ASN.1 tokens with wrong type field
+      - [PATCH 3067540]: Fix IPv4 OID indexes on 64-bit big-endian systems.
+      - [PATCH 3058645]: Use MSG_DONTWAIT for the unix domain socket
+      - [PATCH 3165878]: Catch buffer overrun on 64-bit systems
+      - [PATCH 3203806]: Add function netsnmp_large_fd_set_select()
+      - Added function netsnmp_delete_table_data_set()
+      - Added netsnmp_xxx() memory allocation functions
+      - Added macro netsnmp_static_assert().
+      - Added snmp_sess_session_lookup().
+      - Avoid Valgrind complaints about uninitialized data
+      - Change the parsing of ranges to accept all valid values.
+      - Fix __cplusplus extern "C" wrapping
+      - Fix agent crash when sending encrypted SNMPv3 traps.
+      - Fix double free crash when releasing duplicated handlers
+      - Fix duplicate se_add_pair_to_list() memory leak
+      - Fix issue with USM using inactive users
+      - Fix potential buffer overflow when generating temp. file names
+      - Fix various problems with se_clear_slist()
+      - Force a ; at the end of the static_assert macro.
+      - Handle memory allocation failures in netsnmp_create_data_list
+      - Make sure that a mask is given to open when O_CREAT is specified
+
+    snmpd:
+      - [BUG 1840230]: Don't include the index object as (pseudo-)accessible column
+      - [BUG 2822360]: Fix memory leak when building table OIDs
+      - [BUG 2841008]: Protect against crash following failed AgentX response
+      - [BUG 2873858]: Fix handling of schedOwner index
+      - [BUG 2894059]: Handle errors when counting interfaces
+      - [BUG 2897000]: Suppress 32-bit counter truncation warnings
+      - [BUG 2900078]: Add support for OID variables with size in elements
+	               instead of bytes, correct sysObjectID to use this
+      - [BUG 2924140]: Fix termination of CPU/FPU types
+      - [BUG 2972579]: Fix checking of snmpTargetAddrRowStatus SET requests
+      - [BUG 3003981]: Protect against buffer overflow
+      - [BUG 3058101]: 64-bit systems only support writeable 'long' instances (not int)
       - [BUG 3062538]: Fix com2sec* handling of non-default contexts
-      - [BUG 3151897]: fd leak with /proc/partitions read in diskio
       - [BUG 3178389]: Fix inconsistent handling of TZ offsets
-      - [BUG 3185528]: shutdown_master_agent doesn't close UDP sockets
-      - [BUG 3305157]: Fix ipAddressPrefix handling of IPv6 addresses
+      - [BUG 3185528]: shutdown_master_agent didn't close UDP socket
       - [PATCH 2119725]: Fix skipNFSInHostResources handling of hrStorageTable
       - [PATCH 2825653]: Fix sendmail.cf parsing in certain conditions
+      - [PATCH 2835576]: Fix endianness issues in pass/pass_persist
+      - [PATCH 2877518]: Fix handling of scoped AgentX variables
+      - [PATCH 2883155]: Fix memory leak in proxy handling
+      - [PATCH 2883220]: Fix compilation problems when ifXTable is not included
+      - [PATCH 2887816]: Protect against division-by-zero crash
+      - [PATCH 2901029]: Fix compiler warning on CloseHandle()
+      - [PATCH 2903092]: Fix broken handling of broadcast entries.
       - [PATCH 2904900]: Documentation plus assorted handler code fixes
+      - [PATCH 2911323]: Fix agent lockup when monitoring AgentX-delegated information
       - [PATCH 2911361]: Remove redundant variables
+      - [PATCH 2911970]: Properly terminate linked list of registrations
       - [PATCH 2941811]: Handle successful requests with reqID 0
+      - [PATCH 2967400]: Retrieve error counters for the EtherLike-MIB
+      - [PATCH 2968642]: Catch overflow of pass-through command buffer
       - [PATCH 2975254]: Avoid callback re-use of closed sessions
+      - [PATCH 3044512]: Fix sysobjectid directive
+      - [PATCH 3053428]: Fix get_pid_from_inode when the inode is not found
       - [PATCH 3053436]: Fix tcpConnectionTable_data_access invalid memory access
-      - [PATCH 3062526]: Fix security engineID setting in the trapsess directive
-      - [PATCH 3066862]: Fix comparison of large unsigned indexes (disk/extend tables)
+      - [PATCH 3058140]: Check that inode is non-zero
+      - [PATCH 3062526]: Fix security engineID setting in 'trapsess' directive
+      - [PATCH 3074918]: Avoid memory leaks following CONTAINER_INSERT failures
       - [PATCH 3096725]: Don't register v1Trap callback, if SNMPv1 not supported
-      - [PATCH 3096725]: sysORTable registation for Notification Log mib
       - [PATCH 3096725]: Include SNMPv1 trap OIDs in nlmLogNotificationID column
-      - [PATCH 3141462]: Fix agentx subagent issues with multiple-object requests
-      - [PATCH 3198781]: Ensure disman/{ping,traceroute} do at least compile
-      - [PATCH 3299384]: Fix INFORMs so they retry probing for an engineID
+      - [PATCH 3096725]: sysORTable registation for notification log mib  
+      - [PATCH 3141462]: fix agentx subagent issues with multiple-object requests
+      - [PATCH 3152412]: Handle (and report) problems reading /proc/vmstat
 
       - Add newly created/destroyed interfaces to ipv6IfTable
-      - Call shutdown_master_agent() and shutdown_agent() during shutdown
-      - Don't deregister closed sessions
-      - Don't second-guess cache handler
-      - Fix clean_subtree() memory handling
-      - Fixed a double free, triggered by cleaning up embedded Perl data structure.
-      - Fixed adding new addresses to ipAddressTable
-      - Fixed logging of 'truncating integer value > 32 bits' in {IP,TCP}-MIB
-      - Fixed IP-MIB::ipIfStatsReasmReqds value
-      - Fixed potential buffer overflow in parsing OIDs in config files
-      - Fixed race conditions in hrSWRunTable and UCD prTable
-      - Fixed agent bogus 64-bit wrap warning (ipSystemStats)
-      - Fix engineid generation on outgoing v3 traps from the agent
+      - Don't let MIB modules second-guess the cache handler
+      - Fix adding new addresses to ipAddressTable
+      - Fix engineID generation on outgoing v3 traps from the agent
+      - Fix erroneous "64bit wrap" warnings when computing ipSystemStats
+      - Fix invalid access to memory in TCP-MIB
+      - Fix IP-MIB::ipIfStatsReasmReqds value (typo)
+      - Fix IPv6 forwarding MIB object (boolean, not TruthValue)
+      - Fix rare race condition when reading RPM database
+      - Fixed race condition in hrSWRunTable
       - Fix VACM persistant storage.
-      - Optimizations for large route tables
-      - Use cache-unique id instead of handler name for shared cache reload protection
-      - Various MIB-specific leak-at-exit fixes.
+      - Fix various memory & file-descriptor leaks
+      - Handle I/Fs without broadcast addresses (IF/IP-MIBs)
+      - Improve agent shutdown processing
+      - Improve error logging when freeing active caches
+      - Make sure that a mask is given to open when O_CREAT is specified
+      - Report GFS filesystems in hrStorageTable and hrFSTable
+      - Report real ifSpeed of (down) network interface (where possible)
+      - Skip non-AF_INET interfaces when loading ipv4 addrs
+      - Support N/W interfaces with HW address >6 bytes (e.g. InfiniBand)
+        in ipNetToMediaTable and ipNetToPhysicalTable.
+      - Support views with indexes values>255
+      - Suppress 32-bit truncation warnings (IP-MIB & TCP-MIB)
+      - Suppress missing iquerySecName warning if it won't be needed
 
-    snmptranslate:
-      - Fixed printing of ranges with UNSIGNED type
+    snmpdx:
+      - changed default TCP target from 0.0.0.0:705 to localhost:705
 
     snmptrapd:
       - [BUG 3151254]: Fix crash with invalid traphandle directive
-      - Fixed a double free, triggered by cleaning up embedded Perl data structure.
+      - Fixed assorted double free at exit problems
+
+    snmptable:
+      - [BUG 2837998]: Handle missing instance subidentifiers in results
+      - [PATCH 2850067]: Suppress extraneous "index" header token
+
+    snmptranslate:
+      - fixed printing of ranges with UNSIGNED type.
 
     snmpusm:
-      - Correct ifdefs, remove dead variables
+      - Correct ifdefs, remove dead variables.
+
+    snmpwalk:
+      - Fix handling of end OID being longer than the starting OID
 
     build:
-      - [BUG 3102904]: Compile all source files with -fno-strict-aliasing
+      - [BUG 3102904]: Build with -fno-strict-aliasing (if supported)
+      - Add detection of lm_sensors version
+      - Avoid use of "tail -1" (non POSIX-compliant)
       - Do not call VACM APIs if VACM module is not included
-      - Fix autoconf detection of strcasecmp
-      - Fix building of static applications using net-snmp-config -*libs
-      - Fix definition of VERSION (number, not expression)
+      - Fix building static applications using net-snmp-config
+      - Fix compilation with rpm-4.6 (using legacy API)
+      - Fix 'make test TESTOPTS="-P tcp"'
+      - Fix order of rpmlib detection and agent module configuration
+      - Run rpm configure checks for (rpm-based) hr_swinst rewrite
+      - Use a sensible default for system location (if no domain name found)
 
     man:
-      - [BUG 3190725]: Document snmp{,_sess}synch_response and snmp_async_send
-      - clean up manual pages (from Debian patch 56_manpage)
+      - [BUG 2972860]: Update broken references
+      - Clean up manual pages (from Debian patch 56_manpage)
 
     mib2c:
-      - [PATCH 3175323]: Fix handling of 'while (false)' blocks
-      - [PATCH 3204883]: Fix handling of non-table objects named fooTable
-      - [PATCH 3211484]: Support enumerations in notification varbinds
-      - Make the mib2c foreach ranges work as advertised
+      - [BUG 2888569]: Fix generation of table columns array
+      - Remove unnecessary casts to u_char*
+      - make the mib2c foreach ranges work as advertised in the comments
 
     mibs:
+      - [BUG 2973890]: Fix imports, DiskIOEntry list and revision histories
       - [PATCH 2974716]: Fix issues in the SMUX-MIB
 
+    misc:
+      - [PATCH 2836112]: Use the right modifier for size_t/ssize_t variables
+      - [PATCH 2952034]: Return of the Great SuSE 'sprintf' Hunt... 
+
     perl:
+      - [PATCH 2890931]: Better handling of Counter64 values
+      - [PATCH 2995098]: Fix creation of SNMPv3 sessions with API_SINGLE
       - [PATCH 3046371]: Fix memory leak in SNMPv1 trap handling
-      - [PATCH 3049029]: Fix a memory leak with snmp bulkwalks
-      - Don't always open stderr as the calls to snmp_log already do this
-           and it messes up the agent when embedded
-      - Handle embedded %'s in the result message.
+      - [PATCH 3049029]: Fix memory leak with snmp bulkwalks
+      - Don't automatically open stderr (breaks embedded perl within the agent)
+      - Fix various other memory leaks, out-of-bounds array access
+            and uninitialized variable access issues
+      - Fix several "Free to wrong pool" errors
 
     python:
-      - [BUG 3088360]: Ensure modules are built against the correct libraries
-      - [BUG 3295407]: Fix handling of void pointer
-      - [PATCH 3035328]: Check for failures in creating a session
-      - [PATCH 3035578]: Keep error codes up to date
-      - [PATCH 3185085]: Fix segfault on 64-bit systems
+      - [BUG 2919379]: Initialise SNMP sessions properly
+      - [BUG 3088360]: Ensure python modules are built against the correct libraries
+      - [PATCH 2001656]: Handle null-termination of string values properly.
+      - [PATCH 3035328]: Detect failures in session creation
+      - [PATCH 3035578]: Update error codes
+      - Support null-bytes in octet strings
 
-    testing:
+    test:
+      - [PATCH 2952020]: Explicitly set permission on output directories
       - Support dynamic analysis of regression tests
+      - Fix tests (T030) for MinGW
+
+    Cygwin:
+      - [BUG 2997492]: byte order of udpLocalPort is now correct
+      - Enabled Unix transport
+      - Fix building with IPv6, OpenSSL & embedded Perl support
+      - Fix building with remotely mounted source files
+      - Fix free UDP port detection in regression tests
+      - Fix out-of-range array access in 'interfaces' table
+      - libnetsnmp now builds as a DLL when configured with --enable-shared
+      - Omit inet_ntop.c and inet_pton.c
+      - perl modules do now build (--with-perl-modules).
+      - Removed winpipe.c from the list of source files
+
+    HP-UX:
+      - fix build error on HP-UX 10.20
 
     Linux:
-      - [PATCH 3074918]: check for CONTAINER_INSERT failures
+      - [BUG 2985915]: Fix build without embedded Perl
+      - [PATCH 2926374]: Fix reading of ipAddressTable from /proc/net/if_inet6
+      - [PATCH 2959811]: Reimplement Netlink IPv6 prefix listener
       - [PATCH 3083027]: Fix RPM spec file to support CentOS
-      - [PATCH 3152412]: Handle (and report) problems reading /proc/vmstat
-      - Fix a strlen calculation in IF-MIB support
-      - Fixed hrSWRunPath of swapped-out processes
-      - Fixed value of IP-MIB::ipv6InterfaceForwarding
+      - [PATCH 3107003]: Suppress ipNetToPhysicalTable error messages
+                         for tunnel and similar (non-physical) interfaces
+      - Fix calculation of ifHCInUcastPkts on 32-bit Linux
+      - Fix udpTable indexes on big-endian 64bit Linux
+      - Fix value of IP-MIB::ipv6InterfaceForwarding
+      - Fixed 32-bit truncation warning on UCD-SNMP-MIB::systemStats
+      - Improved EtherLike-MIB support 
+      - Pass correct path to rpmdbOpen, and log errors
+      - snmpd is again single-threaded.
 
     NetBSD:
       - DragonFly support
@@ -139,568 +320,685 @@
       - Update memory and CPU statistics handling
 
     OpenBSD:
-      - Support updating the routing table [From OpenBSD patch archive]
-
-    Win32:
-      - [PATCH 3293842]: Eliminate registry argument limit of 127 characters
-      - Avoid MSVC warning about redefining EADDRINUSE
-      - Fix out-of-range array accesses errors in mibII interfaces table
-      - Fix test T030 on MinGW.
-      - Fix test T200 failures on known Microsoft SNMP extension DLL bugs
-      - Fixed memory leak in the internal (non-winExtDLL) ipNetToMediaTable
-      - Halt snmpd process on key press when run from a command prompt
-          (To aid debugging snmpd.exe)
-
-    MinGW:
-      - Make regression tests independent of registry settings
-      - Use <net-snmp/net-snmp-config.h> header file under WinGW
-
-      
-* 5.4.3 *
-
-    snmplib:
-      - [BUG 2838243]: Correct the output of unsigned values.
-      - [BUG 2919320]: Avoid accessing freed memory
-      - [BUG 2922390]: Fix test for missing contextName parameter
-      - [PATCH 2043018]: fix recvfrom hangs
-      - [PATCH 2258229]: Remove misleading comment
-      - [PATCH 2479700]: Fix zoned IP address used as table indices
-      - [PATCH 2492377]: Fix typo/bug in snmp_enable_callback()
-      - [PATCH 2505488]: Fix alarm behaviour on large clock skews
-      - [PATCH 2538169]: Prevent infinite retries for invalid error-index
-      - [PATCH 2688345]: Fix netsnmp_assert() for Visual Studio
-      - [PATCH 2689362]: Fix handling of IPv6 hostnames
-      - [PATCH 2713841]: Fix runtime errors triggered by high-ASCII chars
-      - [PATCH 2780411]: Fix compiler warnings
-      - [PATCH 2797251]: Fix memory leaks
-      - [PATCH 2871747]: Fix memory leak in OID processing
-      - [PATCH 2952140]: Overflow counter32 and gauge32
-      - [PATCH 2952034]: Return of the Great SuSE 'sprintf' Hunt
-      - Change the parsing of ranges to accept all valid values
-      - Ensure O_CREATE mask is always specified
-      - Fix extern "C" wrapping
-      - Make -LN stop dumping core.
-      - Make bad debug levels report the offending symbol
-      - Remove inline declarations for non-inline defined functions
-
-    snmpd:
-      - [BUG 1693039]: Be silent when insert fails.
-      - [BUG 2822360]: Fix memory leak when building table OIDs
-      - [BUG 2841008]: Protect against crash following failed AgentX response
-      - [BUG 2873858]: Fix handling of schedOwner index.
-      - [BUG 2894059]: Handle errors when counting interfaces
-      - [BUG 2897000]: Suppress 32-bit counter truncation warnings.
-      - [BUG 2914410]: Fix crash on empty command lines
-      - [BUG 2924140]: Fix termination of CPU/FPU types
-      - [PATCH 1257347]: Non-fixed size connection buffer
-      - [PATCH 1550730]: Report errors from iterator-based handlers
-      - [PATCH 1977439]: Fix pass/_persist bug with SET oid value
-      - [PATCH 2012402]: Handle failure to look up interface error counters
-      - [PATCH 2082726]: correctly report NIC speeds higher than 4Gbit/s
-      - [PATCH 2124288]: Fix setting of usmUserPrivProtocol at creation
-      - [PATCH 2162652]: Fix simple hrfs checks when NFS is in use
-      - [PATCH 2384779]: Fix handling of GetBulk with N>0,M==0
-      - [PATCH 2686280]: Report duplicate registrations as an error
-      - [PATCH 2693670]: Don't open AgentX sockets if other transports fail
-      - [PATCH 2791417]: Fix snmpd segfault when run with -DALL
-      - [PATCH 2797251]: Support multiple initialisation and shutdown
-      - [PATCH 2822337]: Fix memory leak in ipAddressPrefixTable
-      - [PATCH 2877518]: Fix handling of scoped AgentX variables
-      - [PATCH 2883155]: Fix memory leak in proxy handling.
-      - [PATCH 2887816]: Protect against division-by-zero crash
-      - [PATCH 2901029]: Fix compiler warning on CloseHandle()
-      - [PATCH 2911323]: Fix agent lockup when monitoring AgentX-delegated information
-      - [PATCH 2912584]: Fix null OID handling in Agentx on 64bit
-      - [PATCH 2950845]: Fix ifHighSpeed calculation
-      - [PATCH 2952034]: Return of the Great SuSE 'sprintf' Hunt
-      - [PATCH 2956657]: Handle over-length AgentX OIDs
-      - [PATCH 2968642]: Catch overflow of pass-through command buffer
-      - Allow "monitor" to handle negative threshold values
-      - Change default AgentX target from 0.0.0.0:705 to localhost:705
-      - Clean up notification
-      - Ensure O_CREATE mask is always specified
-      - Fix agent crash when sending encrypted SNMPv3 traps
-      - Fix CVE-2008-4309 (GETBULK issue reported by Oscar Mira-Sanchez)
-      - Fix creation of views using snmpusm
-      - Fix handling of multiple matching VACM entries
-      - Fix invalid access to memory in TCP-MIB
-      - Fix logging of 'truncating integer values' in IP-MIB and TCP-MIB
-      - Fix memory leak when multiple interfaces have the same IPv6 address
-      - Fix possible crash when 64-bit counters exceed 2^32
-      - Fix two bugs with smux password support
-      - Fix udpTable indexes on big-endian 64bit Linux.
-      - Improve parsing of -LS command line argument
-      - Latch large-disk statistics at 2Tb (rather than wrapping)
-      - Register CPU/memory hardware modules with nsCacheTable
-      - Remove inline declarations for non-inline defined functions
-      - Report ifSpeed of down network interfaces
-      - Support large HW addresses (>6bytes)
-
-    snmptrapd:
-      - [PATCH 2726302]: Pass results of Perl trap handlers to trap daemon
-      - Remove glibc-specific printf-formatting tokens
-
-    snmptable:
-      - [BUG 2837998]: Handle missing instance subidentifiers in results
-      - [PATCH 2850067]: Suppress extraneous "index" header token
-
-    apps:
-      - [BUG 2811577]: Fix bug in GetBulk handling
-      - [PATCH 2937996]: Add Date: header to email send by traptoemail
-      - Improve parsing of -LS command line argument
-
-    build:
-      - [BUG 2095983]: Fix errors in find-requires helper script
-      - [BUG 2782700]: Build failure when using --with-pkcs on Solaris
-      - [PATCH 2184039]: Misc fixes for freeing memory
-      - [PATCH 2952020]: Set permission on testing directories
-      - 'make test TESTOPTS="-P tcp"' works fine now
-
-    docs:
-      - [PATCH 2788072]: Document 'logmatch' functionality.
-      - [PATCH 2795739]: Fix incorrect disk/file size descriptions & unit specifiers
-
-    mib2c:
-      - [BUG 2827269]: Suppress non-ordered TODO comments
-      - [BUG 2888569]: Fix generation of table columns array
-      - [PATCH 2136437]: Improve 64-bit handling of large table FLAG defines 
-      - [PATCH 2316127]: Fix bug in iterate_access generated code.
-
-    mibs:
-      - [BUG 2973890]: Fix imports, DiskIOEntry list and revision histories
-
-    perl:
-      - [BUG 1554817]: Fix class assigment so getRootOID works properly
-      - [PATCH 2022948]: Fix for Counter64 in perl subagent
-      - [PATCH 2182079]: Fix various warnings & allow use of "use strict"
-      - [PATCH 2361712]: Fix getbulk optimization during walks
-      - [PATCH 2793857]: Report failed asynchronous requests
-      - [PATCH 2890931]: Better handling of Counter64 values.
-
-    python:
-      - [BUG 2258935]: Python Extension Module fails on Solaris
-      - [BUG 2919379]: Initialise SNMP sessions properly
-      - [PATCH 2074817]: Fix regexp engine CPU performance issues
-      - [PATCH 2260828]: Fix python snmpwalk memory leak
-      - [PATCH 2580979]: Fix python session pointers on 64-bit systems
-      - [PATCH 2667415]: Support "UseNumeric" option
-      - Support null-bytes in octet strings
-
-
-    AIX:
-      - [BUG 2712670]: Agent crashes on AIX with hrStorage
-
-    *BSD:
-      - [PATCH 2435793]: Support 64-bit IF-MIB counters on sysctl systems
-      - Fix a make test
-
-    HP-UX:
-      - [BUG 2779472]: Filesystems missing in hrStorage table (HP-UX 11.31)
-      - [PATCH 2088726]: Fix an issue reporting negative memory values
-
-    Linux:
-      - [BUG 2822355]: Fix memory leaks on udpEndpointTable
-      - [PATCH 2926374]: Fix /proc/net/if_inet6 reading of ipAddressTable
-      - Fix build on modern distributions (using rpm-4.6)
-      - fix rare race condition when reading RPM database
+      - Fix order of headers when checking <netinet/in_pcb.h>
+      - Support updating the routing table
+      - Update SWRun code to use kvm_getproc2
 
     Solaris:
-      - [PATCH 2012404]: Deal with more than 10 interfaces
-      - [PATCH 2406378]: Fix hrSWRunPerfMem on 64-bit Solaris systems
-      - [PATCH 2751588]: Inconsistent data (e.g. UDP/TCP MIB scalar values
-	of zero) can be reported on Solaris 10U4+
-      - Protect against missing package version
+      - Fix crash triggered by missing package version information 
 
     Windows:
-      - [BUG 2997492]: byte order of udpLocalPort is now correct
-      - [BUG 2971257]: Fixed winExtDLL handling of multi-varbind getNext requests.
-      - [BUG 2779541]: Fixed handle leak in pass_persist
-      - [PATCH 2686248]: Applied patch by Bart Van Assche
-      - [PATCH 2688342]: Fix various VS2005 compiler warnings
-      - [PATCH 2691876]: Applied patch by rdiez to allow
-      - [PATCH 2693746]: improved socket startup support
-      - Detect free UDP ports correctly for use in test infrastructure.
-      - Fix batch build using recent versions of Visual Studio.
-      - Fix builds with IPv6 support enabled
+      - [BUG 2969872]: Ensure SOCK_STARTUP is invoked before init_agent
+      - [BUG 2971257]: Fixed winExtDLL handling of multi-varbind getNext
+	               requests with OIDs in reverse lexicographical order
+      - Avoid test failure (T200) on known MS SNMP extension DLL bugs
+      - Fix and improve batch build using recent versions of Visual Studio
       - Fix build under MinGW
-      - Fix winExtDLL build on Windows Vista, Windows 7
-      - Fix winExtDLL build with MinGW
-      - Simplify building Net-SNMP + winExtDLL with MSVC
-      - winExtDLL: Fixed a memory leak when SnmpExtensionQuery(Ex) fails
-      - winExtDLL: Log errors when loading an extension DLL fails
-      - winExtDLL: Use RFC-compliant error codes in SNMP response PDUs
-      - winExtDLL: Fix handling of multiple varbind SET requests
+      - Fix build with 64-bit compiler
+      - Fix building with IPv6 and OpenSSL support
+      - Fix handling of strtoull (both MSVC 6.0, and 2002 & above)
+      - Fix handling of winExtDLL multi-varbind SET requests
+      - Fix MIB output truncation with winExtDLL GETNEXT requests
+      - Fix out-of-range array access in 'interfaces' table
+      - Halt agent on key press, when run in command prompt window (to aid debugging)
+      - Improve Net-SNMP DLL build
+      - Improve support for winExtDLL build
+      - Suppress/remove various compilation warnings
+      - winExtDLL: Don't trigger an assertion if no extension DLLs loaded
+      - winExtDLL: Improve RFC-compliance of response error codes 
+      - winExtDLL: Log the reason why loading an extension DLL fails
+      - winExtDLL: Fix a memory leak when SnmpExtensionQuery(Ex) fails
 
-
-* 5.4.2 *
+*5.5*
 
     snmplib:
-      - [BUG 1793545]: Take the name from the sockaddr_un
+      - [BUG 1171904]: fix recvfrom hangs (already closed)
+      - [BUG 1345296]: fix recvfrom hangs (already closed)
+      - [BUG 1600171]: Support longer community strings in VACM config.
+      - [BUG 1619827]: improve handling of link dependencies
+      - [BUG 1660061]: Validate engineIDs more strictly.
       - [BUG 1795840]: Signed 32-bit truncation logged as debug message
-      - [BUG 1801835]: Support multiple default transports for an app.
       - [BUG 1866655]: Handle parsing invalid OID subidentifiers
+      - [BUG 1898198]: Avoid a segfault when parsing broken mibs.
       - [BUG 1958041]: Ensure IDs are not truncated.
-      - [BUG 2027834]: Extend string print buffer by the minimum necessary
+      - [BUG 1976772]: Changed mib parser to handle long binary/hex strings.
+      - [BUG 2001124]: Allow embedded NUL characters in usmUserPublic
+      - [BUG 2027834]: Extend string print buffer by the minimum necessary.
+      - [BUG 2099985]: Added const qualifiers to time conversion routins
+      - [PATCH 2827722]: Improve strtoull to be less MSVC-specific
       - [BUG Coverity #183]: fix memory leak if IP_PKTINFO fails
+      - [PATCH  700681]: limited support for UDPv4 broadcast addresses
+      - [PATCH 1548670]: Fix range checks for unsigned integers
+                         (Debian bug #383380)
+      - [PATCH 1592706]: Fix memory leak when cloning varbinds.
+      - [PATCH 1616912]: fix memory leak in snmp_udp_transport
+      - [PATCH 1620424]: Honor NETSNMP_DS_LIB_DEFAULT_PORT over the default system
+      - [PATCH 1627049]: New API to handle large numbers of file descriptors.
+      - [PATCH 1634620]: Fix leaks from create_user_from_session failure.
+      - [PATCH 1640114]: Don't store trailing null character.
+      - [PATCH 1641895]: Extend short view masks (as per RFC specs)
+      - [PATCH 1641972]: add missing const
+      - [PATCH 1642071]: Don't fiddle with the storage of pre-existing users.
+      - [PATCH 1645698]: fix 64-bit signed integer encoding
+      - [PATCH 1653670]: Consistent SNMPv3 behaviour when opening sessions.
+      - [PATCH 1665543]: Handle VACM checks correctly.
+      - [PATCH 1681030]: Better handling of empty apptype configs.
+      - [PATCH 1681977]: Add callbacks prior to reading config.
+      - [PATCH 1687316]: Don't drop const from casts.
+      - [PATCH 1687317]: Remove an unused local variable
+      - [PATCH 1687318]: Make _sess_selpol_info static.
+      - [PATCH 1687319]: Declare snmp_sess_read_extd()
+      - [PATCH 1687325]: Fix problem with operator precedence.
+      - [PATCH 1687337]: Implement _sess_open in terms of snmp_sess_add
+      - [PATCH 1728247]: Clean up int64 type checking and usage for building packets
+      - [PATCH 1737085]: fix the -M switch for mib parsing vs defaults
       - [PATCH 1768285]: Count MIB files correctly in add_mibdir()
       - [PATCH 1775124]: Fix clientaddr functionality
       - [PATCH 1806336]: fix -LS option parsing
       - [PATCH 1807489]: fix ignoring of display hints.
       - [PATCH 1811469]: read_config_files_in_path() reads past malloc'd buffer
       - [PATCH 1875022]: improve callback locking mechanisms
+      - [PATCH 1882069]: Add token for specifying an exact SNMPv3 engineID
       - [PATCH 1895927]: change obsolete recv/send to recvfrom/sendto
-      - [PATCH 1898204], [BUF 1898198]: fix segfault when parsing broken mibs.
+      - [PATCH 1898204]: Avoid a segfault when parsing broken mibs.
+      - [PATCH 1916840]: new config option to set SNMPv1 trap agent address
+	[PATCH 1916840]: introduce netsnmp_gethostbyname_v4
       - [PATCH 1921861]: Avoid endless loop after truncating 64bit int
-      - [PATCH 2003450]: Fix a couple of 64-bit problems
-      - Change CONTAINER_INSERT to not do partial inserts in containers
-	with multiple indices when one insert fails.
+      - [PATCH 2003450]: Fix a couple of 64-bit problems.
+      - [PATCH 2043018]: fix recvfrom hangs
+      - [PATCH 2258229]: Remove misleading comment
+      - [PATCH 2479700]: Fix zoned IP address used as table indices
+      - [PATCH 2492377]: Fix typo/bug in snmp_enable_callback()
+      - [PATCH 2505488]: Fix alarms not triggered due to large clock skews.
+      - [PATCH 2538169]: Prevent infinite retries for an invalid error-index.
+      - [PATCH 2689362]: Fix handling of IPv6 hostnames.
+      - [PATCH 2713841]: Fix runtime errors triggered by high-ASCII chars
+      - [PATCH 2772787]: Cleaner approach to handling large fd_sets.
+      - [PATCH 2780411]: Fix compiler warnings
+      - [FEATURES  454028]: Detect empty MIB index files.
+      - [FEATURES  851887]: Report range information for invalid SET requests.
+      - [FEATURES 1041888]: Check directory paths for config files.
+      - [FEATURES 1407476]: Rename 'strictCommentTerm' to reflect actual behaviour.
+      - Add GCC format checking attributes to the debug functions.
+      - Add iterator for singly linked lists
+      - Correct MAX_ENGINEID_LENGTH to 32 (as per SnmpEngineID TC)
+      - Correct registration of multiple premib config handlers.
+      - Deallocate various resources in shutdown_mib
       - Do not leak memory whenever an udp address is formatted.
       - Do not try to look up empty strings as hostnames for IPv6
-      - Fix registering of multiple premib config handlers
+      - Fix forwarding encoding
       - Fix potential buffer overflow in sprintf for UDP/IPv6
+      - Handle mapping complex transport strings to simple name definitions
+      - Hardcode default port numbers (rather than use getservbyname)
+      - Implement RFC5343 contextEngineID probing.
+      - Improve CONTAINER_INSERT handling of partial failure with multiple indexes
+      - Improve netsnmp_watcher_info to handle statically allocated data.
+      - Introduce printf-like versions of config_perror and config_pwarn
+      - Library layering improvements
+      - Read def{Target,Domain} from snmp.conf as well as <app>.conf
+      - rename MIB macro to NETSNMP_MIB2_OID, MIB is too generic and may
+	conflict with applications.   The old MIB macro is kept for
+	backward compatibility, unless NETSNMP_NO_LEGACY_DEFINITIONS is
+	defined.
 
     snmpd:
-      - [BUG 1557372]: Realign hrFSStorageIndex with hrStorageTable
+      - [BUG  902610]: Don't discard pending data following a TRAP.
+      - [BUG  902801]: Fix ordering of SMUX-registered subtrees.
+      - [BUG 1046327]: Reset "includeAllDisks" flag when reloading.
+      - [BUG 1102058]: Skip non-mounted disks (e.g. swap partitions)
+      - [BUG 1397895]: include missing interface declarations
+      - [BUG 1400101]: remove deleted interfaces from ifTable
+      - [BUG 1413728]: Reference index values in debug output correctly.
+      - [BUG 1416276]: Handle dependency on MIB parsing API.
+      - [BUG 1546817]: Fix snmpEnterprise varbind when forwarding v1 traps.
+      - [BUG 1558823]: fix ipAddressTable memory leak
+      - [BUG 1600261]: Handle non-x86 /proc/cpuinfo format
+      - [BUG 1600432]: Handle signals properly when restarting the agent.
+      - [BUG 1602286]: Don't let table holes block later rows.
+      - [BUG 1628613]: Restore memTotalFree.0 on Solaris
+      - [BUG 1633595]: Fix AgentX handling of Counter64 values
+      - [BUG 1677063]: Check for failed malloc calls.
+      - [BUG 1685067]: More precise handling of SNMPv3-admin MIB tables.
+      - [BUG 1685081]: Check for valid OID on Free/Undo passes.
+      - [BUG 1693039]: be silent when insert fails.
+      - [BUG 1712988]: default/configurable max # varbinds returned by GETBULK
+      - [BUG 1745113]: Handle single-line output in UCD compatability mode.
       - [BUG 1748206]: Protect against failures to open /etc/mtab (or equiv)
-      - [BUG 1758212]: Handling missing variable types (IpAddress,Counter,Opaque)
+      - [BUG 1758212]: Handle missing variable types (IpAddress,Counter,Opaque)
+      - [BUG 1760633]: fix typo in debug message
       - [BUG 1771221]: Retain ifLastChange information on data reload.
       - [BUG 1792890]: include CIFS mounts when skipping remote filesystems
       - [BUG 1822360]: Fix spinlock helper error handling.
-      - [BUG 1851047]: Don't over-process failed watcher requests
-      - [BUG 1912647]: Fix memory leak following failed request
-      - [BUG 1931391]: Fix reporting of Memory buffers and cached memory
-      - [BUG 2003144]: Increase size of AgentX packet
-      - [BUG 2006786]: Interface name can have more than 8 characters
-      - [BUG 2018031]: Don't probe engineID in internal monitor sessions
-      - [BUG 2023803]: Remove irrelevant configure dependency (HP-UX 11)
-      - [PATCH 1716548]: Fix help output for -D
+      - [BUG 1912647]: Fix memory leak following failed requests.
+      - [BUG 1931391]: Fix reporting of Memory buffers and cached memory.
+      - [BUG 2001124]: Allow embedded NUL characters in usmUserPublic
+      - [BUG 2003144]: Increase size of AgentX packet build buffer
+      - [BUG 2006786]: Interface name can have more than 8 characters.
+      - [BUG 2018031]: Don't probe engineID in internal monitor sessions.
+      - [BUG 2693670]: Don't open (& clobber) AgentX socket if other transports fail
+      - [BUG 2822355]: Fix memory leaks on udpEndpointTable (linux) Patch
+	supplied by Frank Lichtenheld
+      - [PATCH 1225440]: Delay sighup till it is safe.
+      - [PATCH 1257347]: Non-fixed size connection buffer
+      - [PATCH 1550730]: Report errors from iterator-based handlers.
+      - [PATCH 1585146]: Extend range of available error codes
+      - [PATCH 1595568]: fix delegated SET requests from agentx subagents
+      - [PATCH 1601188]: Handle signals properly when restarting the agent.
+      - [PATCH 1601453]: Dynamic Memory failure handling improvements
+      - [PATCH 1617255]: fix length of the history array to match code.
+      - [PATCH 1620424]: Fix default port for sending notification
+      - [PATCH 1625069]: speed improvements for solaris routing table access
+      - [PATCH 1639282]: Save persistent snmpTargetParamsTable settings correctly.
+      - [PATCH 1639726]: Report physical memory correctly on *BSD
+      - [PATCH 1641332]: Include missing agent config definitions.
+      - [PATCH 1641685]: Handle unresponsive AgentX subagents more reliably.
+      - [PATCH 1641865]: Don't double check snmpTrapOID in the filter table.
+      - [PATCH 1642255]: Handle saving long snmpNotifyFilterTable entries.
+      - [PATCH 1644280]: Don't automatically probe for v3 EngineIDs.
+      - [PATCH 1644280]: Use the correct engineID when sending v3 traps.
+      - [PATCH 1644714]: replace last use of deprecated copy_word by copy_nword
+      - [PATCH 1654424]: Handle row deletion issues in dataset tables
+      - [PATCH 1657741]: Handle 64-bit types via pass mechanism.
+      - [PATCH 1659623]: Handle SMUX peers with an empty password.
+      - [PATCH 1665543]: Handle VACM checks correctly.
+      - [PATCH 1665549]: Handle creating VACM entries correctly.
+      - [PATCH 1665985]: Implement ipReasmTimeout
+      - [PATCH 1666737]: include IPv6 traffic in various UDP counters.
+      - [PATCH 1668193]: Fix check for v6 ReasmMaxSize support.
+      - [PATCH 1668193]: Update registration of ReasmMaxSize support.
+      - [PATCH 1668952]: Ignore zombie processes.
+      - [PATCH 1669048]: Add support for ipv6InterfaceIdentifier
+      - [PATCH 1676478]: fix udpEndpointRemoteAddress
+      - [PATCH 1678301]: Deallocate domain registry at shutdown
+      - [PATCH 1678305]: Deallocate cache in hardware/cpu/cpu on shutdown
+      - [PATCH 1678306]: Deallocate log in notification-log-mib/notification_log
+      - [PATCH 1678788]: Better handling of SMUX socket descriptors.
+      - [PATCH 1681043]: clean up helper includes
+      - [PATCH 1683054]: set udpEndpointInstance to identify different processes.
+      - [PATCH 1687336]: Start using the enhanced read_config interface
+      - [PATCH 1692768]: Fix copying of non-octet-aligned IP address prefixes.
+      - [PATCH 1692817]: Improved RFC 4293 support (inc. non-unicast/random IP addresses)
+      - [PATCH 1698184]: Register non-default context integers as writable.
+      - [PATCH 1700157]: Fix ordering of exec tokens in MIB output
+      - [PATCH 1700730]: Remove unused extern declaration.
+      - [PATCH 1700732]: Fix debug output statements.
+      - [PATCH 1700737]: Tidy up setSerialNo implementations.
+      - [PATCH 1702361]: Read stats from /proc/net/snmp6
+      - [PATCH 1702366]: Support for icmpStatsTable
+      - [PATCH 1703004]: Consolidate snmp6 handling.
+      - [PATCH 1710632]: fix memory leak on broken container insertions for the ipAddressTable
+      - [PATCH 1715395]: fix icmp table errors in new icmp code
+      - [PATCH 1715406]: registration ordering fixes for icmpStatsTable
+      - [PATCH 1716548]: Fix help output so no space is printed between -D and arguments.
+      - [PATCH 1719253]: fix skipNFSInHostResources for multiple walks
+      - [PATCH 1721096]: remove unused variable stats from kernel extraction for better portability.
+      - [PATCH 1723611]: New implementation of the RMON alarmTable
+      - [PATCH 1729629]: Fix memory leak in disman agent.
+      - [PATCH 1737439]: automatic link up/down traps on a walk
       - [PATCH 1744157]: Report duplicate "extend/exec" identifiers.
-      - [PATCH 1746831]: fix process checking race condition
+      - [PATCH 1746831]: fix process checking race condition under Linux and platform #ifdefs
       - [PATCH 1752934]: Fix off-by-one qsort error in table utilities.
       - [PATCH 1753437]: Fix error index on failing SET requests
       - [PATCH 1753449]: Fix AgentX error propagation
       - [PATCH 1753463]: Fix AgentX subagent ping alarm handling
       - [PATCH 1758208]: Fix memory leak
-      - [PATCH 1774612]: More resilient process status handling
-      - [PATCH 1783733]: Include version info in hrSWInst table (solaris)
-      - [PATCH 1784747]: Fix ip adresses on 64 bit systems
+      - [PATCH 1783733]: Put the package version number into the hrSWInst table for solaris.
+      - [PATCH 1784747]: Fix long usage for ip adresses on 64 bit systems in various MIB-II tables.
+      - [PATCH 1797111]: implement IP-MIB::ipIfStatsTable
+      - [PATCH 1804445]: High order bits of HCInOctets not set on Solaris
+      - [PATCH 1806501]: Add API for sending traps with a snmpv3 context
+      - [PATCH 1823465]:  fix icmp cache registration
       - [PATCH 1823800]: release and reload all trap destinations on SIGHUP
       - [PATCH 1826088]: Use the right interface to read the netmask
-      - [PATCH 1826102]: support longer interface names on linux
-      - [PATCH 1828839]: handle of disk mount paths with embedded spaces
+      - [PATCH 1828839]: to provide better handling of disks mounted on paths with embedded spaces
       - [PATCH 1849903]: do not spam log with asserts when XEN is used
-      - [PATCH 1866823]: truncate 32 bit counter values on 64 bit machines
-      - [PATCH 1879261]: Add inactive memory to cached report (freebsd)
+      - [PATCH 1866823]: truncate 32 bit counter values on 64 bit machines to avoid bogus warnings.
+      - [PATCH 1879261]: Add in inactive memory to the cached report for freebsd
+      - [PATCH 1882621]: Add LVM support to the partition table
       - [PATCH 1893468]: fixed registration of OIDs with ranges
-      - [PATCH 1896118]: fix ifTable 32bit counters on linux
-      - [PATCH 1909813]: fix table_iterator hint for SORTED tables
-      - [PATCH 1944581]: Don't core dump on long string index values.
-      - [PATCH 1951996]: Fix for CPU stats on FreeBSD
+      - [PATCH 1901764]: for supporting logwatch files that are date based
+      - [PATCH 1909813]: fix table_iterator handling of SORTED hint
+      - [PATCH 1916840]: new config option to set SNMPv1 trap agent address
+      - [PATCH 1944581]: Protect against core dumps with long string index values.
       - [PATCH 1967194]: Recognise NFS4 mounts
+      - [PATCH 1977439]: Fix pass/_persist bug with SET oid value
+      - [PATCH 1995753]: minor cleanup agent/auto_nlist.c
+      - [PATCH 2012402]: don't fail on failure to look up interface error counters.
       - [PATCH 2014204]: Support -g {groupname}
       - [PATCH 2022936]: Fix AgentX Counter64 decoding on 64-bit architectures
-      - [PATCH 2023633]: add SCTP-MIB implementation (Linux only)
+      - [PATCH 2082726]: correctly report NIC speeds higher than 4Gbit/s
+      - [PATCH 2103492]: implement RMON-MIB::etherStatsJabbers
+      - [PATCH 2124288]: Fix setting of usmUserPrivProtocol at creation.
+      - [PATCH 2162652]: patch to fix simple hrfs checks when NFS is in use.
+      - [PATCH 2384779]: Fix handling of GetBulk with N>0,M==0
+      - [PATCH 2406378]: Fix hrSWRunPerfMem on 64-bit Solaris systems
+      - [PATCH 2431353]: Make some C++ compilers happier
+      - [PATCH 2435681]: Enable if-mib rewrite (with sysctl backend) on NetBSD
+      - [PATCH 2435793]: Support 64-bit IF-MIB counters on sysctl (*BSD) system.
+      - [PATCH 2449210]: add 64-bit disk usage statistics to UCD-SNMP-MIB::dskTable
+      - [PATCH 2564552]: provide libnetlink support for loading the tcp table
+      - [PATCH 2686280]: Report duplicate registrations as an error
+      - [PATCH 2791417]: fix snmpd segfault when run with -DALL Patch
+      - [PATCH 2822337]: Fix memory leak in ipAddressPrefixTable
+      - [FEATURES 1019429]: Set supplementary groups via initgroups(3)
+      - Add missing function declarations & include files.
+      - Add support for a user provided length variable
+	   and C string values to the watcher helper.
+      - Allow "monitor" to handle negative threshold values.
+      - Automatically reregister sysORTable entries from AgentX subagents.
+      - Clean up notification registrations during Event MIB cleanup
       - Enforce the lower limit on scalar_groups
-      - suppress annoying "registration != duplicate" warning for root oids
-      - Handle device names with embedded spaces in UCD-SNMP-MIB (dskDevice)
+      - Fix CVE-2008-4309 (GETBULK issue reported by Oscar Mira-Sanchez)
+      - Fix memory leak when multiple interfaces have the same IPv6 address
+      - Fix two bugs with smux password support.
+      - Handle device names with embedded spaces in UCD-SNMP-MIB::dskDevice
+      - Implement ipNetToPhysicalLastUpdated
+      - Implement ipAddressSpinLock
+      - Improve efficiency of scalar_group helper.
+      - Improve parsing of -LS command line argument
+      - Register CPU/memory hardware modules with nsCacheTable.
+      - Reimplementation of LM-SENSORS-MIB
+      - Reimplementation of snmpMPDStats.
+      - Reimplementation of usmStats.
+      - Remove unused variables.
+      - Suppress annoying "registration != duplicate" warning for root oids
+      - Unify all snmpd statistic variables with a common handler.
+      - Use the worker helpers from the register_*_instance helpers and
+	schedule the instance helpers for removal in 5.6
+      - Use static watcher_info for all watched variables and in int_watch.
+      - fix possible crash when 64-bit counters in ipSystemStatsTable get
+	bigger than 2^32
 
     snmptrapd:
+      - [BUG 1638225]: Fix interpretation of transport address data.
       - [BUG 1955227]: Memory leak for embedded Perl on x86_64
       - [PATCH 1746992]: Improve snmptrapd access-control error messages.
       - [PATCH 1767725]: Close all non standard file handles
+      - [PATCH 1908288]: Run perl END block on termination
+      - [PATCH 2726302]: Pass results of Perl trap handlers to trap daemon
+      - [PATCH 1225440]: Delay sighup till it is safe.
+      - [FEATURE  741375]: Extend -F flag to cover syslog/execute format strings.
+      - [FEATURE 1159947]: Allow control of traphandle data format
+      - Add trap handler for logging traps to a mysql database
+      - Support for forwarding traps by OID subtree.
+      - Support per-trap format specifications
+      - Withdraw deprecated options.
+
+    apps:
+      - [BUG 1964136]: Drop NULL type from snmpset usage message.
+      - [BUG 2811577]: Fix bug in GetBulk handling. Don't get confused by
+	index values that contain a ':' character.
+      - [PATCH 1529523]: Close SNMP session on failure.
+      - Improve parsing of -LS command line argument
+
+    snmpnetstat:
+      - [PATCH 2564538]: Support GETBULK in v2c+ snmp versions
+
+    snmpusm:
+      - [PATCH 1591355]: Allow cloning to arbitrary engineIDs
+
+    snmpwalk:
+      - [PATCH 1723620]: Specify an explicit end-point for the walk.
 
     build:
+      - [BUG 1096166]: Handle --without-logfile correctly.
+      - [BUG 1567324]: Clarify prompting for user-supplied values.
+      - [BUG 1600093]: autoconf 2.60 breaks the build
+      - [BUG 1647976]: Cygwin/MinGW Windows build fails due to libtool error
+      - [BUG 1707469]: Win32: snmpv3-security-includes.h not installed
       - [BUG 1802833]: Ensure snmptrapd builds with --disable-snmpv1/2c
+      - [BUG 1823381]: Use a sensible default MIBDIR path on Cygwin/MinGW
       - [BUG 1823381]: Valid MIB directory search path on Windows
       - [BUG 1872266]: PERLCC check fails for CC with options
-      - [BUG 1995172]: fix --without-elf configure usage
+      - [BUG 1995172]: fix --without-elf configure usage message
       - [BUG 2014526]: Win32: snmpv3-security-includes.h not installed
       - [BUG 2023803]: Compilation problems on HP-UX 11.31
-      - [PATCH 1681035]: improve net-snmp-config /bin/sh compatibility
+      - [BUG 2095983]: fix syntax/permissing error in find-requires helper script
+      - [BUG 2168180]: Improve handling of various --enable/--disable options.
+      - [BUG 2782700]: build failure when using --with-pkcs on Solaris
+      - [PATCH 1577917]:Simplify makefile target references (patch from Apple)
+      - [PATCH 1600453]: Fix cross-compile builds in apples build environment.
+      - [PATCH 1624406]: option to hardcode location of mount table
+      - [PATCH 1625135]: configure location of python interpreter 
+      - [PATCH 1678300]: compile-subagent doesn't call shutdown_ methods
+      - [PATCH 1681073]: #ifdef based config_error instead of special cases
+      - [PATCH 1728241]: Add configure check for <sys/uio.h>
+      - [PATCH 1728230]: add configure check for gai_strerror()
+      - [PATCH 1728233]: make sure type nfds_t is defined
+      - [PATCH 1728237]: Move variable declaration at the top of netsnmp_udp_sendto
+      - [PATCH 1728244]: Add configure check for sin6_scope_id
+      - [PATCH 1728247]: Add type check for int??_t and uint??_t
       - [PATCH 1899762]: Tweak embedded_perl configure checks.
-      - add --with-temp-file-pattern configure option
-      - Add support for winExtDLL to build.bat (win32)
-      - Disable agent tests if built without necessary mib modules
-      - Limit the use of _KERNEL definitions in configure tests to match
-        the use of _KERNEL in our codebase
-      - Update to libtool 1.5.26
-
-    mib2c:
-      - [BUG 1874059,1737068]: Handle MIB objects with embedded hyphens
-      - [PATCH 1914398]: install mib2c.perl.conf
+      - [PATCH 2000874]: Cleanup transport selection.
+      - [PATCH 2091156]: correctly declare dependencies in Makefile. 'make -j <N>' should work now.
+      - [PATCH 2184039]: Fixes for freeing memory during error conditions.
+      - [PATCH 2797251]: Support multiple initialisation/shutdown, fix memory leaks
+      - Add a variation of AC_SEARCH_LIBS where the result is settable.
+      - Add "BuildRequires: perl-ExtUtils-Embed" to the spec file
+      - Add '--with-temp-file-pattern' configure option
+      - Assume target platform supports mem{cpy,move,set} & str{,r}chr
+      - Disable inlining on solaris (due to linking errors)
+      - Disable MIB-specific tests if the agent omits the necessary modules.
+      - '--disable-as-needed' reverts to linking system libs into applications
+      - Do not config_require(util_funcs) if nothing from util_funcs is used
+      - Do not require use of --with-endianness when cross-compiling.
+      - Fix build issues with ethtool (on RH9).
+      - Fix checks for support of static inline functions
+      - Fix compilation on IRIX
+      - Fix macro for '--with-features-of'
+      - Improve library layering & dependency handling when linking apps
+      - Improve robustness of sed/grep/etc commans (using autoconf macros)
+      - Improve RPM spec files, for consistency with vendor-provided packages.
+      - Mechanism for selecting build environment based on version
+      - New NETSNMP_ARG_WITH/ENABLE macros to catch incorrect 'with/enable' usage
+      - '--enable-ipv6' should only enable 'mibII/ipv6' on supported systems
+      - Remove Net-SNMP special-case handling of standard functionality.
+      - Restructure configure template
+      - Stricter checks on '--with-persistent-mask' values
+      - Update to autoconf 2.63 & libtool 2.2.6
+      - Use 'config_error' to generate error messages at configure time.
+      - Use LDFLAGS when building agent, helpers and mib lib
+      - Use "libtool clean" to ensure removal of all libtool temp files.
+      - allow building with Perl versions that lack PERL_EXIT_DESTRUCT_END
+      - build fix for Tru64 Unix and IRIX: move _XOPEN* definitions to
+	where they are in 5.4.x and earlier
 
     documentation:
+      - [BUG 1247164]: Document use of OID macros
+      - [BUG 1407476]: Clarify MIB parsing toggle options & comment handling.
+      - [BUG 1614104]: broken snmpd(8) manual page in 5.4
       - [BUG 2027129]: fix typo in snmpcmd.1
+      - [PATCH 1604580]: SNMP(3) manual page corrections
+      - [PATCH 1644735]: Add gcc build instructions for IRIX
+      - Fix minor documentation bugs (patch from Apple)
+
+    mib2c:
+      - [BUG  833673]: More focused size checks.
+      - [BUG 1429472]: Protect against missing instances (and invalid objects)
+      - [BUG 1582972]: Handle @while@/@end@ properly.
+      - [BUG 1737068]: Handle MIB objects with embedded hyphens
+      - [BUG 1874059]: Handle MIB objects with embedded hyphens
+      - [PATCH 1668171]: skip unknown cols in min/max range for tables
+      - [PATCH 1719244]: Fix mfd generating map function
+      - [PATCH 1914398]: install mib2c.perl.conf
+      - [PATCH 2136437]: Improve FLAG defines for huge tables on 64bit systems
+      - [PATCH 2316127]: Fix bug in iterate_access generated code.
 
     misc:
-      - Avoid calling debug macros with too few/many arguments.
-      - enhance snmpnetstat test to check tcpTable in TCP mode
+      - [PATCH 1737727]: Add a NETSNMP_OLDAPI_ prefix to old-api access macros.
+      - [PATCH 1737727]: Replace NETSNMP_CLEAN_NAMESPACE with NETSNMP_NO_LEGACY_DEFINITIONS
+      - Add config reread support to "net-snmp-config --compile-subagent" code.
+      - Avoid calling debug macros with wrong number of arguments.
+      - Don't use the legacy symbol SNMPTRAPD_DISABLE_AGENTX
+      - Preliminary (alpha) support for SNMP over SSH and DTLS/UDP.
+      - Preliminary (alpha) support for the TSM security model
+      - Separate user management into new net-snmp-create-v3-user script
+
+    unspecified:
+      - [BUG 1596638]: memory leak in ipCidrRouteTable, inetCidrRouteTable
+      - [BUG 1611524]: fix tcp connection table fd leak
+      - [BUG 1793545]: Take the name from the sockaddr_un in order to avoid
+	               transport specifiers and other decorations.
+      - [BUG 1801835]: Multiple default transports for an application.
+      - [BUG 1851047]: Don't continue to process a corrupt watched value.
+      - [PATCH 1601453]: Dynamic Memory failure handling improvements
+      - [PATCH 1674298]: Remove unused sinkport variable
+      - [PATCH 1674299]: Lessen scope of zone variable in dump_realloc_oid_to_inetaddress
+      - [PATCH 1674302]: Lessen scope of len variable in convert_v2pdu_to_v1
+      - [PATCH 1678298]: compile-subagent checks for bad HAVE_SIGNAL_H
+      - [PATCH 1678302]: netsnmp_mibindex_load leaks memory
+      - [PATCH 1681035]: Improve net-snmp-config /bin/sh compatibility
+      - [PATCH 1902105]: Hide and improve debug log messages
+      - [PATCH 1902113]: Fix error log in inetNetToMediatable
+      - Fix for refs to OBJECT-GROUP in another MIB
+      - Initalize log subsystem
+      - Remove support for use of varargs.h.
 
     perl:
+      - [BUG 1450669]: a perl agentx consumes memory
+      - [BUG 1554817]: Fix class assigment so getRootOID works properly.
       - [BUG 1606062]: perl bulkwalk (async) coredump
+      - [BUG 1619827]: improve handling of link dependencies
       - [BUG 1747733]: More robust handling of undefined values.
-      - [BUG 1826174]: Check for buffer overflow when printing values.
       - [BUG 1834539]: Consistent handling of OID parsing.
+      - [PATCH 1627949]: a perl agentx consumes memory
+      - [PATCH 1725049]: Fix bulkwalk in cases of non-repeater usage.
       - [PATCH 1811463]: perl async callback coredump
+      - [PATCH 1834983]: Consistent handling of OID parsing.
       - [PATCH 1914393]: registerAgent can now be run multiple times
       - [PATCH 1914643]: fix issues with embedded perl
       - [PATCH 1914645]: better end of mib support
       - [PATCH 1920390]: fix registration of tables with .0 as IIDs
-      - [PATCH 2021444]: Support SNMPv2c in gettable
-      - fixed an extra brace in the docs pointed out by Jason Martin
-
-    python:
-      - [BUG 1826174]: Check for buffer overflow when printing values
-      - [BUG 1868278]: Python segfault (introduced by r16962)
-      - [PATCH 1862177]: made code more windows/cygwin compiler friendly
-      - [PATCH 1877840]: fix MIB label and indexing due to broken regexp
-
-    AIX:
-      - Add support for AIX 6.x.
-
-    Linux:
-      - [PATCH 1969627]: Handle empty /etc/sysconfig/network file
-      - Improved RPM spec files, for better consistency with
-        vendor-provided packages
-
-    Solaris:
-      - [BUG 1810814]: tcpTable missing entries and wrong ports
-      - [PATCH 1824196]: {ifOperStatus,ipAdEntIfIndex} reported incorrectly
-      - [PATCH 1834699]: Fix 1833294: DLPI problems on Solaris 2.6
-      - #define NEW_MIB_COMPLIANT to support Solaris 10U4+
-
-* 5.4.1 *
-
-    snmplib:
-      - Change snmp_sess_add_ex to consistently close and
-      - Deallocate the confmibs and confmibdirs
-      - FEATURES: 1041888: Check directory paths for
-      - FEATURES: 851887: Report range information for
-      - Read the config parameters defTarget and
-      - Use the default_target argument if it is
-      - [BUG 1600171]: Support longer community strings
-      - [BUG 1619827]: link against needed external
-      - [BUG 1619827]: link net-snmp libraries and binaries
-      - [BUG 1660061]: Validate engineIDs more strictly.
-      - [PATCH 1548670]: Fix range checks for unsigned
-      - [PATCH 1592706]: Fix memory leak when cloning
-      - [PATCH 1616912]: fix
-      - [PATCH 1620424]: Honor
-      - [PATCH 1634620]: Fix leaks from
-      - [PATCH 1640114]: Don't store trailing null
-      - [PATCH 1641895]: Extend short view masks (as per
-      - [PATCH 1641972]: add missing const
-      - [PATCH 1653670]: Consistent SNMPv3 behaviour
-      - [PATCH 1681030]: Better handling of empty
-      - [PATCH 1687316]: Don't drop const from casts.
-      - [PATCH 1687325]: Fix problem with operator
-      - increment "current" and "age" according to
-      - library layering improvements: introduce
-      - patch: 1645698: fix 64-bit signed integer
-
-    snmpapi:
-      - Do not use getservbyname to find default port
-
-    snmpd:
-      - Correct the dependency information for
-      - [BUG 1046327]: Reset "includeAllDisks" flag when
-      - [BUG 1073782]: Restore PerfStat values for FreeBSD
-      - [BUG 1102058]: Skip non-mounted disks (e.g. swap
-      - [BUG 1159908]: Fix memory leak
-      - [BUG 1397895]: include missing interface
-      - [BUG 1413728]: Reference index values in debug
-      - [BUG 1416276]: Handle dependency on MIB parsing
-      - [BUG 1546817]: Fix snmpEnterprise varbind when
-      - [BUG 1558823]: fix ipAddressTable memory leak
-      - [BUG 1600261]: Handle non-x86 /proc/cpuinfo format
-      - [BUG 1602286]: Don't let table holes block later
-      - [BUG 1628613]: Restore memTotalFree.0 on Solaris
-      - [BUG 1633595]: Fix AgentX handling of Counter64
-      - [BUG 1677063]: Check for failed malloc calls.
-      - [BUG 1685067]: More precise handling of
-      - [BUG 1685081]: Check for valid OID on Free/Undo
-      - [BUG 1712988]: default and configurable maximum
-      - [BUG 1745113]: Handle single-line (and zero-line)
-      - [BUG 1760633]: fix typo in debug message
-      - [BUG 902610]: Don't discard pending data following
-      - [BUG 902801]: Fix ordering of SMUX-registered
-      - [PATCH 1601188, ]: BUG: 1600432: Handle signals
-      - [PATCH 1620424]: Fix notification sending so that
-      - [PATCH 1637287]: Handle multiple target tags
-      - [PATCH 1639282]: Save persistent
-      - [PATCH 1639360]: Fix snmpNotifyFilterProfileTable
-      - [PATCH 1639726]: Report physical memory
-      - [PATCH 1641332]: Include missing agent config
-      - [PATCH 1641685]: Handle unresponsive AgentX
-      - [PATCH 1641865]: Don't double check snmpTrapOID
-      - [PATCH 1642255]: Handle saving long
-      - [PATCH 1644280]: Don't automatically probe for
-      - [PATCH 1644280]: Use the correct engineID when
-      - [PATCH 1644714]: replace
-      - [PATCH 1659623]: Handle SMUX peers with an empty
-      - [PATCH 1665549]: Handle creating VACM entries
-      - [PATCH 1665985]: Implement ipReasmTimeout
-      - [PATCH 1666737]: include ipv6 counts in
-      - [PATCH 1668193]: Fix check for v6 ReasmMaxSize
-      - [PATCH 1668193]: Update registration of
-      - [PATCH 1668952]: Ignore zombie processes.
-      - [PATCH 1676478]: fix udpEndpointRemoteAddress
-      - [PATCH 1678788]: Better handling of SMUX socket
-      - [PATCH 1683054]: set udpEndpointInstance to
-      - [PATCH 1687336]: Start using the enhanced
-      - [PATCH 1692768]: Fix copying of non-octet-aligned
-      - [PATCH 1698184]: Register non-default context
-      - [PATCH 1700730]: Remove unused extern declaration.
-      - [PATCH 1700732]: Fix debug output statements.
-      - [PATCH 1700737]: Tidy up setSerialNo
-      - [PATCH 1729629]: Fix memory leak in disman
-      - patch from Wojtek Jawor to handle row deletion
-      - patch: 1225440: Apply intent of patch: to delay
-      - patch: 1595568: from cyril_margaria: fix
-      - patch: 1617255: fix length of the history array
-      - patch: 1700157: from afrika: fixes ordering of exec
-      - patch: 1710632: from mavarley: fix memory leak on
-      - patch: 1719253: from "Christian Jung": fix
-      - patch: 1719254: from "Christan Jung": update
-
-    snmptrapd:
-      - [BUG 1638225]: Fix interpretation of transport
-      - [PATCH 1620424]: Fix notification reception so
-      - patch: 1225440: Apply intent of patch: to
-      - upport for forwarding traps by OID subtree.
-
-    apps:
-      - [BUG 1964136]: Drop NULL type from snmpset usage
-      - [PATCH 1529523]: Close SNMP session on failure.
-
-    build:
-      - Link libdl against libnetsnmpmibs instead of
-      - Link libkvm and libwrap to libnetsnmpagent
-      - [BUG 1096166]: Handle --without-logfile correctly.
-      - [BUG 1647976]: Cygwin/MinGW Windows build fails
-      - [PATCH 1625135]: configure location of python
-      - [PATCH 1681073]: #ifdef based config_error instead
-      - [PATCH 1728226]: make sure
-      - [PATCH 1728230]: add
-      - [PATCH 1728237]: Move
-      - [PATCH 1728244]: Add
-      - [PATCH 1728247]: Add type
-      - add "BuildRequires: perl-ExtUtils-Embed" to the
-      - add configure check for hasmntopt to fix the
-      - only enable mibII/ipv6 through --enable-ipv6 on
-      - patch from apple to simplify makefile target
-      - update to libtool 1.5.24 (from 1.5.22)
-      - use LDFLAGS when building agent, helpers and mib
-      - use libtool clean for removing files to ensure we
-      - work around libnetsnmpagent/libnetsnmphelpers
-      - yet another fix to address build issues with
-
-    building:
-      - Check for support of static inline functions
-      - Disable inlining on solaris as there are some
-
-    configure:
-      - [BUG 1567324]: Clarify prompting for
-
-    documentation:
-      - [BUG 1247164]: Document use of OID macros
-      - [BUG 1407476]: Clarify MIB parsing toggle
-      - [BUG 1614104]: broken snmpd(8) manual page
-      - [PATCH 1604580]: SNMP(3) manual page
-
-    irix:
-      - [PATCH 1709748]: Optimized IRIX cpu stats
-
-    library:
-      - FEATURES: 454028: Detect and handle empty MIB
-      - Patch from "Mitsuru Chinen": cleans up the
-      - [PATCH 1642071]: Don't fiddle with the storage
-      - [PATCH 1665543]: Handle VACM checks correctly.
-
-    mib2c:
-      - [BUG 1429472]: Protect against missing instances
-      - [BUG 1582972]: Handle @while@/@end@ properly.
-      - [BUG 833673]: More focused size checks.
-      - [PATCH 1668171]: skip unknown cols in min/max
-
-    misc:
-      - Don't use the legacy symbol
-
-    patch:
-      - fix the -M switch for
-
-    perl:
-      - [BUG 1450669]: PATCH: 1627949: from martin987: a
-      - [BUG 1619827]: link libnetsnmpagent/libnetsnmptrapd
+      - [PATCH 1956193]: beta threadable perl module code for SNMPv1/2c usage.
+      - [PATCH 2021444]: Support SNMPv2c in gettable processing
+      - [PATCH 2022948]: Fix for Counter64 in perl subagent
+      - [PATCH 2182079]: Fix various perl warnings & allow use of "use strict"
+      - [PATCH 2272347]: Implement "implied" in MIB hash
+      - [PATCH 2361712]: Fix getbulk optimization during walks
+      - [PATCH 2709705]: Retrieve src/target IP address in Perl-based agents
+      - [PATCH 2763717]: Allow perl to use OPAQUEs
+      - [PATCH 2793857]: Report failed asynchronous requests.
       - fix SNMP SET for IP addresses on 64-bit
       - fix prerequisites for NetSNMP::TrapReceiver
       - fix syntax error in NetSNMP::agent::Support
-      - install embedded perl init files for
-      - patch: 1725049: fix bulkwalk in cases of non-repeater
-
-    ports:
-      - patch: 1706344: from naylor: fix compilation with
+      - install embedded perl init files with correct permissions
 
     python:
-      - [PATCH 1716114]: Let python build in source tree
+      - [BUG 1826174]: Check for buffer overflow when printing values.
+	               Addresses CVE-2008-2292
+      - [BUG 1868278]: Python segfault
+      - [BUG 2258935]: Python Extension Module fails on Solaris
+      - [PATCH 1716114]: Let python build in source tree  (Debian patch#38)
+      - [PATCH 1862177]: made code more windows/cygwin compiler friendly
+      - [PATCH 1877840]: Fix MIB label and indexing due to sl, broken regexp
+      - [PATCH 2074817]: Fix regexp engine CPU performance issues
+      - [PATCH 2260828]: Fix python snmpwalk memory leak
+      - [PATCH 2580979]: Fix python session pointers on 64-bit systems.
+      - [PATCH 2667415]: Support "UseNumeric" option.
+      - [PATCH 2775800]: Allow threading to continue when a request is sent
 
     test:
-      - support a -n flag to RUNTESTS to print the test
+      - enhance snmpnetstat test to check tcpTable in TCP mode
+      - support a -n flag to RUNTESTS to print the test number found in the
+	test file as opposed to the numerical count
+      - Do not terminate on SIGCHLD since dash and soume bourne shells will
+	exit the main shell when a subshell terminates in that case.
 
-    unspecified:
-      - [BUG 1596638]: memory leak in ipCidrRouteTable,
-      - [BUG 1600093]: autoconf 2.60 breaks the build
-      - [BUG 1611524]: fix tcp connection table fd leak
-      - [BUG 1633483]: Support CPU HAL on FreeBSD4.x
+    Ports:
       - [BUG 1710910]: initial support for DragonFly BSD
-      - [PATCH 1678298]: from magfr: compile-subagent checks for
-      - [PATCH 1678301]: from magfr: deallocate domain registry
-      - [PATCH 1678302]: from magfr: netsnmp_mibindex_load leaks
-      - [PATCH 1678305]: from magfr: Deallocate the cache in
-      - [PATCH 1678306]: from magfr: Deallocate the log in
-      - [PATCH 1719244]: fix mfd generating map function
-      - [PATCH 1728241]: from mitsuru_chinen: add configure check
-      - patch from apple to fix cross-compile builds in apples
-      - patch from apple to fix minor documentation bugs.
-      - patch from apple to improve memory reporting
+      - [PATCH 1623874]: add GNU/kFreeBSD support
 
     AIX:
-      - [PATCH 1665079]: AIX patches
-      - build fixes for embedded Perl
-      - fix default shared library building instead of forcing
-      - use "-Wl,-brtl" when compiling with gcc
+      - [PATCH 1665079]: AIX patches for cpu stats and process monitoring
+      - Add support for AIX 6.x
+      - Build fixes for embedded Perl
+      - Fix default shared library building instead of forcing static
+      - Use "-Wl,-brtl" when compiling with gcc
 
     FreeBSD:
-      - add initial support for upcoming FreeBSD 7
-      - fix configure warning for sys/conf.h
+      - [BUG 1073782]: Restore PerfStat values for FreeBSD 5.x systems.
+      - [BUG 1633483]: Support CPU HAL on FreeBSD4.x
+      - [PATCH 1951996]: Fix for CPU stats on FreeBSD
+      - [PATCH 2507249]: sctp-mib support for FreeBSD.
+      - Add initial support for upcoming FreeBSD 7
+      - Fix configure warning for sys/conf.h
+      - patch from Cezary Morga to fix a make test on freebsd
 
-    HP:
-      - UX: BUG: 1742278: compile error on HP-UX 11.23 (IA64)
-      - UX: HP-UX needs _REENTRANT defined to pick up
+    HP-UX:
+      - [BUG 2779472]: Filesystems missing in hrStorage table
+      - [PATCH 2088726]: Fix an issue reporting memory in negative values.
+      - Needs _REENTRANT defined to pick up strtok_r.
 
     IRIX:
-      - [PATCH 1675869]: CPU statistics for IRIX
+      - [PATCH 1675869]: CPU statistics for IRIX based on PCP
+      - [PATCH 1709748]: Optimized IRIX cpu stats
 
     Linux:
-      - [BUG 1666005]: Fail to walk ipv6InterfaceTable on
-      - [PATCH 1581294]: 
-      - fix ethtool configure check for recent systems
+      - [BUG 1666005]: Fail to walk ipv6InterfaceTable on Linux
+      - [PATCH 1581294]: host-resources improvements
+      - [PATCH 1969627]: Handle install with empty /etc/sysconfig/network file 
+      - [PATCH 1704105]: Add IPv6 support to the inetNetToMediaTable
+      - [PATCH 1705594]: Various fixes to ipAddressPrefixTable reporting
+      - [PATCH 1708243]: Implement ipDefaultRouteTable
+      - [PATCH 1715405]: Implement ipv6ScopeZoneIndexTable
+      - [PATCH 1719254]: update HRFS_ignore list to current linux likelyhoods
+      - [PATCH 1724602]: MfD-based ipDefaultRouterTable implementation
+      - [PATCH 1783423]: return a correct ipv6InterfaceIdentifier of loopback
+      - [PATCH 1826102]: support longer interface names
+      - [PATCH 1828602]: Support ipDefaultTTL and ipForwarding SETs
+      - [PATCH 1896118]: Fix ifTable 32bit counters
+      - [PATCH 1927751]: Implement icmpMsgStatsTable
+      - [PATCH 2023633]: Implement SCTP-MIB
+      - [PATCH 2053273]: Implement EtherLike MIB
 
     MacOSX:
-      - [PATCH 1600453]: OS X
-      - [PATCH 1600522]: CPU HAL
-
-    Perl:
-      - link Perl modules against the exact set of libraries
+      - [PATCH 1600453]: OS X compile-time endian determination
+      - [PATCH 1600522]: CPU HAL implementation for mach/darwin
+      - Improve memory reporting (patch from Apple)
 
     Solaris:
-      - IF-MIB fix: add missing return at end of
-      - [BUG 1626153]: no hrSWRun informations on
-      - [PATCH 1623447]: hrSWRun
+      - [BUG 1626153]: No hrSWRun informations on Solaris zones
+      - [BUG 1810814]: tcpTable missing entries and wrong ports
+      - [BUG 1819189]: {ifOperStatus,ipAdEntIfIndex} reported incorrectly
+      - [BUG 1822275]: {ifOperStatus,ipAdEntIfIndex} reported incorrectly
+      - [PATCH 1623447]: Fix hrSWRun for terminated processes
+      - [PATCH 1719730]: Support for ipSystemStatsTable and ipAddressTable
+      - [PATCH 1824196]: {ifOperStatus,ipAdEntIfIndex} reported incorrectly
+      - [PATCH 1834699]: Fix 1833294: DLPI problems on Solaris 2.6
+      - [PATCH 2012404]: Deal with more than 10 interfaces.
+      - [PATCH 2751588]: Inconsistent data can be reported on Solaris 10U4+
+      - #define NEW_MIB_COMPLIANT to support Solaris 10U4+
+      - IF-MIB fix: add missing return at end of get_if_stats
 
     Win32:
       - [BUG 1662987]: compile error on Cygwin
-      - [PATCH 1622080]: A: pass Win32
+      - [BUG 2779541]: Fixed handle leak in pass_persist.
+      - [PATCH 1622080]: A: pass Win32 handles remain open.
+      - [PATCH 1706344]: Fix compilation with cygwin
+      - [PATCH 2686248]: Fix several winExtDLL bugs.
+      - [PATCH 2688342]: Fix VS2005 various compiler warning
+      - [PATCH 2691876]: Allow compiling the services using unicode.
+      - [PATCH 2693746]: improved socket startup support
+      - Add support for winExtDLL to build.bat
+      - Build fixes for MSVC 2008.
       - fix AES support
       - fix win32/Configure --with-ipv6
 
+*5.4*
+
+    build:
+      - [BUG 1416481]: Support specifying an explicit linker.
+      - enable-as-needed will try to link built libraries against needed
+	libraries at library link time, rather than application link time.
+
+    snmplib:
+      - [PATCH 1282566]: to rework transport creation to allow for
+	alternative interpretations of the address and a more flexible
+	transport registration system
+      - [BUGS: 1537459, BUGS: 1540745] Fix missing MIB parsing tokens
+      - [PATCH 1562168]: check for a sock fd less than 0.
+      - [PATCH 1570650]: create a logging shutdown function to propelry
+	clean up log registrations if needed.
+      - [PATCH 1565293]: UDPIPv6 transport reports wrong port number
+      - rename init_mib to netsnmp_init_mib to avoid symbol clash with
+	HP-UX's libnm
+      - [PATCH 1509943]: responses will get sent from the original dest IP
+	address when possible.
+
+    snmpd:
+      - [PATCH 1550725]: A new uint instance helper to match the existing
+	int, long and ulong helpers
+      - [BUG 1527930]: fix smux authentication
+      - [PATCH 1561277]: use net.ipv6.neigh.lo.base_reachable_time_ms
+	instead of deprecated base_reachable_time
+      - [BUG 1474468]: ifConnectorPresent always returns 0
+      - [PATCH 1524755]: to better support the UDPTable for unknown address
+	types
+      - [PATCH 1534877]: to add support for skipping NFS entries in the
+	host resources hrStorageTable.	See the skipNFSInHostResources
+	token in the snmpd.conf file for details.
+      - [PATCH 1557514 ]: Do not attempt to collect data during SET
+	processing.
+      - [BUG 1535903]: Support spaces within security names
+      - Agent builds default module list from a default_mibs.h rather than
+	a hard coded configure list
+      - [BUG 1559358]: check scanf results for diskio scanning
+      - [BUG 1564233]: Have configure test for rpm headers not just the
+	libraries
+      - [PATCH 1579364]: Updated darwin patch to fix compilation on Tiger
+	and Leapord
+      - [PATCH 1565703]: patch to fix rapid registrations/deregistration
+	issues
+      - [PATCH 1562688]: fix ping/reattach agentx code
+      - [PATCH 1551948]: Make pass_persist usable on uClinux
+      - [PATCH 1568150]: Extend pass_persist error messages that can be
+	passed back from the script
+      - [PATCH 1570650]: make delete table function public
+      - [PATCH 1575984]: block SIGHUP during reconfig
+      - [PATCH 1570982 ]: Solaris IF-MIB: Support for IPv6-only interfaces
+      - memTotalFree should report total virtual instead of physical memory
+      - build fix for --without-kmem-usage
+      - [BUG 1585815]: fix mfd bits length calculation
+      - [BUG 1427410]: Set auth engineID for SNMPv3 traps.
+      - [BUG 1502267]: Build access list in the correct order.
+      - [PATCH 1554827]: from rtyle: fix handling of failed proxy SET
+	requests
+      - [PATCH 1598966]: Fix bug #1598927: #elif build fix
+
+    snmptrapd:
+      - the traphandle directive now supports a -t switch to indicate
+	matching any OID in the tree below the specified OID
+      - [PATCH 1536773]: support partial oid matching
+      - [PATCH 1598968]: Fix bug #1587759: snmptrapd doesn't recognize -A
+	option
+
+    snmpdf:
+      - [BUG 1515507]: Handle failed requests better
+
+    perl:
+      - Fixed the perl bulkwalk function
+      - [PATCH 1575937]: fix usenumeric output in async varbinds so they
+	return OIDs instead of empty strings.
+      - update default_store module to latest default_store c-binding
+	tokens
+      - make perltest fixes for Solaris 2.6 and earlier
+      - fixes for 64-bit platforms
+      - make perltest fixes for HP-UX
+      - make perltest fixes for IRIX
+
+    mib2c:
+      - [BUG 1479916]: Restore consistency in row creation code.
+      - [BUG 2827269]: Suppress non-ordered TODO comments.
+
+    misc:
+      - Most net-snmp specific defines are now (also) available under a
+	proper NETSNMP_ prefix. The older, potentially conflicting names as
+	well as the autoconf variables can now be turned off by a special
+	define.
+      - [BUG 1585250]: don't use deprecated options in start script
+      - "make test" fixes for non-UDP transports
+      - [BUG 1577913]: add missing manual pages for executables, supplied
+	by Debian
+      - [PATCH 1596028]: from "Stephen J. Friedl": const fixes for the
+	mib_api(3) manual page
+      - RPM spec file fixes for 64-bit platforms
+
+    MacOSX:
+      - [PATCH 1566777]: build fixes for memory_darwin.c
+      - build fix for mibII/udpTable
+
+    Tru64:
+      - fix "auto_nlist failed on arptab_size at location 0" errors
+
+    IRIX:
+      - proper implementation for UCD-SNMP-MIB::laTable (avoiding nlist)
+
+    Solaris:
+      - [PATCH 1569537,1569539]: new UDP-MIB and TCP-MIB implementation
+	(enable through --with-mib-modules=udp-mib,tcp-mib)
+
+    AIX:
+      - use correct ARPTAB_SYMBOL and ARPTAB_SIZE_SYMBOL
+      - [BUG 1205300]: nlist err: neither nproc nor _nproc found (same for
+	rt_table, rthashsize, rthost, rtnet)
+
diff --git a/COPYING b/COPYING
index 26db606..3eef440 100644
--- a/COPYING
+++ b/COPYING
@@ -229,3 +229,99 @@
 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+---- Part 8: Apple Inc. copyright notice (BSD) -----
+
+Copyright (c) 2007 Apple Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without  
+modification, are permitted provided that the following conditions  
+are met:
+
+1.  Redistributions of source code must retain the above copyright  
+notice, this list of conditions and the following disclaimer.
+2.  Redistributions in binary form must reproduce the above  
+copyright notice, this list of conditions and the following  
+disclaimer in the documentation and/or other materials provided  
+with the distribution.
+3.  Neither the name of Apple Inc. ("Apple") nor the names of its  
+contributors may be used to endorse or promote products derived  
+from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND  
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A  
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS  
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,  
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT  
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF  
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND  
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,  
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT  
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF  
+SUCH DAMAGE.
+
+---- Part 9: ScienceLogic, LLC copyright notice (BSD) -----
+
+Copyright (c) 2009, ScienceLogic, LLC
+All rights reserved.
+ 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+ 
+*  Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+ 
+*  Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+ 
+*  Neither the name of ScienceLogic, LLC nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+ 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+---- Part 10: IETF copyright notice (BSD) -----
+
+Copyright (c) 2013 IETF Trust and the persons identified as authors of
+the code.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+· Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+· Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+· Neither the name of Internet Society, IETF or IETF Trust, nor the
+names of specific contributors, may be used to endorse or promote
+products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS
+IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/ChangeLog b/ChangeLog
index 1df020c..907caa1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,132 +1,4783 @@
--------------------------------------------------------------------------------
-Changes: V5.4.3 -> V5.4.4
+----------------------------------------------------------------------
 
-2011-06-24 12:38  dts12
+Changes: V5.5.1 -> V5.5.2
 
-   * configure, configure.in, include/net-snmp/net-snmp-config.h.in:
+commit 42b5afb3cd6d06adb426f1dbaa98358f2b2e8a53
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Wed Jul 18 10:46:47 2012 +0100
 
-   Missing check for rpmts.h
+    V5-5-patches out of Release Candidate
 
-2011-06-24 12:20  dts12
+commit 8bd440c43e365a0b77d47f582cade9f97c7bfce7
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Wed Jul 18 10:46:28 2012 +0100
 
-   * configure:
+    Version number update: 5.5.2
 
-   Version number update
+commit 6e0855a3157198499411ac52b46d5f32aad5b9fa
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Wed Jul 18 09:51:32 2012 +0100
 
-2011-06-24 12:08  dts12
+    Add missing return type in function declaration
 
-   *  man/netsnmp_agent.3, man/netsnmp_agent_registry.3,   
-      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
-      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
-      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
-      man/netsnmp_container.3, man/netsnmp_data_list.3,   
-      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
-      man/netsnmp_handler.3, man/netsnmp_instance.3,   
-      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
-      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
-      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
-      man/netsnmp_multiplexer.3,   
-      man/netsnmp_netsnmp_agent_request_info_s.3,   
-      man/netsnmp_netsnmp_column_info_t.3,   
-      man/netsnmp_netsnmp_data_list_s.3,   
-      man/netsnmp_netsnmp_handler_registration_s.3,   
-      man/netsnmp_netsnmp_iterator_info_s.3,   
-      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_s.3,   
-      man/netsnmp_netsnmp_request_info_s.3,   
-      man/netsnmp_netsnmp_table_registration_info_s.3,   
-      man/netsnmp_netsnmp_table_request_info_s.3,   
-      man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,   
-      man/netsnmp_read_config.3, man/netsnmp_read_only.3,   
-      man/netsnmp_row_merge.3, man/netsnmp_scalar.3,   
-      man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,   
-      man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,   
-      man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,   
-      man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,   
-      man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,   
-      man/netsnmp_table.3, man/netsnmp_table_array.3,   
-      man/netsnmp_table_container.3, man/netsnmp_table_data.3,   
-      man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,   
-      man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,   
-      man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,  
-       man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
-      man/netsnmp_util.3, man/netsnmp_utilities.3,   
-      man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
+commit 07d825e8bb35eea9ac6b1cb82cbb234fe66b1ab6
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Wed Jul 18 09:51:32 2012 +0100
 
-   documentation update
+    Add missing return type in function declaration
 
-2011-06-24 12:02  dts12
+commit 5db70036ef675635647e5b7c7253456838836647
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Jul 11 14:55:38 2012 -0700
 
-   *  FAQ, README, configure, configure.in, dist/net-snmp.spec,   
-      snmplib/snmp_version.c:
+    don't use --rebase
 
-   Version number update
+commit 17277689b629f4586d5d714d87ce6bc11f887668
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Jul 11 14:55:38 2012 -0700
 
-2011-06-23 15:41  dts12
+    don't use --rebase
 
-   *  agent/mibgroup/host/hr_swinst.c, configure, configure.in,   
-      include/net-snmp/net-snmp-config.h.in:
+commit 5206d25d4cb94d4b0dd331a5a4113d4d87782c42
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Jul 2 12:14:39 2012 -0700
 
-   Tweak RPM handling to work with library version 4.9
-   Based on a patch by Jan Safranek
+    better description of --disable-set-support
 
-2011-06-22 14:27  dts12
+commit f92853281477ee724a51a9967f37d3f1dd1b0f7e
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Jul 2 12:09:50 2012 -0700
 
-   * agent/mibgroup/host/hr_swinst.c:
+    remove duplicate definitions causing a problem
 
-   Provide a framework for reading RPM package information from
-   a cache directory (rather than querying the RPMdb directly).
-   
-   My apologies to Jeff Johnson for the delay in adding this
-   functionality.
+commit 5be27368751691fc1ab55fe62b4106d8d99b8704
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Jul 2 12:06:58 2012 -0700
 
-2011-06-17 19:06  bvassche
+    after pulling all the branches, switch back to the initial one
 
-   * agent/helpers/cache_handler.c:
+commit e72e205fdcef787ef840c8c928ed27351a69544b
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Fri Jun 22 13:58:07 2012 +0100
 
-   Use %p to print a pointer instead of %ld
+    Release Candidate for V5-6-patches
 
-2011-06-01 15:57  dts12
+commit f79a54f2472508b167d977f367c3864b5621e89d
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Fri Jun 22 13:42:53 2012 +0100
 
-   * CHANGES:
+    version update for 5.5.2.rc3
 
-   version update
+commit 56ef5f0db51cfd55226f82f94f3f3d2450e4feb5
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Fri Jun 22 13:39:32 2012 +0100
 
-2011-06-01 15:48  dts12
+    version update for 5.5.2.rc3
 
-   * ChangeLog:
+commit fe107794e7400d239e8af3da8b4a3fbef06b5da9
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Fri Jun 22 13:28:37 2012 +0100
 
-   version update
+    Release Candidate for V5-5-patches
 
-2011-06-01 15:47  dts12
+commit b6953b52c4ec426491146e1cc0f560b2173695b0
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Fri Jun 22 13:28:26 2012 +0100
+
+    Version number update: 5.5.2.rc3
+
+commit 0f84fbcf71995bddafab500d87c9c5a6f461a734
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Fri Jun 22 12:29:34 2012 +0100
+
+    CHANGES: snmpd: PATCHES: 3479740: Fix hrSWRunPerf statistics
+
+commit 1e3bb6060be6156d3ff316c5a7e4fd7f05e37cff
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Fri Jun 22 12:11:56 2012 +0100
+
+    NEWS: snmpd: BUG: 3532090: Fix high ifIndex values crashing hrDeviceDescr
+
+commit e8663fac8b88663282669726a08f16db16b5f4db
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Mon Jun 18 13:30:25 2012 +0200
+
+    Revert "CHNAGES: snmpd: fixed snmpd exiting shortly after start due to incoming signal."
+    
+    This reverts commit b11a4e93f50d8a544f835f376c3a4b8c0641a31a,
+    we're in RC-phase and code is frozen
+    
+    (sorry for noise)
+
+commit b11a4e93f50d8a544f835f376c3a4b8c0641a31a
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Mon Jun 11 16:26:09 2012 +0200
+
+    CHNAGES: snmpd: fixed snmpd exiting shortly after start due to incoming signal.
+
+commit a570238d58eb5a996b56f01a27a18df6f37d0f60
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Mon Jun 11 14:20:25 2012 +0200
+
+    More precisely describe -c option.
+
+commit e3bcd87c72fcea7706e868b5ace75296093f7497
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Thu May 31 14:09:42 2012 +0100
+
+    Fix dist/release format
+
+commit d813ce2eeefc68229cfcaf20603244cdd6d09d3c
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Thu May 31 14:07:52 2012 +0100
+
+    Fix dist/release format
+
+commit 131429e7062fbaa65b82affed1fb92df2c0cc813
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Thu May 31 13:38:38 2012 +0100
+
+    Release Candidate for V5-6-patches
+
+commit 1c8110b33b8105ca6190945a35fe7ae903252d68
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Thu May 31 13:21:38 2012 +0100
+
+    Avoid perl versioning problems when setting up the build environment
+
+commit 508ece16e6f6f49562da204792ae0644269994d1
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Thu May 31 13:20:58 2012 +0100
+
+    Fix handling of dist/release merge
+
+commit 5b8a8547b1a47d2f5b207f48f2496e4241d902c6
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Thu May 31 11:10:48 2012 +0100
+
+    version update for 5.5.2.rc2
+
+commit 6c32914bf28d695df349dca269e488b501700316
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Thu May 31 11:07:22 2012 +0100
+
+    version update for 5.5.2.rc2
+
+commit 2670ba6a5b0027d11ec3a5e18fe87db385f5e0e4
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Thu May 31 11:05:39 2012 +0100
+
+    make depend for 5.5.2.rc2
+
+commit e79e387b3e18b487ef4172c9d24eb9523404d0ad
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Thu May 31 10:54:27 2012 +0100
+
+    documentation update for 5.5.2.rc2
+
+commit 3f2111de6733a04e12d910d306a34d671e008762
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Thu May 31 10:46:11 2012 +0100
+
+    Release Candidate for V5-5-patches
+
+commit cefc6f7bd4fee0f5057e49300a6b1d15d2fd4f58
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Thu May 31 10:45:59 2012 +0100
+
+    Version number update: 5.5.2.rc2
+
+commit ccf8ff2c4db60122d41302e4aeb700e0b868105f
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Mon May 28 10:18:43 2012 +0100
+
+    CHANGES: snmplib: PATCHES: 3526599: Don't hang on retried failing SNMPv3 responses
+
+commit c575216850185b56454dad0253e3164979e13513
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Sun May 27 13:56:01 2012 +0200
+
+    Fix missing include. Fixes SIGSEGV on FreeBSD9 x64
+
+commit 1fbf33711a19eac9739ad23f6f6251eacc41f1c4
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue May 22 14:54:45 2012 +0100
+
+    CHANGES: Linux: PATCH: 3525998: Don't use an uninitialised value in error message
+
+commit 32c1686b67dc85c4a189576363065609dfed5e61
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue May 22 14:52:56 2012 +0100
+
+    Attempt to mark release-candidate branches as such.
+    Omit final-release-only steps when preparing preN/rcN releases
+    (Relies on a tweak to the Makerelease perl modules)
+
+commit 4c5633f1603e4bd03ed05c37d782ec8911759c47
+Author: Robert Story <rstory@freesnmp.com>
+Date:   Mon May 14 11:40:06 2012 -0400
+
+    NEWS: snmp: BUG: 3526549: CVE-2012-2141 Array index error leading to crash
+
+commit 91350092c46e66d06d74143f4816473db4d25160
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Mon May 7 19:56:33 2012 +0100
+
+    Mark version-specific changes _before_ pushing to central repository
+
+commit 7241accd70b82d0fcd44d5a5238b2ee9445900db
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Mon May 7 17:53:17 2012 +0100
+
+    version update for 5.5.2.rc1
+
+commit 7c796a15a1d1bb85feea940bd4e3516877920919
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Mon May 7 17:50:49 2012 +0100
+
+    version update for 5.5.2.rc1
+
+commit 07e268bfb64b0ec645b3f7e87266984f9217cf12
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Mon May 7 17:44:37 2012 +0100
+
+    make depend for 5.5.2.rc1
+
+commit 16eaaf6c3ba14596ca9efaf4b114f1b709f42b68
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Mon May 7 17:29:03 2012 +0100
+
+    documentation update for 5.5.2.rc1
+
+commit c729469ef12154930cf9d15967e16186fb445f30
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Mon May 7 17:27:20 2012 +0100
+
+    Version number update: 5.5.2.rc1
+
+commit 142571d3cea08f0c072d24c1d39a43c7446f8ce7
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Mon May 7 17:01:03 2012 +0100
+
+    When building a new release, the installed version of the perl
+    modules may well be different to the version being built.
+    That should not break the build.
+
+commit 5c0f64d6db2b593f7cc0ed2d4f55b7c592b774a8
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Mon Apr 23 22:25:15 2012 +0200
+
+    Only output cpu warnings once.
+
+commit ee58e4827b9fa16e6635ca003e8a4f11dcb5fb7a
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Mon Apr 23 22:17:42 2012 +0200
+
+    Fix speling in errormessage.
+
+commit 03f485df22f20e149cfae94c57cb82feecb5d74b
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Mon Apr 23 22:12:11 2012 +0200
+
+    Not all Linuxes use rpm (debian/ubuntu comes to mind)
+
+commit 930838224f781696bd35225f22569347416f1b16
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Mon Apr 23 22:10:15 2012 +0200
+
+    Check need for -lm to use round/exp
+
+commit 137fe582d6cc5611430dab46ef144efd84cfc803
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Fri Apr 6 20:46:56 2012 +0100
+
+    Revert commit 1f4a829b18275e4956ca91e5ec370df015f06133
+    (snmp_store_needed() API is not available in 5.[45].x)
+
+commit 2b7e64288c01a8a062026c521ca31a5e885f30cc
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Mon Apr 2 16:12:12 2012 +0100
+
+    FreeBSD-9: Fix for 'const'ifyed nlist arguments
+    Backport of ed65eca6e7f9cfa7380a78d56c01ed314745b169 from V5-6-patches
+
+commit 7e95d80b698051259645c074a53ffd264a6fa916
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Mon Apr 2 16:06:56 2012 +0100
+
+    FreeBSD-9: Fix for 'const'ifyed nlist arguments
+    Backport of ed65eca6e7f9cfa7380a78d56c01ed314745b169 from V5-6-patches
+
+commit 1a9b7b7c02e2deefe994d595a7cc1dd2ffbeee1d
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Mon Apr 2 15:51:20 2012 +0100
+
+    Fix compilation on FreeBSD 9.x with 'recent' header shuffling
+    Backport of c53d8c3525f590f2213d35b0da94123862f3e366 from V5-5-patches
+    (Patch #3363308 - omitting tweaks to configure)
+
+commit 3d9ddb41e263bc1a78f9f9440b8d4ad4f86c82e1
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Mon Apr 2 10:36:18 2012 +0100
+
+    Fix typo
+    Backport of 5b702b024b60176d7f5699b92e55da50a8deae71 from V5-6-patches
+
+commit 0d35c609564b66a1ffe81556d37adf0503c389ce
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Mon Apr 2 10:15:08 2012 +0100
+
+    Provide missing definition of NETSNMP_PRIo
+    (used in agent/mibgroup/ip-mib/data_access/ipaddress_solaris2.c)
+
+commit adf74bf753d3970357afd633803256241d9c7b87
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Mon Apr 2 08:20:46 2012 +0100
+
+    Fix IPv6 TCP & UDP tables, *BSD support (including OpenBSD)
+    Backport of commits 5cd1573625471c0583e9087aec6802b77157d5a2
+      and 50d73f0d56fe22c590530b3e305d41dcdac3ce00 from V5-6-patches
+
+commit cecd4869deb68f3d4c71e768d5b40dd576446925
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Thu Mar 29 22:29:31 2012 +0200
+
+    Running autoheader / autoconf
+
+commit 9bdbcca122c37da304fc6aa6939729475f90f5fd
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Wed Mar 28 09:30:49 2012 +0100
+
+    Doxygen-style documentation fixes (back-port of GIT commit c09903a42e9d97331fd9e48ee831a85afdf9c70a)
+
+commit 1f4a829b18275e4956ca91e5ec370df015f06133
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue Mar 27 21:41:24 2012 +0100
+
+    CHANGES: snmpd: PATCHES: 3495697: Store persistent snmpTarget table changes
+
+commit 1f75f377d0db01754c0c161dc44373081beef520
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue Mar 27 21:14:06 2012 +0100
+
+    CHANGES: FreeBSD: PATCHES: 3489387: Install FreeBSD 10 header file (plus other missing versions)
+
+commit 3d72c9e78f2ad817c9d1d82977327bbb20d63ab9
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue Mar 27 21:06:31 2012 +0100
+
+    CHANGES: snmpd: PATCH: 3487867: Don't skip missing ifXTable entries (ifConnectorPresent FALSE)
+
+commit 8a9b57291453cb8aec28e766c594701ed19c4fc6
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Mon Mar 26 21:03:41 2012 +0200
+
+    Fix for DragonFly 3
+
+commit e5c9a32f79eac2e85527c9cf05087cdae9b35a6c
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Mon Mar 26 20:59:53 2012 +0200
+
+    DragonFly needs _KERNEL_STRUCTURES to compile ipv6 code
+
+commit e2fc15f9e5a6e3e36be5f489601cbf6bf731917f
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Sat Mar 24 15:21:38 2012 +0100
+
+    Fix TCP state values for DragonFly
+
+commit 432fe3ddf54f2c98f936959469cb9b014d599f06
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Sat Mar 24 15:10:52 2012 +0100
+
+    Require perl to do pass_persist test
+
+commit 37d2770cf50c98023eeba90e25d372bff7316ada
+Author: Niels Baggesen <nba@user.sourceforge.net>
+Date:   Sat Mar 24 15:06:40 2012 +0100
+
+    Fix TCP state values for DragonFly
+
+commit 86a948d8691e881d55591dcabddc2739ce72b30e
+Author: Niels Baggesen <nba@nba-linux.sb.statsbiblioteket.dk>
+Date:   Sat Mar 24 15:01:37 2012 +0100
+
+    Properly find pass helpers for testing.
+
+commit 5b38f062b99b6ef36708e2c7de4965a3192612e9
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Wed Mar 21 18:34:48 2012 +0100
+
+    For safety, sizeof the right variable in memcpy
+
+commit e5f82782da05efa7c0e6dc2bf5a41ee11868f469
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Wed Mar 21 18:33:21 2012 +0100
+
+    Fix for hrSWRun data for FreeBSD
+
+commit 8327565e823270d10a4504568edbe5b5ae323a55
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Wed Mar 21 18:31:54 2012 +0100
+
+    Clean up variables for OpenBSD/NetBSD
+
+commit 170f6f027bf4f9174b7073530da4d07f400bba58
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Wed Mar 21 18:28:58 2012 +0100
+
+    Move declarations in front of statements
+
+commit dbb4573b69fae85cdc931b2892b5ce4e5b16b321
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Wed Mar 21 18:23:36 2012 +0100
+
+    Require kernel_netbsd for NetBSD6
+
+commit f11681f15aad7d9a52fa29812ecbb507f1b7fe24
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Wed Mar 21 12:36:38 2012 +0000
+
+    Check for old tarballs (and unpacked distributions) before starting.
+    These can confuse steps such as "make dependcheck", that do a 'find'
+    on the current tree, and would descend into such unpacked source trees.
+
+commit 470dcd4b6c3ff11ff0a3532a7340a56cffd69098
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Wed Mar 21 12:32:13 2012 +0000
+
+    Don't run "make docs; make mancp" if there's no Makefile present
+
+commit c9ac420343e16df2b7065f5bf2790df44e247fba
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue Mar 20 10:26:10 2012 +0000
+
+    Allow distribution as part of normal Net-SNMP packages.
+
+commit bdccc875710295aacf50f71eb1c1d2ee97f336fe
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Fri Mar 16 20:10:58 2012 +0100
+
+    Do not declare the local variables for opaque_special_types unless that option is set.
+
+commit b80a67da052adca1b5a644db83a782e15c2237c3
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Fri Mar 16 19:50:03 2012 +0100
+
+    Check that the data exist before trying to read it
+
+commit aaedd59cc2da701527dc2d261d4e9f85f16e7504
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Sun Mar 11 20:57:38 2012 +0100
+
+    Allow make test where the source path contains the string Net-SNMP to succeed.
+
+commit ce85832932ccd916c42319114c40885a466a9d0e
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Mon Mar 5 20:56:40 2012 +0100
+
+    More fixes for Solaris sh
+
+commit 0dd1e54557d1ba498b55d017b0a93e8ccf9bd522
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Mar 5 15:08:26 2012 +0100
+
+    CHANGES: snmpd: UDP-MIB: Report the proper address in udpLocalAddress instead of 0.0.0.0. Makes test T160snmpnetstat pass again. Fixes a bug introduced in commit c76fb96f65e33ba2fd212a921e8c386155ee5c7a.
+
+commit 518917e9f39f7a9d3c3bf3a865e8ac0e3026d600
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Mar 5 14:04:54 2012 +0100
+
+    snmplib/snmpUDPDomain.c: Fix source code indentation
+
+commit 2651909ccceabfcfadaf942c02450e28fe837dc9
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Tue Nov 9 12:04:04 2010 +0000
+
+    Passes now on MinGW too.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/trunk@19653 06827809-a52a-0410-b366-d66718629ded
+
+commit 5116d48378ecf03e722f3010ad47bf22a3fbcb8c
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Mar 5 10:47:20 2012 +0100
+
+    agent/mibgroup/ip-mib/data_access/ipaddress_linux.c: Reduce scope of prefix_val such that the compiler doesn't warn about an unsed variable if it isn't needed.
+
+commit 6e74d64f85a59d50e461db4c34ac76f9de468bfb
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Mar 5 09:22:31 2012 +0100
+
+    testing/eval_tools.sh: Avoid using grep options -q and -w because grep in Solaris' default path doesn't understand these options.
+
+commit 10f566f4d4cbb3e205023c23669289e4bfd089cb
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Mar 5 10:47:39 2012 +0100
+
+    perl/SNMP/SNMP.xs: Fix a compiler warning
+
+commit dae4e16be86117861f63d1a2f981ad361418f5c6
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Mon Mar 5 09:06:52 2012 +0000
+
+    Mark the changes make as part of the release process as specific to
+    the particular branch being released.  Version tags, changelog entries
+    and the like shouldn't propagate to later branches.
+
+commit 28f6226f2e228b8ca248489735f86502b2cce0a1
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Mon Mar 5 09:06:52 2012 +0000
+
+    Mark the changes make as part of the release process as specific to
+    the particular branch being released.  Version tags, changelog entries
+    and the like shouldn't propagate to later branches.
+
+commit ee71049c3e21c1d0e3424297136652bbe0e39d85
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Sat Mar 3 16:49:41 2012 +0100
+
+    mibgroup/icmp.c: adjust ifdefs to make it compile on BSD's
+
+commit 44acd6c285fb5614b4c9611b1abdeca9dd28e4bb
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Fri Mar 2 21:12:47 2012 +0100
+
+    Fix spelling of mib module fsys_getfsstats
+
+commit 1fa1fee3693f67b820223806b3d73afd4c50ec18
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Fri Mar 2 01:37:20 2012 +0100
+
+    Silence a clang warning.
+
+commit 93263b98a5db344cf2c4d489c43971e7b29cdb03
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Thu Mar 1 13:37:20 2012 +0000
+
+    version update for 5.5.2.pre1
+
+commit 5a175428b973d2ea8553e29fecf94cf1566aa858
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Thu Mar 1 11:48:18 2012 +0000
+
+    version update for 5.5.2.pre1
+
+
+commit 364276a1c5aa66caa23eb5b7f111fdeb5af71fa7
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Thu Mar 1 11:45:10 2012 +0000
+
+    make depend for 5.5.2.pre1
+
+commit 73598340172eff75729a6d57192b8171d5bbf00e
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Thu Mar 1 10:42:56 2012 +0000
+
+    Version number update: 5.5.2.pre1
+
+commit f3214402672ca199fd531e66122bf96c4d9a4eb7
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Thu Mar 1 10:42:39 2012 +0000
+
+    version update for 5.5.2.pre1
+
+commit 432cbb7a5501ab90d66d0a83e731e7343bc04b37
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Sat Feb 25 10:13:15 2012 +0100
+
+    Correct typos
+
+commit 6a6c9bbc7584f196a1185cc1935204f1206811ed
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Wed Feb 29 08:55:35 2012 +0100
+
+    CHANGES: Bug 3152841: Install util_funcs subheaders
+
+commit d515e2a6e4c2a1c4d84734cc7b2d0b2fc5a894ad
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue Feb 28 15:56:21 2012 +0000
+
+    CHANGES: snmpd: PATCHES: 3487919: Fix compilation when caching is disabled
+
+commit af8368ed8898a78d0868b47af46bc9db07d1c764
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue Feb 28 15:50:56 2012 +0000
+
+    CHANGES: snmplib: PATCHES: 3414773: Encode integer value using ASN_INTEGER
+
+commit 19e2715807fe06fd0baedf88165011aee933e755
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue Feb 28 14:05:34 2012 +0000
+
+    CHANGES: man: BUGS: 3490708: Clarify use of common command-line options
+
+commit eed0bcbc43fea18259f0f63b2081b6d10535a052
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue Feb 28 09:27:11 2012 +0000
+
+    Skip SET-based baby-steps when compiled with --disable-set-support.
+    Inspired by bug #3454168
+
+commit c4276b6232c29145c039884e6b5a6b6da4b93837
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Mon Feb 27 15:54:45 2012 +0000
+
+    Omit SET-related code when compiling with --disable-set-support (inspired by patch #3424930)
+
+commit 01c930edcc25700d6b5fb0376f55a26425e13fb0
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Mon Feb 27 15:17:22 2012 +0000
+
+    Omit SET-related code when compiling with --disable-set-support
+    (inspired by patch #3424930)
+
+commit 2b7f13495228635d816e58b2174dc124dd0cf39f
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Fri Feb 24 07:43:22 2012 -0800
+
+    set MERGE_AUTOEDIT before merging to avoid the future git 1.7.10 forced msg
+
+commit e1b910b0be9343586ae9edba6f46040af315fcdd
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Feb 23 10:27:54 2012 +0100
+
+    CHANGES: snmpd: init_agent() + init_kmem(): Return an error value instead of invoking exit() if access to kernel virtual memory is denied
+
+commit 463eed2120f9d191bc22673496a49e8174664e4b
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Feb 23 10:03:31 2012 +0100
+
+    Remove obsolete symbol NETSNMP_EXIT_ON_BAD_KLREAD
+
+commit aa766d196e5287f6ca79b58a345b024260aba354
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Feb 20 17:07:13 2012 +0100
+
+    IF-MIB: do not trigger undefined behavior (>> 32 of a 32-bit variable) when updating a counter and ifi_ipackets is a 32-bit variable
+
+commit c3fb6dd9e6b99e9542493188987871fc5017cb3c
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Feb 23 09:45:45 2012 +0100
+
+    Fix a compiler warning on systems where mode_t is unsigned
+
+commit a6db239945e195de5a90fa183700b27a6ecb28d3
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Tue Feb 7 00:11:14 2012 +0100
+
+    Fix possible memory leak from recent declarations patch
+
+commit 0fbbb9a9e2906a7af956957061d485874462aea9
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Mon Feb 6 20:43:04 2012 +0100
+
+    Do not mix declarations and statements
+
+commit f308d5bafb05d78ed4030c4ecff324b6cbda680f
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Feb 6 15:25:30 2012 +0100
+
+    Fix two compiler warnings in agent/mibgroup/disman/ping/pingCtlTable.c
+
+commit debac498fe8410110107a2fe64f8afb748edaa07
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Mon Feb 6 16:48:09 2012 +0100
+
+    CHANGES: added OCFS2 (Oracle Cluster FS) to hrStorageTable and hrFSTable
+
+commit a05c27c2711cb41582a3b4c31e38b0e93530b62d
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Feb 6 14:51:33 2012 +0100
+
+    Fix spelling in a source code comment
+
+commit 910d7b0d99183609b9529b04c3f29330eb661021
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Feb 6 14:38:12 2012 +0100
+
+    Replace netsnmp_timeval_uptime() by netsnmp_get_agent_uptime()
+
+commit 43a83f6c6a96cc2316b70eecacf127eb6913c7a7
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Feb 6 11:19:15 2012 +0100
+
+    Use the assignment operator instead of memcpy() for copying struct timeval
+
+commit 2fe579efb1cb3a74f82803ca323928f6b8e4b5c0
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Feb 3 14:04:02 2012 +0100
+
+    Make agent/mibgroup/mibII/icmp.c build again on non-Linux systems.
+    
+    See also commit 345a1e4254812cb9edc1d274491b76681a9dba1e.
+
+commit 881de6ab7355277a5c116a008fbe513293b05039
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Feb 3 10:08:21 2012 +0100
+
+    Fix compiler warnings triggered by the Rmon MIB implementation
+
+commit 4629933c0d3b3f9f4ba583534f79a37fb9633817
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Feb 2 20:05:31 2012 +0000
+
+    More compiler warning fixes
+
+commit e9b5a3dee6f9afab8b90a29392040632b075ad7a
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Feb 2 16:56:55 2012 +0100
+
+    Use SNMP_MIN() instead of min()
+
+commit c7d11fa00f9995ddb9fe3d4994a3e9790da2e189
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Feb 2 15:18:40 2012 +0100
+
+    Restore commit dbb8795a7df595f0603f2ec61704799f4c482667 partially.
+
+commit 00fd62720ec454f5a690de4feba08223cfb2c3f8
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Feb 2 14:48:44 2012 +0100
+
+    CHANGES: snmptrapd: Avoid crash during shutdown due to invoking perl_destruct(NULL)
+
+commit d9e229d81abeaf191ef2ccb077842885c230d622
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Feb 2 14:47:41 2012 +0100
+
+    Remove a superfluous declaration
+
+commit 1e2e2af6cae830f381e87a244d029eb86bf3fcce
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Feb 2 13:20:37 2012 +0100
+
+    perl/SNMP/examples/pingmib.pl: Add error checking
+
+commit 241a141e31f1684fc6cf70cc4a00cce636fd3526
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Feb 2 11:28:37 2012 +0100
+
+    Make configure-time EVP_MD_CTX_create() detection work on the 5.4 branch.
+    
+    See also commit 46eac02e9a27bf4f3068e795cab891f05a848870.
+
+commit 6d9d14feaaa2d0fec68b4d158944d32cb04ff1bc
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Feb 2 11:12:00 2012 +0100
+
+    Revert the changes that break the build on the 5.4 branch from commit dbb8795a7df595f0603f2ec61704799f4c482667.
+
+commit 8abe49e30c97c8983e83b45a35c716fe91f66bea
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Feb 1 11:56:58 2012 +0100
+
+    Fix several compiler warnings in the DISMAN MIB implementations.
+
+commit f9fb0a533375e14dc370025a0b2fbc761bf27be6
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Feb 2 09:56:02 2012 +0100
+
+    Revert "HOST-RESOURCES_MIB: fix a compiler warning" because it's wrong.
+    
+    This reverts commit aa6b79bc124a7b7a885d7e5035ab06aa3ecef613.
+
+commit ca4a4fe25efd2714f8f1961b97856616563f42c9
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Feb 2 10:21:49 2012 +0100
+
+    .gitignore: Add python/build
+
+commit aa528bd22c7493ca8d67e678fbf615ca0f63ea6d
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Fri Jan 20 14:13:18 2012 +0100
+
+    Revert "Fix format specifiers to avoid warnings" - there is no NETSNMP_PRIo in V5-4 or V5-5 branches
+    
+    This reverts commit 390c0114c8ec0bdb27b08b6f74e3f6ef3a62981b.
+
+commit 2fb99be9aa86a6ca349b86d4ef8bc726ed9f2a82
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Fri Jan 20 14:58:35 2012 +0100
+
+    Don't touch reginfo when registration fails - it has been already freed.
+
+commit e5c35589e0bf416bfd036bd468f42aaeab25e788
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Fri Jan 20 14:55:56 2012 +0100
+
+    Don't touch reginfo when registration fails - it has been already freed.
+
+commit 345a1e4254812cb9edc1d274491b76681a9dba1e
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Fri Jan 20 14:51:26 2012 +0100
+
+    Fixed error handling in init_icmp().
+
+commit 3c3eeae80d796f27597c901e7ff2046c769ef4b8
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Fri Jan 20 15:08:09 2012 +0100
+
+    Mark rowreq_ctx as freed so next iteration allocates new one instead of reusing the freed one.
+
+commit af9abd53c2337c90a691a7b044ff3f97c1003161
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Fri Jan 20 15:05:10 2012 +0100
+
+    Don't touch reginfo when registration fails - it has been already freed.
+
+commit cf9465f54181e62e21a9b10219131107a3d2ebf6
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Fri Jan 20 15:04:06 2012 +0100
+
+    Don't touch reginfo when registration fails - it has been already freed.
+
+commit 7871f2b09b8b52f34a9e57784266459053165bcb
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Fri Jan 20 15:02:50 2012 +0100
+
+    Don't touch reginfo when registration fails - it has been already freed.
+
+commit 7a37f33d310c9598607bc323d9bdbf91aaf72c95
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Fri Jan 20 15:00:51 2012 +0100
+
+    Don't touch reginfo when registration fails - it has been already freed.
+
+commit 3e45f7026249e45350edaac85337423aa0e95d8b
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Fri Jan 20 14:13:18 2012 +0100
+
+    Revert "Fix format specifiers to avoid warnings" - there is no NETSNMP_PRIo in V5-4 or V5-5 branches
+    
+    This reverts commit 390c0114c8ec0bdb27b08b6f74e3f6ef3a62981b.
+
+commit 61936762e641c18db75aa5125a33e776c677adc5
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Fri Jan 20 11:13:39 2012 +0100
+
+    Fixed freeing reginfo twice on error in a template and all its instances.
+
+commit cbf1c91baf7191be5fa27d81bcf8714331a2c12f
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jan 20 09:20:42 2012 +0100
+
+    Use snmpTargetParamTable_dispose() to free a struct targetParamTable_struct.
+    
+    Fixes a bug introduced in commit dbf26a05a04ef24c47346e5adda48e338498e71f.
+
+commit aa6b79bc124a7b7a885d7e5035ab06aa3ecef613
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jan 20 09:20:31 2012 +0100
+
+    HOST-RESOURCES_MIB: fix a compiler warning
+
+commit 3a76b43e11fffada632fccb848ab500e876ad48b
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Jan 18 16:21:05 2012 +0100
+
+    CHANGES: python: Avoid that an SNMP set with UseEnums enabled causes a segmentation fault
+
+commit 84dec9fa92b0aa2d58eb7020330f4f98e5154321
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Jan 18 14:38:21 2012 +0100
+
+    python/netsnmp/client_intf.c: Fix most compiler warnings
+
+commit 38cf218c3f1a727786e227a5d3fb186fd0f1a15f
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jan 19 14:50:13 2012 +0100
+
+    Fix a typo
+
+commit ce1f284a63eb81644b3e32606cbe39b67e1dff2a
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jan 19 14:37:09 2012 +0100
+
+    Free previously allocated memory on errors.
+
+commit 7e21413ca6f2efd7a3afb62c62b644881b8bd1e7
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jan 19 13:46:30 2012 +0100
+
+    Properly allocate and free engineID.
+
+commit 34c962882607c3638a2fa25a2ac531492d71c787
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jan 19 13:37:25 2012 +0100
+
+    Free locally allocated tmStateRef.
+
+commit f57ae531dc5658abcd65b1627615525238d16d2d
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jan 19 13:20:24 2012 +0100
+
+    Free previously allocated memory on errors.
+
+commit 536bc57556c3141561ea4a194810b16290a691ee
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jan 19 13:15:47 2012 +0100
+
+    Added check if the function actually does something.
+
+commit a0777d307dbcaf219ee0184a0fbab9d4e5d6aa0b
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jan 19 13:01:45 2012 +0100
+
+    Free previously allocated memory on errors.
+
+commit 8b97a71c8e7959428eb4d4e8d90e9096d43ff09f
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jan 19 12:57:26 2012 +0100
+
+    Free previously allocated memory on errors.
+
+commit 2c1507c22030549ae660c0e211fbdc5c75ec5c57
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jan 19 12:53:47 2012 +0100
+
+    Free previously allocated memory on errors.
+
+commit 65f2b7bcd4fe03906aa1a115ab60a89b8ae933d5
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jan 19 12:51:36 2012 +0100
+
+    Close open files on error.
+
+commit 0e52e4f66d44766bea37473556c78e5219b95461
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Jan 18 15:45:33 2012 +0100
+
+    Free previously allocated memory on errors.
+
+commit dbf26a05a04ef24c47346e5adda48e338498e71f
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Jan 18 15:42:17 2012 +0100
+
+    Free previously allocated memory on errors.
+
+commit 748da84b1fd654e338bc701e8f9e5da229187f1c
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Jan 18 15:32:04 2012 +0100
+
+    Free previously allocated memory on errors.
+
+commit eb217146fd54036ea4202bfef78bbf774d7e382d
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Jan 18 15:23:10 2012 +0100
+
+    Free previously allocated memory on errors.
+
+commit 9ba38eec66138ec1f613ea8d04e158130c7121bc
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Jan 18 15:18:55 2012 +0100
+
+    Free previously allocated memory on errors.
+
+commit d9d938d3018c27f53277bc5e59578500490c1d09
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Jan 18 15:16:38 2012 +0100
+
+    Close open file on error.
+
+commit d5e817d5bd518d9ac6a0d60e0e141dd64f27ad19
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Jan 18 15:14:12 2012 +0100
+
+    Free previously allocated memory on errors.
+
+commit 2ae68f059df9d74b074d12f59c1847466ed576cd
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Jan 18 15:03:17 2012 +0100
+
+    Free previously allocated memory on errors.
+
+commit a00f3d461121b545aed72ac12b2438791dcfc4ba
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Jan 18 14:58:39 2012 +0100
+
+    Free previously allocated memory on errors.
+
+commit ba5d5292b04393b0c7d7d7ed961241929418c6e4
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 17 17:05:14 2012 +0100
+
+    Fixed dereferencing NULL.
+
+commit da2d6a7028a13b9edf3a5c84314d0f1feef76714
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 17 16:44:56 2012 +0100
+
+    Prevent dereferencing NULL.
+
+commit f88054a9b69b6de274f7a14a59b47323e5e4e4c6
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 17 16:37:35 2012 +0100
+
+    Don't dereference context if it's NULL.
+
+commit 5e95ca6790076b788072a801ee7c82969d995bcb
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 17 16:17:09 2012 +0100
+
+    Prevent dereferencing NULL when a transport does not have f_fmtaddr.
+
+commit eed6f5f9b9ae54d2ceab67ad85adde1f6a8a21d5
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 17 16:13:13 2012 +0100
+
+    Prevent dereferencing NULL.
+
+commit 41cde68b5fa4b38d81450cf91e082cdfa825e7cf
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 17 16:10:10 2012 +0100
+
+    Check if a registration was really found.
+
+commit 5b72a40853876a186efcc0090a4e32c235b9c05f
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 17 16:03:58 2012 +0100
+
+    Don't dereference NULL when difflen is SMUX_MAX_PRIORITY (which is highly unlikely, but...)
+
+commit fa6a912e41c5d0fd2a636894e86b6426c07375ab
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 17 15:37:44 2012 +0100
+
+    Check for missing value in setEvent.
+
+commit 410b71da425389fecc25d14f49f23753581576ad
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 17 15:28:41 2012 +0100
+
+    Dereference ereg only if it is not NULL.
+
+commit 185272d1a0b913774186f1b9135aeaf637ebed52
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 17 15:17:21 2012 +0100
+
+    As per above code, template_v2pdu can be NULL, so check it before dereferencing.
+
+commit 48e5ead3fd2c2b385df6972c67526ff6bdc30768
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 17 14:42:22 2012 +0100
+
+    Updated last fix to new error reporting style.
+
+commit f33d33615d6d85d0073726473c4146cbcdf11ced
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 17 14:30:07 2012 +0100
+
+    Fixed sigsegv when empty config line is parsed.
+
+commit b5df1eeb47ed3559b6f4d9ecccdb242126e6c992
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 17 14:11:58 2012 +0100
+
+    Fixed (highly theoretical) sigsegv when sp->securityEngineID is NULL.
+
+commit 6feed629a71899c113096959d8549dc1201e8f9a
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 17 13:43:37 2012 +0100
+
+    Added NULL and len check just in case someone provides value = NULL and nozero len (-> NULL is then dereferenced).
+
+commit 355c5ab264af2a6020a1d8a923f80f11b942295e
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 17 13:36:41 2012 +0100
+
+    Extend the NULL check, i.e. return if there is nothing to remove.
+
+commit ddd7948acad938cd42974505ddca4f0372116709
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Jan 16 11:11:29 2012 -0800
+
+    update sparta's copyright
+
+commit 41256086a7a5041453419cfd6e562c7b55c56b0a
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Jan 16 10:32:04 2012 -0800
+
+    pulled full copy of extractnews from master
+
+commit 625a70dbdfd9902da79efa293fe6d2ac8ccf2b2e
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Jan 16 10:24:19 2012 -0800
+
+    update to change to the newer log generating/parsing
+
+commit 62e32b13089b29edcf276f615da67e4508fe7bb5
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Jan 16 09:29:42 2012 -0800
+
+    conflicting merge from master for extractnews
+
+commit 70084da61d2bcbd2cf1ed81bdc3bf6794c2affb6
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jan 13 11:49:16 2012 +0100
+
+    CHANGES: snmpd: DISMAN-SCHEDULER-MIB: Handle 32-character schedContextName values correctly.
+    
+    See also commit b3c4982542e0ab151fb3884754cdfbcb472da52d.
+
+commit c1526fccc0474c1db18caa9dbb833853cddde3cc
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jan 12 15:13:21 2012 +0100
+
+    Fixed a typo.
+
+commit a27aa19df283156c032c81eaee5e115859d38c17
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jan 12 15:11:32 2012 +0100
+
+    Don't replace 'rc' variable, it's value is needed outside the loop.
+
+commit 985dff2b0876d9483c414fccea3ef6bc63e14561
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jan 12 15:01:32 2012 +0100
+
+    Removed duplicate code.
+
+commit 2fd7818318e7a5dfe98f52ccf750c2a63e825ded
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jan 12 15:00:22 2012 +0100
+
+    Removed duplicate code.
+
+commit 15f21130ba33dc9afd164e52dfd74c9cec0e9232
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jan 12 14:58:14 2012 +0100
+
+    Removed duplicate code.
+
+commit 38fd6378cc3275180f63b8d9b9a4072b3dabf8e4
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jan 12 14:25:06 2012 +0100
+
+    Fixed a typo.
+
+commit ebd92e19b10c0a38e17cde407864b45c26e17327
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jan 12 14:07:43 2012 +0100
+
+    Removed unnecessary if (value) check - value is checked few lines before.
+
+commit acdceb50ea66d6b323c74ee021fb77e810e4e7af
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jan 12 13:43:19 2012 +0100
+
+    Prevent memory leak when malloc fails.
+
+commit 17053e34cfe9a8ab395fb50f5c3f1dafc7247aeb
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jan 12 13:32:57 2012 +0100
+
+    Fixed double fclose().
+    Linux man page for fclose(3) says: In either case any further access (including another call to fclose()) to the stream results in undefined behavior.
+
+commit a6641edb9cb74fc2236b42ce5554fc3329956552
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Jan 11 15:22:34 2012 +0100
+
+    MinGW: Skip test T065 if not started from inside an MSYS shell
+
+commit a883ef1982f301b1485d227301674927330f5b67
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Jan 11 15:14:53 2012 +0100
+
+    Moved debug oputput before return.
+
+commit 3b686566296dd87bc42b7f1169daacdb3c45cc58
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Mon Oct 18 06:25:56 2010 +0000
+
+    Win32: builds again without warnings with MSVC 6.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-6-patches@19489 06827809-a52a-0410-b366-d66718629ded
+
+commit f3a7d1b09609dad649f58bbdb5b7e10d39b398c1
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Sun Oct 17 11:04:06 2010 +0000
+
+    Follow-up for r19476: fixed a typo.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-6-patches@19478 06827809-a52a-0410-b366-d66718629ded
+
+commit 2de73bd365a381b9c353ca5230769eefb1ac71ed
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Jan 11 11:42:42 2012 +0100
+
+    local/passtest: Remove an incorrect PATH= statement
+
+commit 699513f1238e0adce1f1cec98e0d147293fc5047
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Sun Oct 17 09:25:51 2010 +0000
+
+    NETSNMP_REMOVE_CONST()-related cleanup.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-6-patches@19476 06827809-a52a-0410-b366-d66718629ded
+
+commit 6358dee72fb347e2600a0a7bd21f23270d3a00f6
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Jan 11 10:58:15 2012 +0100
+
+    agent/mibgroup/ucd-snmp/versioninfo.c: Add a comment
+
+commit 5396bfe032c8cbc73c8ff5d4b085ebada9f59846
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Jan 11 10:30:16 2012 +0100
+
+    Replace strncpy()/strncat() by strlcpy()/strlcat()
+
+commit feb3af28dcae22015ae865a2e5dd8c416e9991d8
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Jan 11 10:02:08 2012 +0100
+
+    Replace strncpy()/strncat() by strlcpy()/strlcat()
+
+commit b7e1aa255bae4a3453f9eca644a876634351f11d
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Sat Mar 20 19:36:28 2010 +0000
+
+    CHANGES: libsnmp: changed the type of the fourth argument of netsnmp_set_row_column() from const char* to const void* such that no cast is necessary when passing another datatype then char* or const char*.
+    CHANGES: Win32: changed in_addr_t from u_int to u_long such that it matches the datatype of sockaddr_in::sin_addr.
+    Also, fixed several compiler warnings (mostly char * <> u_char * mismatches) and removed some casts.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/trunk@18345 06827809-a52a-0410-b366-d66718629ded
+    
+    Conflicts:
+    	agent/agent_registry.c
+    	agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c
+    	agent/mibgroup/mibII/interfaces.c
+    	agent/mibgroup/ucd-snmp/disk.c
+    	apps/snmptrapd.c
+    	snmplib/snmpIPv6BaseDomain.c
+    	snmplib/snmpUDPIPv6Domain.c
+    	snmplib/system.c
+
+commit f47a3752849db075e6f2053b8595b7b792fb6462
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Fri Oct 15 10:56:09 2010 +0000
+
+    CHANGES: Win32: building: Builds now correctly with a 64-bit compiler.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/trunk@19458 06827809-a52a-0410-b366-d66718629ded
+
+commit 02b6056df95da8b673034e39c2c7c386ed0f369c
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Tue Jan 10 11:44:53 2012 +0100
+
+    Fix a compiler warning about casting away const
+
+commit a19865832fc77f4c048144d91a431b1e94d329f2
+Author: Magnus Fromreide <magfr@users.sourceforge.net>
+Date:   Wed Oct 14 23:12:05 2009 +0000
+
+    CHANGES: apps, snmplib: PATCH: 2835577: identified by "Bart Van Assche": Replace SNMP_ZERO of arrays with a memset.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/trunk@17797 06827809-a52a-0410-b366-d66718629ded
+
+commit 67a3e2eccb95f9c9d0809efcbddcd866ee3062d5
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Wed Jan 6 14:27:15 2010 +0000
+
+    Fixed a compiler warning about discarding the const qualifier.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/trunk@17970 06827809-a52a-0410-b366-d66718629ded
+
+commit 3dcde2e8a595a527f06142c3b852de8433a1cf28
+Author: Magnus Fromreide <magfr@users.sourceforge.net>
+Date:   Sun Jan 24 14:27:55 2010 +0000
+
+    CHANGES: snmplib: Prevent gcc ped-warning for NETSNMP_REMOVE_CONST
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/trunk@18052 06827809-a52a-0410-b366-d66718629ded
+
+commit c2e1525a85bda5299a3b9f241614f7e6509aeeba
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Wed Jan 6 13:35:11 2010 +0000
+
+    Backport commit 295f473c83546221b2a71d815c61e33a67f98ae3: refine NETSNMP_REMOVE_CONST() implementation.
+
+commit cb423b0ae9ed0059aa100dc4e2fd93ad1b97faf8
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Wed Jan 6 11:57:51 2010 +0000
+
+    Backport commit e2fb09e0093e2f648fe2638da2f3af18fdb32bf0 - introduce NETSNMP_REMOVE_CONST().
+    
+    Conflicts:
+    	agent/snmp_perl.c
+    	snmplib/snmp_service.c
+
+commit afc396ab1618a8595a2519fbc25f7a498e174411
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Jan 11 08:49:34 2012 +0100
+
+    Unbreak netsnmp_mktemp() and make_temp().
+    
+    These were broken by commit bb8fcbb874998000f945f058d1aa6fe14e925899.
+    Also replace a strncpy() call by a call to strlcpy() and replace the
+    make_tempfile() implementation by a call to netsnmp_mktemp().
+
+commit 210185c15d0d65f0ea98b5e3c2e0776f6222d170
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Jan 11 08:27:43 2012 +0100
+
+    Fix a crash during startup of snmpd introduced by commit 885061687d9caa38470979667d7d8ad6563cedad.
+    
+    Also, make sure there is only a single copy of the cleanup code in function
+    mkdirhier().
+
+commit 8bb4e86abcf98ff28748af0af89c98e64d5cd961
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Wed Jan 11 07:47:12 2012 +0100
+
+    Reduce the scope of the oldmask variable.
+
+commit 3aad15ae560ac857e73c90764e903e7ca02b3295
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 10 15:40:59 2012 +0100
+
+    Fixed buffer overflow for large OID names
+
+commit fba188ee82010b2f2d8ca2e426ba654499ab3d0a
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 10 15:31:33 2012 +0100
+
+    fixed buffer overflow in __concat_oid_str
+
+commit 21d25d86b8e4904d798dc8c96dade9e5048457a8
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 10 15:26:07 2012 +0100
+
+    Fixed buffer overflow when parsing port numbers.
+
+commit d36931841b2fc2cebc6364b2949129a0ad42ad1d
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 10 15:05:51 2012 +0100
+
+    Fixed a buffer overflow when large SumFile is used.
+
+commit 0efdd022da09af1b5e16171fa7a2b523c5d6ec59
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 10 15:01:53 2012 +0100
+
+    Fixed buffer overflow when too big temp file pattern is used.
+
+commit 560bc6c09b751556efd6b4c4495751b109a93f92
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 10 14:59:24 2012 +0100
+
+    Fixed buffer overflow, just to be sure.
+
+commit 8291d7c5b92a31dd4f582b497d4b2a0853367a56
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 10 14:55:16 2012 +0100
+
+    Fixed buffer overflow.
+
+commit 88e1f34de7300575fa6dab857ecddb242a87de80
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 10 14:48:55 2012 +0100
+
+    Fixed buffer overflow when too long interface names are used.
+
+commit be1375a9926ebe0cd5b78a4045c3bd11c83664b1
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 10 14:46:49 2012 +0100
+
+    Fixed buffer overflow when a sensor name is too long.
+
+commit 1cb24625372062b14c71d7dd51e20fef773e2743
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 10 14:41:00 2012 +0100
+
+    Fixed buffer overflow when a CPU has too long name.
+
+commit 84c807ee03251e54856e83d62d06ea08b8df527a
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 10 14:36:50 2012 +0100
+
+    Fixed buffer overflow when too long interface names are used.
+
+commit c310e390b5dd05f24be7eb1904c74e41259c93db
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 10 14:24:54 2012 +0100
+
+    Fixed buffer overflow when too big temp file pattern is used.
+
+commit 4600d11434e83b8653cf9f813a3d8b630455b42d
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 10 14:17:08 2012 +0100
+
+    Fixed plausible string overflow before parsing command line options.
+
+commit 885061687d9caa38470979667d7d8ad6563cedad
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 10 14:11:02 2012 +0100
+
+    Get rid of (insecure) SNMP_MAXPATH in mkdirhier()
+
+commit 8016890a445f6a7e2a873a04873d4e27b6ee64e3
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 10 13:48:34 2012 +0100
+
+    Fixed wrong integer size on 64 bit platform.
+
+commit bb8fcbb874998000f945f058d1aa6fe14e925899
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 10 13:31:36 2012 +0100
+
+    Secure mkstemp() with umask() - on some implementations it does not set 0600 permissions automatically.
+
+commit 2f4e6acd714183f015b763657f8f084593357e26
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Tue Jan 10 10:38:16 2012 +0100
+
+    .gitignore: Ignore perl/*.yml files
+
+commit c365d80c16c2d17b160011e8c1f9cb958954e9db
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Tue Jan 10 08:34:16 2012 +0100
+
+    CHANGES: snmptrapd: Do not invoke shutdown_perl() from inside the SIGTERM handler since that fails if SIGTERM is received while a Perl handler is active. Based on a patch posted by Joel Avni <javni@arubanetworks.com>
+
+commit d059fb878b1436599953cea5a077499ddcdcbcb5
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jan 6 17:03:55 2012 +0000
+
+    CHANGES: BUG: 3440752: IF-MIB: Report interface speed correctly for Ethernet interfaces if other than 10 Mbps, 100 Mbps, 1 Gbps, 2.5 Gbps or 10 Gbps. Add support for NICs faster than 65 Gbps.
+
+commit e325ecbfce77f00ac5cf6fbd957f95495f61c59b
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Jan 9 13:25:10 2012 +0100
+
+    Suppress uninteresting Doxygen warnings
+
+commit be9161d3a5898e863767f926613486126c2cbf67
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jan 6 12:35:39 2012 +0100
+
+    CHANGES: snmplib: Simplify implementation of functions manipulating 64-bit numbers.
+
+commit 86e4c2be0852a0a13b0603075720b3264ec70dde
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jan 6 12:29:11 2012 +0100
+
+    CHANGES: snmplib: Make it explicit that MAX_SUBID is an unsigned constant
+
+commit 37e272d8f7b7180ba140fa386a5ff058968a08a2
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jan 6 18:21:48 2012 +0000
+
+    CHANGES: snmpd: IF-MIB::ifType: Report type "infiniband (199)" for InfiniBand interfaces instead of type "other (1)".
+
+commit 0d1c21f9991d1309d057e3e4056d547df7d40ecf
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jan 6 16:06:31 2012 +0100
+
+    Make declaration and definition of strlcat() consistent.
+
+commit 0c3d4dbb0a9cf5b359f70b2f19915495554f840f
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jan 6 15:23:16 2012 +0100
+
+    CHANGES: Win32: snmpd: Remove dlmod
+
+commit 893ecc97b587661045becbe09a320c1bcbc71c7c
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jan 6 14:36:59 2012 +0100
+
+    Add strlcat() to the MSVC build infrastructure.
+
+commit 3d126422e625702b9d3fa0676a97ec5cb20d9d10
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jan 6 15:01:06 2012 +0100
+
+    Make win32/net-snmp/net-snmp-config.h consistent with its .in file
+
+commit af53b76c2ffa751e3958d0fc5d8279f78c2c1c26
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jan 6 14:43:55 2012 +0100
+
+    Skip T066pass_simple and T067passpersist_simple on MinGW
+
+commit c3126b143921fabeac442166eca5b5b742fd42c0
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Jan 5 15:02:39 2012 +0100
+
+    Replace most strncpy() calls introduced in v5.5
+
+commit b24ee7c909657db43bd8c5d8c01055ca0883c9cf
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Jan 4 08:40:39 2012 +0100
+
+    Eliminate most strncpy() and strncat() calls
+    
+    Using strncpy() and strncat() is error prone -- see also
+    http://www.gratisoft.us/todd/papers/strlcpy.html. Hence replace
+    all invocations of strncpy() and strncat(). Replace
+    strncpy(dst, src, n) calls by:
+    * strlcpy(dst, src, n) if the goal was to avoid output buffer overflow.
+    * sprintf(dst, "%.*s", n, src) to copy a prefix of src to dst or if src is
+        not '\0'-terminated.
+    * memcpy(dst, src, n) if strlen(src) >= n and n < size of dst.
+    * strcpy(dst, src) if n > strlen(src) and n < size of dst.
+
+commit 6d95bc4149472931005475c30a541fed5534da39
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Jan 5 11:19:16 2012 +0100
+
+    Fix warnings triggered during compilation of the Perl xs source files
+
+commit 4fae5852103ec3893ad488bc0d905ca6914595ef
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Jan 5 09:17:15 2012 +0100
+
+    CHANGES: snmplib: Simplify the se_store_enum_list() implementation
+
+commit b3222bb275f2f2346e0fd0478afa2efb600773e5
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Jan 5 09:16:45 2012 +0100
+
+    CHANGES: snmplib: Declare "type" argument of se_store_list() / se_store_slist() / se_store_enum_list() const
+
+commit 672a809c228e9550b99b8910be75d0b161985402
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Jan 4 17:33:09 2012 +0000
+
+    Fix a 64-bit compiler warning
+
+commit 24ff260ad89ce2aa361a55c7c72e916031defe35
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Jan 4 17:11:24 2012 +0100
+
+    Change the type of the second argument of snmp_set_var_value() and snmp_set_var_typed_value() from u_char* to void*, like on more recent branches
+
+commit c6ca737fb46f90a4bda5d43734aac34e837a05f4
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Sat Mar 13 19:07:37 2010 +0000
+
+    Backport commit f504ce2d74a4bc88f68cc9515fa7053373cb15b5.
+    (Fixed most compiler warnings triggered by the source code in the perl subdirectory. Note: these changes may contain some real bug fixes.)
+    
+    Conflicts:
+    
+    	perl/ASN/ASN.xs
+    	perl/OID/OID.xs
+    	perl/SNMP/SNMP.xs
+    	perl/agent/agent.xs
+
+commit d212dc984ec34e4d230625e46e58b0c628a50df5
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Jan 4 16:46:49 2012 +0100
+
+    SNMP.xs compiler warning fixes
+
+commit f7f966abd6d2849b1331252afe5c473e5c40b32d
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Jan 4 14:24:33 2012 +0100
+
+    Fix format specification mismatches.
+
+commit 303c015bcfe9af0b154e9881c7b4f449e08f30bb
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Wed May 6 22:06:23 2009 +0000
+
+    Backport commit d3eb2b5ced22a8480053ce43acf9739729055404
+    (Sprinkle some const-ness where relevant / fix format string mismatches,
+    Niels Baggesen, May 2009)
+    
+    Conflicts:
+    
+    	agent/agent_sysORTable.c
+    	agent/helpers/instance.c
+    	agent/mibgroup/disman/event/mteTriggerConf.c
+    	include/net-snmp/agent/instance.h
+    	include/net-snmp/agent/sysORTable.h
+
+commit d95b40406916bda5b48b5a6131bec27b866b0a79
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Wed May 6 21:59:20 2009 +0000
+
+    Backport a2a7316c310f0fcc3728673fa047051c23b71960
+    (Trivial warning fixes, Niels Baggesen, May 2009).
+    
+    Conflicts:
+    
+    	agent/mibgroup/hardware/cpu/cpu_linux.c
+    	agent/mibgroup/host/hr_swrun.c
+    	agent/mibgroup/if-mib/data_access/interface_linux.c
+    	agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c
+    	agent/mibgroup/ip-mib/data_access/systemstats_linux.c
+    	agent/mibgroup/mibII/sysORTable.c
+    	agent/mibgroup/mibII/system_mib.c
+    	agent/mibgroup/ucd-snmp/logmatch.c
+    	agent/mibgroup/util_funcs/get_pid_from_inode.c
+    	agent/snmpd.c
+    	snmplib/container_list_ssll.c
+
+commit d86c47f003fdc192bce7b46ac4f06b09e387c12b
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Jan 4 13:29:08 2012 +0100
+
+    Fixed a typo
+
+commit 3dc0e00a2fd8e34fe1ae33ecabf36e146460a31f
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Jan 4 12:40:07 2012 +0100
+
+    Fixed buffer overflow when large 'token' is used.
+
+commit b3c4982542e0ab151fb3884754cdfbcb472da52d
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Jan 4 12:28:52 2012 +0100
+
+    Fixed off-by-one memset.
+
+commit 0f53695044dd3f0c3507753e3f8c29d97e96872d
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Aug 3 21:38:26 2011 +0200
+
+    CHANGES: snmplib, snmpd, perl: Eliminate dead variables
+    
+    Conflicts:
+    
+    	agent/mibgroup/agentx/master_admin.c
+    	agent/mibgroup/etherlike-mib/data_access/dot3stats_linux.c
+    	agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_access.c
+    	agent/mibgroup/host/data_access/swinst_pkginfo.c
+    	agent/mibgroup/host/data_access/swrun_procfs_status.c
+    	agent/mibgroup/ip-mib/data_access/systemstats_linux.c
+    	agent/mibgroup/mibII/kernel_linux.c
+    	agent/mibgroup/rmon-mib/data_access/etherstats_linux.c
+    	agent/mibgroup/rmon-mib/etherStatsTable/etherStatsTable_data_access.c
+    	apps/snmptls.c
+    	apps/snmptrapd_log.c
+    	snmplib/dir_utils.c
+    	snmplib/snmp_client.c
+    	snmplib/snmp_openssl.c
+    	snmplib/transports/snmpTLSTCPDomain.c
+
+commit 0153805c99b9197365935c5d11ae9c3d4bfaa0f3
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Jan 4 09:48:41 2012 +0100
+
+    Fix a set-but-not-used warning
+
+commit 3f8885fbee9407748fc2f0573728a11ba2bc023a
+Author: Magnus Fromreide <magfr@users.sourceforge.net>
+Date:   Tue Apr 28 05:51:13 2009 +0000
+
+    Return a value from sprint_realloc_value even if no subtree is located.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/trunk@17578 06827809-a52a-0410-b366-d66718629ded
+
+commit aee4e895fe3bd5f4a61e34275bfca0368b560555
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Jan 4 11:31:22 2012 +0100
+
+    Added check of snmp_sess_transport() return value.
+
+commit 5d1d0a744ab30c8e645c3b8506cbbd2cceb3d275
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Jan 4 11:04:48 2012 +0100
+
+    Added check of netsnmp_extract_iterator_context() return value.
+
+commit 299ea9a89c3f1758a7748bb9b3411f62f2c70f88
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Jan 4 10:54:55 2012 +0100
+
+    Added check of fopen() return value, just in case of some race.
+
+commit 90f1ae6757917481636eef77100caeeb53edfe01
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Tue Jan 3 10:06:56 2012 +0100
+
+    Add strlcat.c. Source: http://www.freebsd.org/cgi/cvsweb.cgi/src/lib/libc/string/strlcat.c.
+
+commit 199a0511f6eb0ef3ff1d9f922b790ab67dfde01e
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Jan 4 10:31:26 2012 +0100
+
+    CHANGES: snmpd: smux: simplify smux_list_detach()
+
+commit d883573aa73e0f5fc188acedee6451f95dae900c
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Jan 4 10:23:06 2012 +0100
+
+    Fix a compiler warning introduced by commit a809fe5075c9f374715f7d1a682949a0730172c1.
+
+commit 7b7a3eb2500527eaa1699287a6ca6fcc4cc2e08a
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Jan 4 09:40:02 2012 +0100
+
+    Fix a build error caused by commit a809fe5075c9f374715f7d1a682949a0730172c1.
+
+commit 2b6c119fed4848da6663c11f0c2cbdc29921b5c6
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 3 15:51:10 2012 +0100
+
+    Check for netsnmp_ds_get_int() errors.
+
+commit 6ce5360caa4c9de51ade57879e83f96bd04b4c5a
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 3 15:42:23 2012 +0100
+
+    Check for missing view.
+
+commit b3bc54bed31690a85df2acfbf3296da93a9e89b4
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 3 15:23:17 2012 +0100
+
+    Check socket() result.
+    Also close the socket on error.
+
+commit 92075f51cd45a38ca38760b3ffe82e16559e9c2e
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 3 15:18:26 2012 +0100
+
+    Check open() result.
+
+commit d68dcae0f18d554571aef321944a5290548dde86
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 3 14:16:11 2012 +0100
+
+    Added 'fallthrough' comment for Coverity.
+
+commit fb6f80c0fe3ba36e56f5b911a47e3f6f32ba266e
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 3 14:14:07 2012 +0100
+
+    Fixed exit code of encode_keychange with wrong arguments.
+    Also added a comment for Coverity.
+
+commit 3130e24fdc232464dd7bb216f46cafa2e0e775a6
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 3 14:09:54 2012 +0100
+
+    Added missing break
+
+commit 18c126a9565cb4d69d7513b944a2105588045d35
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 3 14:07:29 2012 +0100
+
+    Added 'fallthrough' comment for Coverity.
+
+commit 6d31c82070a2c68fe3c519e9d56fa2779554d01f
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 3 14:01:53 2012 +0100
+
+    Added 'fallthrough' comment for Coverity.
+
+commit dab32867ed0b99301efd7b8d852ad1288a184be0
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 3 13:30:33 2012 +0100
+
+    Fixed QUITFUN usage.
+
+commit b1a2bcf64615eb66bc24d5be4950e45012962045
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 3 13:18:03 2012 +0100
+
+    Fixed wrong operator
+
+commit b2b1c851b94fed37c386eaa1bfead5c77696e3ef
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 3 13:14:52 2012 +0100
+
+    Fixed wrong operator
+
+commit a809fe5075c9f374715f7d1a682949a0730172c1
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 3 10:58:46 2012 +0100
+
+    Added check for failed register_mib.
+
+commit 5949f055c16ae650615aae7a1fee3f2d7b16d940
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jan 3 10:29:59 2012 +0100
+
+    Make MIB file parsing and detection more strict - LABEL is required at the beginning of MIB files.
+
+commit e4b673683c68ba8b3abc040b9125ec304643cc7c
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Sun Jan 1 23:00:24 2012 +0100
+
+    Assume that libdl might be in AGENTLIBS or SNMPLIBS so preadd them.
+
+commit b13c1e57bedba79b806103c74f1921d53a706b38
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Sun Jan 1 22:55:06 2012 +0100
+
+    Do not require ucd-snmp/dlmod unless it will work.
+
+commit 14b60e85a1b5700e93d126e2f291d5c485f34e36
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Sat Dec 31 14:14:29 2011 +0100
+
+    CHANGES: snmpd: Make the configuration of the dlmod module fail rather than generate a dummy module if the dlopen function isn't available.
+
+commit 98a97538fc1e9ff46b60d5d969347444578378c0
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Sat Dec 31 13:35:13 2011 +0100
+
+    Adjust the paths to support testing even if builddir != srcdir
+
+commit 88f0af3cfb916ae5863cc2986071d435f20c3064
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Sat Dec 31 11:37:52 2011 +0100
+
+    Reduce the scope of the variables 'p' and 'len'.
+
+commit 0815a7536c76f7e4842638683f674894a1a8ce14
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Thu Dec 29 14:42:54 2011 +0000
+
+    Report problems with SetUndo processing
+    Missed when applying patch #3445440
+
+commit eb2ab23742ca86c0b89ccfe91eb6ea374bf3acc1
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Thu Dec 29 14:37:31 2011 +0000
+
+    Check for the expected error (EPIPE) on closure.
+    Missed when applying patch #3447444
+
+commit aac10bc4f053c014f382d6593fc32ab95e0b1a57
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Thu Dec 29 12:59:52 2011 +0000
+
+    CHANGES: snmpd: BUG: 3463767: Handle parsing subidentifiers > 2^31
+
+commit 3898c04fd6f89867062fdfebf36857ab619c0450
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Wed Dec 28 16:53:24 2011 +0000
+
+    Add tests for pass/pass_persist, supplied by Bill Fenner
+
+commit d5ee3f0a1a63bb1752c74cbca55aa3d40bf9bf13
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue Dec 27 21:58:51 2011 +0000
+
+    CHANGES: snmpd: PATCHES: 3447444: Fix SIG_PIPE handling
+    Patch provided by Bill Fenner
+
+commit 2a17b37430c1852998c3588e547d7eb61c06da71
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue Dec 27 21:45:38 2011 +0000
+
+    CHANGES: agentx: PATCHES: 3445440: More robust handling of AgentX errors
+    Patch provided by Bill Fenner
+
+commit fe58a0e5f4d4e2e2ecbcb47382b08cb1e4df352c
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue Dec 27 18:16:23 2011 +0000
+
+    CHANGES: snmplib: PATCHES: 3456770: Handle (obsolete) UInteger type properly
+    Patch provided by Bill Fenner
+
+commit 1be8cf08a67a91855fee1ec4a2d8e087c7812456
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue Dec 27 18:04:10 2011 +0000
+
+    CHANGES: agentx: PATCHES: 3445437: Log AgentX disconnections
+    (in line with connections) Patch provided by Bill Fenner
+
+commit 068037289107faa2ba3f5cd2fb00c19494bb9a04
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue Dec 27 17:27:46 2011 +0000
+
+    Handle any GETNEXT request OID, not just a simple walk.
+
+commit a74fa528983123d355a8cdcaa77dd4eb4b8c6959
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue Dec 27 17:00:18 2011 +0000
+
+    CHANGES: pass: PATCHES: 349394: Bring pass_persisttest script into line with passtest*
+    (i.e. using the legitimate structure of NET-SNMP-PASS-MIB)
+    Patch provided by Bill Fenner
+
+commit bbe649ebfa61ea22399170b36b99db30a1de8012
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue Dec 27 16:54:38 2011 +0000
+
+    Rework "passtest" example to fully validate GETNEXT requests
+    and use a legitimate structure for output.  Backport of SVN
+    revision 17632 (which updated 'passtest.pl' but missed 'passtest')
+    Correct in branches 5.5 and above
+
+commit 82d06c7247b22c8b01d45bf55041d2f1e6427d49
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue Dec 27 13:45:18 2011 +0000
+
+    CHANGES: snmpd: PATCHES: 3447671: Fix override handling of OID values
+    Patch supplied by Phillip O'Donnell
+
+commit 827c8b28830171faa9c61d53efca9eb6600561c2
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue Dec 27 11:25:43 2011 +0000
+
+    CHANGES: python: PATCHES: 3433846: Fix for use with python 2.4
+
+commit f98a54a99caf7b46b100a920db942cbca9c43926
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue Dec 27 10:10:36 2011 +0000
+
+    Skip SET-based tests when configured with --disable-set-support
+
+commit c139ca123b44bb3b9b6bf921e1609cc45f63a660
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Sat Dec 24 16:55:30 2011 +0000
+
+    CHANGES: snmpd: PATCHES 3410059: Fix sparsely augmenting trigger tables
+    Patch provided by Stephen Turner
+
+commit c4ae021b2e6384437081c5623f360c8896390188
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Sat Dec 24 16:29:54 2011 +0000
+
+    CHANGES: snmpd: PATCHES 3410050: Skip already-'processed' varbinds
+    Based on mib2c patch provided by Stephen Turner
+
+commit c6accf8c66254fa8c48767ed7dec795ddafc522e
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Sat Dec 24 16:27:11 2011 +0000
+
+    CHANGES: mib2c: PATCHES 3410050: Skip already-'processed' varbinds
+    Patch provided by Stephen Turner
+
+commit a61826ad8ca54661d1d909712503bd3a8b32eed0
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Thu Dec 22 18:35:46 2011 +0100
+
+    Remove unused variable.
+    
+    myMatch is unused as nmatch is zero and also since regexBuffer is created
+    with REG_NOSUB set.
+
+commit ba4fc80fe2cfd5a5d89230d8f3703e4fe01e6019
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Thu Dec 22 19:24:40 2011 +0000
+
+    CHANGES: agent: PATCH 3402376: from Leonardo Chiquitto: Recognise ReiserFS
+    Also move various FSType definitions to the appropriate blocks
+
+commit b5ac4a04dcd5470d08d03321abcd1e982621e6e0
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Dec 22 14:39:46 2011 +0100
+
+    Fixed unterminated strings after strncpy
+
+commit 2b37e4e8f250a0d8821199a74ac3f4e5b7b7baba
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Dec 22 14:31:51 2011 +0100
+
+    Fixed unterminated strings after strncpy
+
+commit cd859ad51c4f18d5b0fc69dd669fcb051c798969
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Dec 22 14:39:33 2011 +0100
+
+    Fixed wrong memmove size
+
+commit 30ff58d09d4c9d5438bb621054fd7ad7a2a597e4
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Dec 22 14:07:19 2011 +0100
+
+    Fixed wrong length of buffer when printing ASN_BIT_STR
+
+commit 6c1487e1d360d3d260a39cb1f5b15da978395053
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Dec 21 15:47:34 2011 +0100
+
+    Fixed potential free of uninitialized pointer in error cases
+
+commit c76fb96f65e33ba2fd212a921e8c386155ee5c7a
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Dec 21 15:44:46 2011 +0100
+
+    Fixed unitialized values in udpTable
+
+commit c44608679b89751176f28a2e54d5282b46e2a05c
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Dec 21 14:56:13 2011 +0100
+
+    Use calloc instead of malloc and manual clearing
+
+commit a05c5f9513461824e7903ae9ae9a6c3386e33879
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Dec 21 14:40:50 2011 +0100
+
+    Fixed printing of unitialized variable when sensors_get_label() fails
+
+commit e4a5edc72393bd3de9bf12bceba9d83bbf7de70b
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Dec 21 14:31:25 2011 +0100
+
+    Removed unused variable
+
+commit fae2e5b835b8df1eae47e4cebb4eb404d7282377
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Dec 21 13:31:21 2011 +0100
+
+    Fixed dereferencing unitialized iid in error cases and with debug info enabled.
+
+commit 0bc8c08edeae7ae095f116258c20ae5767d60652
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Dec 21 13:20:52 2011 +0100
+
+    Fixed returning uninitialized variable 'status' when ss == NULL
+
+commit de9250d9dae9727a6cc7f647688dddf1b8597128
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Dec 8 11:58:04 2011 +0100
+
+    CHANGES: snmpd: Make sprint_mib_oid() treat OID components as unsigned instead of signed integers
+
+commit 0e33b3b6d5854a4bac15d4ea5e016c53d161d0cd
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Dec 8 10:02:28 2011 +0100
+
+    Fix recently introduced compiler warnings
+
+commit 73c9ee42d28afe2e107a7d6616b6d011890c36ea
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Dec 8 09:09:59 2011 +0100
+
+    Remove unused variables
+
+commit 3db97962b37eb12d254d61e6be234b06a391c8bb
+Author: Bill Fenner <fenner@gmail.com>
+Date:   Thu Dec 8 07:43:45 2011 +0100
+
+    CHANGES: snmpd: PATCH 3453868: from "Bill Fenner <fenner@gmail.com>": Factor common code into pass_common
+    
+    Move the code for pormatting and printing values from pass and pass_persist
+    into pass_common.
+
+commit 7f05daa8e0e0f533b0f12a3e1cf07641519909d6
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Dec 1 11:58:32 2011 +0100
+
+    CHANGES: BUG: 3444939: BUG: 1796886: snmplib: Avoid that sprint_realloc_octet_string() embeds unprintable control characters or binary zeroes in its output. This behavior could cause truncated output in snmptrapd.
+
+commit db8f558fd2f3b7c109ea3a1c2133b75b6f8cb2ad
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Dec 1 10:04:41 2011 +0100
+
+    Compiler warning fix: pass unsigned chars to isprint() instead of signed chars.
+
+commit 800dc1028e7e0cd8cc14d84dd31723d47ac073db
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Thu Dec 1 10:18:58 2011 +0100
+
+    Reduce the scope of the hint variable
+
+commit 83ea4a080c90a74b9743d3f24cf0d4b8a1e8c849
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Sun Nov 27 21:16:52 2011 +0100
+
+    Reduce the scope of the variable qos
+
+commit 7b9e03441c3dc3a07670ed01f5d04791a82c750c
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Nov 30 14:04:01 2011 +0100
+
+    Remove #define val(x) __STRING(x) and change val(x) into __STRING(x).
+
+commit 2f379b0e4ecadfa4e541e3005c8fc8281882b741
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Nov 30 15:58:47 2011 +0100
+
+    Follow-up for commit 1aa704e: unbreak the MSVC build
+
+commit 64ef0f71127617837027fb2cfaf174b95ba79e0d
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Nov 30 14:19:50 2011 +0100
+
+    Add SNMP::register_debug_tokens()
+
+commit 7bead9ca917c67566d5ed98ab507bbc02816217d
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Nov 30 14:08:08 2011 +0100
+
+    AgentX subagent: Reduce code duplication
+
+commit 0ed71541f87e7d78bc998eebda3217c59e1df830
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Nov 30 14:03:19 2011 +0100
+
+    CHANGES: snmplib: Add Doxygen-style function header for netsnmp_register_default_target() and netsnmp_clear_default_target().
+
+commit 8c2972b61e40169b47c50988b6ae9e8c285f84f8
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Nov 30 14:02:54 2011 +0100
+
+    CHANGES: perl: Fix spelling in the documentation of the SNMP module
+
+commit 82e39fb6706df90ecf2fc9e10ada2b962ee196f3
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue Nov 29 12:27:46 2011 +0000
+
+    Fix multi-line case testing of incoming OID
+
+commit 8867fd1dcfe72b59d07322ff38a699b66ec4f326
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Tue Nov 22 09:44:38 2011 +0100
+
+    CHANGES: snmplib: Make netsnmp_large_fd_set_resize() robust against memory allocation failures.
+    
+    CHANGES: snmplib: Make NETSNMP_LARGE_FD_ZERO() use memset() on Unix systems instead of an explicit loop.
+    CHANGES: snmplib: Make sure that on Unix systems netsnmp_large_fd_clr() doesn't try to read memory it isn't allowed to read if the first argument equals -1 (a value that shouldn't be passed by the caller).
+    CHANGES: snmplib: Make netsnmp_large_fd_is_set() return false on Unix systems if the first argument equals -1 (a value that shouldn't be passed by the caller).
+    CHANGES: Windows: Make netsnmp_large_fd_set_resize() shrink behavior correct.
+
+commit 80ee4022e534e64aad5a5f27192843b42acb85e0
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Sat Nov 19 09:14:02 2011 +0100
+
+    CHANGES: snmpd: BUG: 3439234: Move netsnmp_pass_str_to_errno to pass_common and rename it to netsnmp_internal_pass_str_to_errno
+
+commit 0baa9296c072bb3735760b0dd992f2d1d3ca27fa
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Sat Nov 19 09:05:24 2011 +0100
+
+    CHANGES: snmpd: BUG: 3439234: Correct the dependencies of ucd-snmp/pass and ucd-snmp/pass_persist
+
+commit 1aa704e4a294430b28e39b6f9e4683b8a48bce04
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Sat Nov 19 08:35:21 2011 +0100
+
+    CHANGES: snmpd: Factor out asc2bin and bin2asc. Add a netsnmp_internal_ prefix to them
+
+commit cda8fe91013f12cbf64a0775abb55720035af931
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Sat Nov 19 00:55:24 2011 +0100
+
+    CHANGES: snmpd: Call snmp_oidtree_compare instead of snmp_oid_min_compare
+    CHANGES: snmpd: Remove snmp_oid_min_compare since it is internal and unused
+
+commit b881841bd0493dd71d63259bdded449b06f02c32
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Wed Nov 16 23:30:33 2011 +0100
+
+    Fix size_t/int mismatches
+
+commit ca294cf75bbc8e90dbf44ee40478935e91db1487
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Wed Nov 16 23:18:03 2011 +0100
+
+    Remove unused variables
+
+commit 883136c2b2fa0739f437a8cfb6614accc76e268e
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Wed Nov 16 23:15:58 2011 +0100
+
+    More needs for NETSNMP_PRIo format specifier
+
+commit 4bd0352955a2551bfe02308dd134b9128c98b9e9
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Wed Nov 16 22:59:36 2011 +0100
+
+    Fix paranthesis problem
+
+commit fe6269b1900cf44dc27a199a761d15a01c3f3092
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Wed Nov 16 22:58:34 2011 +0100
+
+    Fix size_t/int mismatches
+
+commit 390c0114c8ec0bdb27b08b6f74e3f6ef3a62981b
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Wed Nov 16 13:37:49 2011 +0100
+
+    Fix format specifiers to avoid warnings
+
+commit 0e86c781f3989bf022c8993a118617b74a75420c
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Wed Nov 16 09:17:19 2011 +0100
+
+    memory_linux: get Shmem from /proc/meminfo for 2.6 (or newer) kernels
+
+commit bf264d15ded7acbbf2e3871b98fd1fcef43d9ec3
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Wed Nov 16 09:16:16 2011 +0100
+
+    memory_linux: close sockets in error situations
+
+commit 57ff8a40bae5d9bcad16089142a9cf328c9fa1f5
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Wed Nov 16 09:14:57 2011 +0100
+
+    disman/ping, disman/traceroute: Close sockets in error situations
+
+commit 434bfc1f7457550b6f87d5bcd511276b270b5964
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Mon Nov 14 11:22:53 2011 +0100
+
+    CHANGES: snmpd: from Martin Wilck: fixed snmpd crashing with 'select: bad file descriptor'.
+    
+    On 32-bit systems, snmpd dies with aforementioned message when using file descriptions > 32, e.g. when having >32 AgentX subagents.
+
+commit eaca7983e3655ab696fcc4461ca0cedbac6ce69a
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Fri Nov 11 19:00:12 2011 +0100
+
+    NetBSD-6: One more instance of timespec replacing timeval
+
+commit 378ffed03ba79a8346d6c62781e2ddf5ce92a478
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Fri Nov 11 18:55:43 2011 +0100
+
+    Fix bug #3436528: swinst_pkginfo: recover from NULL return from opendir
+
+commit a94a179d9340f51fa7c23431630bc0ffd6d759e8
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Wed Nov 9 20:30:51 2011 +0100
+
+    Fix bug #3433616: dont treat DateAndTime as a string
+
+commit 2e7e9eda0b0d62a7645a9a8f70ef3fb6f3dd6941
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Nov 3 11:17:48 2011 +0100
+
+    Fix uninitialized variable warnings.
+
+commit 3462ebcdd0b7c298cb15c3099736f4f952257846
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Oct 28 16:07:15 2011 +0200
+
+    Remove those superfluous parentheses that trigger a clang warning.
+
+commit 3e5fedd3e7d1ef31683604bf73dc56e944cad349
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Nov 3 09:45:27 2011 +0100
+
+    CHANGES: snmpd: fixed UCD-SNMP-MIB::systemStats after 30 days of uptime.
+    
+    After 30 days, values from /proc/stat (on Linux) can get bigger than 32bits and snmpd calculations might render counters like ssCpuUser negative or zero, while the real value is higher. Therefore the counters should be tracked as the largest integer available.
+
+commit 2801a2139f27021e1ab15e362e2d3d624ffaa494
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Mon Oct 31 22:55:53 2011 +0100
+
+    Patch #3406364: Fix unstable data for NetBSD.
+
+commit 349591d03e17a55b43eacc6a687b02fd8d4e9528
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Mon Oct 31 08:59:37 2011 +0100
+
+    CHANGES: perl: Make it possible to build perl support without support for opaque types.
+
+commit 6d26918af55aa3662a720542de77bbf39b0a3e91
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Sat Oct 29 08:34:33 2011 +0200
+
+    CHANGES: snmpd: Disable the support for integer64 in pass scripts if compiling without opaque-special-types.
+
+commit 29bf69d70424f359d9c87f07a964a099415649a5
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Oct 10 13:02:25 2011 +0200
+
+    CHANGES: snmptrapd_sql: Avoid that a linker error is triggered on systems where my_progname is missing in libmysqlclient (e.g. Fedora 15 and 16).
+    
+    This is a backport of commit 9f653f7.
+
+commit 13952f6bee9f408867ab6d2fdfdde4f284074957
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Oct 26 14:05:16 2011 +0200
+
+    CHANGES: snmplib: from Siddhesh Poyarekar: properly clean up old requests in a subagent when we reconnect to master.
+    
+    An snmp subagent linked against net-snmp-libs may crash if it handles a
+    response which has magic referring to an older disconnected main session. This
+    may happen when the subagent
+    attempts to clean up old requests on reconnection of the disconnected master
+    session.
+
+commit ae052472b22720d08369e85127db214245df2e3f
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Oct 25 16:15:17 2011 +0200
+
+    CHANGES: perl: fixed segmentation fault when handler registration fails.
+    
+    When netsnmp_register_handler fails, it frees its reginfo -> nsahr_DESTROY (and any other function) must not dereference it.
+
+commit c199bf91b6239f26b2aab34e8575e0f0df9cde9b
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Mon Oct 24 14:25:28 2011 +0200
+
+    CHANGES: snmpd: xfs, jfs and vxfs filesystems are now recognized in hrStorageTable
+
+commit 747fdc71e64d09e080928ebbb4d04cbde3906799
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Oct 5 15:57:59 2011 +0200
+
+    CHANGES: snmpd: Lowered severity of 'error finding row index in _ifXTable_container_row_restore' message.
+    
+    The message is shows up when snmpd is started and there is different set of network interfaces than it was when snmpd wast last stopped. This is common on ppp-servers or virtual hosts.
+
+commit c11adaa12915abfee629bb6c026c21f2185b216e
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Oct 17 10:24:46 2011 +0200
+
+    CHANGES: Win32: Avoid that compiling the header file <net-snmp/net-snmp-config.h> with the MinGW gcc compiler triggers warnings about "pragma comment".
+
+commit b17a72a793483aee4a5bb2f2e2c7f4fd869817e6
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Oct 17 10:22:20 2011 +0200
+
+    CHANGES: Win32: Avoid that the PACKAGE_* macros defined in <net-snmp/net-snmp-config.h> cause trouble when including this header in a package that uses the GNU autotools.
+
+commit 211dcb49306561e35ba3c213be7cfa257b40a8e5
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Oct 10 15:52:43 2011 +0200
+
+    Avoid that gcc 4.6 complains about set but not used variables
+
+commit 4c83b9229a7454f34f6ff75f69e67e4030c419b5
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Oct 7 15:58:45 2011 +0200
+
+    CHANGES: snmplib: Set the rpath for libperl.so in libnetsnmpmibs.so such that the dynamic linker can find libperl.so without requiring the user to modify the dynamic linker settings.
+    
+    This change in agent/Makefile.in is necessary on the 5.5 branch and
+    later but not on the 5.4 branch. That is because the 5.4 branch uses
+    an older version of libtool that propagates the rpath of dependent
+    libraries. This is called inter-library dependency tracking in the
+    libtool manual. This functionality is present in libtool version 1
+    but not in libtool version 2. For more background information about
+    dynamic libraries and rpaths, see also the document with the title
+    "RpathIssue" on the Debian wiki (http://wiki.debian.org/RpathIssue).
+
+commit 866033db9904ffb1203f283f838092e4cf68de6b
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Thu Oct 6 07:33:27 2011 +0200
+
+    CHANGES: snmpd: Remove spurious #endif that seems to be the result of a mismerge.
+
+commit 995647c0cfe00412262cc5797bdfae9d00b70c76
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Sun Oct 2 15:44:36 2011 +0200
+
+    CHANGES: building: Remove the use of -L flags for internal libraries as it confuses libtool.
+
+commit 93dc1235a0db58ffd29617cff00dc11263780202
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Sun Oct 2 11:31:46 2011 +0200
+
+    CHANGES: building: Make make apps work again
+    
+    apps include snmptrapd and that require the agent libraries as well.
+
+commit ba41488ed44cd23c25963d4fc56c476853b2ab59
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Sun Oct 2 11:29:33 2011 +0200
+
+    CHANGES: building: When you say make libs you expect all the libs to be built.
+    
+    This is demonstrated by the snmptrapd target at the top level which obviously
+    expected both libs to be built and so failed to compile before this patch.
+
+commit 3057c73e093473be46254bcdfb4ca788e432d1b8
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Sep 30 07:32:52 2008 +0000
+
+    NEWS: building: PATCH: 2091156: correctly declare dependencies in Makefile.
+    'make -j <N>' should work now.
+    
+    Backport this to V5-4 as it is needed for correct operation in the single
+    threaded case of make miblib as well.
+
+commit 6eae340fa2a64086592982cc52735bc01487d978
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Sat Oct 1 19:33:50 2011 +0200
+
+    CHANGES: building: Silence libbsd 0.3.0 nagging
+    
+    If you have libbsd 0.3.0 installed then their version of nlist.h warns and
+    tries to make you include bsd/nlist.h instead. The problem is that we don't
+    need that compatibility library as we know how to do it ourself so it becomes
+    pure nagging. This patch adds a define that changes the warning into an
+    error and then figures out that there is no usable nlist.h and ignores it
+    for the future.
+
+commit 848f6300efe38492fb454451a030f0b7e6ff8c9d
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Sep 30 10:41:44 2011 +0200
+
+    perl/SNMP/SNMP.xs: Update emacs modeline
+
+commit d55bd4e0549f03b6fd32562c2aa7fe39272a9ef7
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Sep 28 06:55:19 2011 -0700
+
+    remove the v5.7 from the frozen list
+
+commit 46eac02e9a27bf4f3068e795cab891f05a848870
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Sep 26 21:49:27 2011 +0200
+
+    CHANGES: snmpd: Avoid that snmpd crashes if started on a system with another OpenSSL library version than the one it has been built with.
+
+commit c55f608f16f160f5e79dc057f8878def462973e1
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Thu Sep 22 10:35:24 2011 +0100
+
+    Fix the code for populating the table_tdata cache,
+    and clarify areas needing MIB-specific additions.
+
+commit bbe2c19a01ecec024f741e2e54701ae6212f4c3e
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Sun Sep 4 14:44:38 2011 +0200
+
+    This should have gone only to master.
+    
+    Revert "CHANGES: building: Correct dependencies - since bf74fea69f24dc6e85f908f3f41d1426b2e09688 snmpconf is located in builddir, not srcdir"
+    
+    This reverts commit 9efa467a972bb6e1c7fbdaf2e27429d29f4ab89e.
+
+commit 9efa467a972bb6e1c7fbdaf2e27429d29f4ab89e
+Author: Magnus Fromreide <magfr@lysator.liu.se>
+Date:   Sun Sep 4 14:00:12 2011 +0200
+
+    CHANGES: building: Correct dependencies - since bf74fea69f24dc6e85f908f3f41d1426b2e09688 snmpconf is located in builddir, not srcdir
+
+commit 422b082a9593ca9c65aac449e6d128a9e97e94fb
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Tue Aug 30 19:06:56 2011 -0700
+
+    added 7 as a rc series branch
+
+commit 71c0d7650493710631fa08d5dc4dad501a9aa771
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Tue Aug 30 16:37:41 2011 -0700
+
+    deal properly with inverted error cases
+
+commit cf4cf7f32ad58f326ffed50494583231648d79d2
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Fri Aug 26 11:08:09 2011 -0700
+
+    added .ft and .ft.1 for feature files
+
+commit 41b2cde19d22209b483207614e027483c3706877
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Tue Aug 30 11:03:15 2011 -0700
+
+    auto-determine patch arguments if possible for nspatchtry
+
+commit 96bb589c2e5054890e98705ab5f4308ae6a130bb
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Tue Aug 30 10:13:06 2011 -0700
+
+    make it so the git commit line can be cut/paste without linebreaks
+
+commit 6e54c4131af731ff90467a75bcc817c957f8f72a
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Tue Aug 30 09:55:14 2011 -0700
+
+    describe that nsrollup needs to be run now.
+
+commit 86efee23432ccb0d2e0c736d34dc1051130cdc0f
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Tue Aug 30 10:52:30 2011 +0100
+
+    Apparently IRIX has a different API for statfs
+
+commit f95aa31377d572b049b0b316dbb163bf7aca93d5
+Author: Thomas Anders <tanders@users.sourceforge.net>
+Date:   Sun Aug 28 23:25:40 2011 +0200
+
+    CHANGES: building: build fix for systems lacking fields msg_control/msg_flags in struct msghdr (backport)
+
+commit ea8bed79e81c42e33cbf37ca6f3c03c549987b22
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu Aug 25 06:56:22 2011 -0700
+
+    import stderr
+
+commit fd6d804dc3e703c4059dbe775001a3be9b93309f
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu Aug 25 06:55:38 2011 -0700
+
+    use >> to print to stderr
+
+commit 1f082a31cd138f1f5e27be6d90a1d5790dc0ffe4
+Author: Thomas Anders <tanders@users.sourceforge.net>
+Date:   Tue Aug 23 23:35:42 2011 +0200
+
+    make sure that _KERNEL is defined to 1 so that "#if _KERNEL" works on systems that need it (e.g. IRIX)
+
+commit 26bb2470c106f834442a2adbc7611bf16657fbdf
+Author: Thomas Anders <tanders@users.sourceforge.net>
+Date:   Tue Aug 23 23:22:44 2011 +0200
+
+    make sure that _KERNEL is defined to 1 so that "#if _KERNEL" works on systems that need it (e.g. IRIX)
+
+commit 96ea2d1a8ebffb348673a865d486f31e635e62bd
+Author: Thomas Anders <tanders@users.sourceforge.net>
+Date:   Sun Aug 21 01:51:49 2011 +0200
+
+    autoreconf
+
+commit 28b54070514753e8d8abb718b224d657ab7a8ab8
+Author: Garrett Cooper <yaberauneya@users.sourceforge.net>
+Date:   Thu Aug 18 11:49:56 2011 -0700
+
+    CHANGES: BSD: PATCH 3383965: from yaberauneya: Fix if-mib agent compile warnings on *BSD
+    
+    Signed-off-by: Wes Hardaker <hardaker@users.sourceforge.net>
+
+commit e6cf8206f0c67650001e34b526b37f64e4a5929c
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu Aug 18 09:46:33 2011 -0700
+
+    Patch from Claus Klein on -coders for fixing man page typos
+
+commit 6a841d56518a727196e66b59e7e5b3304f54b0a1
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu Aug 18 08:31:06 2011 -0700
+
+    changed clientaddr so it registers as pre-mib to be picked up before the transports get created
+
+commit 6580556cc7bd833af731b62ce1ed2017564fe7eb
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Aug 17 18:08:01 2011 +0200
+
+    CHANGES: Windows: snmptrapd: Make the IP address to hostname conversion work
+
+commit 3cb3f1ede388d84e392e1d815d5994a4bf0f10f9
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Sun Aug 14 07:59:25 2011 +0200
+
+    Windows, build.bat: Restore original build and install order. Apparently the correct netsnmp.dll is used during the Perl tests by setting PATH properly.
+    
+    This reverts commit c1b5a030d8f04876cd5b9af008c879cc468b212f.
+
+commit 3c73b4838e605b150bc317313f14eb33444729f8
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Sat Aug 13 17:38:27 2011 +0200
+
+    Revert the two most recent SNMP_FREE() changes (commits 47c8ef1b89c6ccb4247d9633477925908c68c1a5 and 7f42d0d93320484152271427cc9808cbda49bbd0).
+
+commit 3e50c3e00e9f321fb708bc579eb4dc1a0f1e7c4d
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Sat Aug 13 11:31:40 2011 +0200
+
+    CHANGES: snmpd: pass_persist:  Fixes a race condition introduced in commit 31fa07cd9ffde46d41d2b5838c3fc4d01548bfb5.
+    
+    The following race condition could happen:
+    - A system call fails and errno is set accordingly by the C library.
+    - SIGCHLD handler invokes a system call that fails and hence overwrites errno.
+    - SIGCHLD handler leaves.
+    - original context checks errno and finds the value from the system call invoked
+      by the SIGCHLD handler instead of the system call that failed originally.
+    
+    Other fixes included in this patch:
+    - Renamed deinit_pass_persist() into shutdown_pass_persist() such that this
+      function gets called during agent shutdown.
+    - Made sure that shutdown_pass_persist() is called by the Windows snmpd.exe too.
+    - Windows: avoid calling CloseHandle(INVALID_HANDLE_VALUE).
+    - Windows: avoid that closing a pass_persist pipe triggers a crash.
+    - Windows: pass_persist: close handles of finished processes.
+    
+    Conflicts:
+    
+    	agent/mibgroup/ucd-snmp/pass_persist.c
+    	win32/mib_module_shutdown.h
+
+commit e147e4b96755207de1ce30990d67b4b7c76dd483
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Sat Aug 13 08:39:14 2011 +0200
+
+    Unbreak the Windows build. This is a follow-up for commit 1e1000a8815921b5ec2e7997b53592a544b3dfc2.
+
+commit c1b5a030d8f04876cd5b9af008c879cc468b212f
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Sat Aug 13 08:10:33 2011 +0200
+
+    CHANGES: Windows: building (build.bat): Install netsnmp.dll before running the Perl regression tests such that the regression tests are run with the correct version of netsnmp.dll.
+
+commit 1e9d2003baed227f68b68528f1e97e6f5ea86c1a
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Sat Aug 13 08:10:33 2011 +0200
+
+    CHANGES: Windows: perl (build.bat): When installing development files, install the PDB files too.
+
+commit a8d94007e32d03710692c8f1b417d5bdfe3650fa
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Sat Aug 13 08:10:32 2011 +0200
+
+    CHANGES: testing: Fix Perl regression test failures
+    
+    All Perl regression tests pass now on Linux and on Windows (MSVC).
+
+commit b6d0b490181c6df8c11ecf155f1e6eaf11b1ec58
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Sat Aug 13 08:10:33 2011 +0200
+
+    CHANGES: testing: Perl regression tests: Don't fail skipped tests.
+
+commit ca3acf2b07039d96a117f090f7ec76b6e8b541e9
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Sat Aug 13 08:10:32 2011 +0200
+
+    CHANGES: perl: Add SNMP::getenv() and SNMP::setenv().
+
+commit 56759e5ad537f01b4a51e7ff9994ec4b55c32135
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Sat Aug 13 08:14:46 2011 +0200
+
+    CHANGES: snmplib: Add netsnmp_setenv().
+
+commit 9843e5bcf472877e85b031b5e5dafaa9d5fc63c5
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Sat Aug 13 08:10:32 2011 +0200
+
+    local/pass_persisttest: document how to use on Windows
+
+commit 6057866b73a022771e90e9967dd25bdc7192fbdc
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Sat Aug 13 08:10:32 2011 +0200
+
+    Set execute flag on local/pass_persisttest such that the instructions in that file work
+
+commit c2daf5940f21a13e8989dd055b17f3181112f856
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Sat Aug 13 08:10:32 2011 +0200
+
+    .gitignore: Fix a suppression pattern
+
+commit 1f0a928a2913cfa7f5ceaaf4696c69fbdc687621
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Fri Aug 12 09:09:11 2011 -0700
+
+    added the missing -e option to the createUser docs
+
+commit 1e1000a8815921b5ec2e7997b53592a544b3dfc2
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Aug 11 15:46:32 2011 +0200
+
+    CHANGES: MinGW: Net-SNMP Perl modules build again.
+
+commit 97d6432f95e1cdcf6fd85e7ca1d0c5557eb6d919
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Aug 11 18:16:44 2011 +0200
+
+    CHANGES: Windows: perl: Make sure that the constant SNMP_DEFAULT_RETRIES is recognized.
+    
+    CHANGES: perl: SNMP module: Add constants NETSNMP_CALLBACK_OP_RECEIVED_MESSAGE and NETSNMP_CALLBACK_OP_TIMED_OUT.
+    
+    When the Net-SNMP Perl modules are built on Windows with MSVC or MinGW it
+    is possible that each these are linked with another version of the MSVC
+    runtime library than the Perl interpreter itself. In that case the "errno"
+    variable used inside .xs source files is another variable than the $! variable
+    in .pm files. Or: assignments to "errno" in a .xs file do not modify the "$!"
+    Perl variable This patch avoids using "errno" by modifying the different
+    constant() functions such that these return a two-element array instead of
+    returning a scalar and setting errno.
+
+commit 7690894b7b8464f05c7c902bd7cf751cc269977a
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Aug 10 09:26:37 2011 -0700
+
+    don't assert on a double init; just don't do it twice
+
+commit 47c8ef1b89c6ccb4247d9633477925908c68c1a5
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Aug 10 16:44:36 2011 +0200
+
+    SNMP_FREE(): cast argument to (void *) before passing it to netsnmp_free()
+
+commit 0220392d899a9cab701f74af12030bb1d4cc5e2e
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jul 1 13:02:15 2011 +0200
+
+    .gitignore: Ignore *.exe files generated by the Win32 build
+
+commit 09a661d5dc60c730fe0384b02ed672830ef74e30
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Aug 8 15:12:55 2011 -0700
+
+    fix C++ comments
+
+commit 69cb42a4ea0583ce6f5ff8f8383516d34bc4c344
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Aug 8 15:12:55 2011 -0700
+
+    fix C++ comments
+
+commit 447ddc66d90dd9e5c3105b268b6a63bfc580b924
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Mon Aug 8 22:03:58 2011 +0100
+
+    Define _BIND_TO_CURRENT_VCLIBS_VERSION token
+    (as per Alex' build instructions)
+
+commit b0a62eb19763ab4f0b776430242a6117ccae5dd3
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Mon Aug 8 21:59:17 2011 +0100
+
+    Define _BIND_TO_CURRENT_VCLIBS_VERSION token
+    (as per Alex' build instructions)
+
+commit ffa05b051ac3e2b197195a9989cc7a91fe8d9282
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Aug 8 13:55:38 2011 -0700
+
+    a new macro nsautoconf to run the right version
+
+commit b451607dca015c111e96fdfeb2ddb0661fb4f724
+Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
+Date:   Mon Aug 8 21:20:32 2011 +0100
+
+    Fix capitalisation of Net-SNMP
+
+commit c94813044a4c4a608e98e80223075c6faf04ee11
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Aug 8 21:56:15 2011 +0200
+
+    Revert "CHANGES: Windows: Avoid that if the Net-SNMP Perl modules have been built with another version of Microsoft Visual Studio than ActivePerl that using one of these Perl modules triggers a "Free to wrong pool" crash. This regression was caused by commit 3b14c59cf8278d410207ff42debda2636426a468 (the netsnmp_free() into SNMP_FREE() changes in the *.xs files)."
+    
+    This reverts commit 7f42d0d93320484152271427cc9808cbda49bbd0 because that commit is not suitable for the 5.4 branch.
+
+commit 58ca73d03589b0974d926bdfdc3927099fba2115
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Aug 8 11:24:09 2011 -0700
+
+    display the branch we'll commit to
+
+commit 1d1bfd5f451c2bc420b710c98c79d04bdef4391b
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Aug 8 11:10:52 2011 -0700
+
+    nssfpatchapply: split the displayed git commit command into multiple segments
+
+commit d373c4fd8c391afe0b9e02a60b5cd661bc9039dc
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Aug 8 17:23:43 2011 +0200
+
+    CHANGES: snmplib: Fix a crash that could be triggered by calling _mibindex_add() with the second argument not equal to -1.
+
+commit 8ca7ff1e692caec4186b788c9ae2d27be213290f
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Aug 8 10:33:56 2011 -0700
+
+    fix another function typo
+
+commit 556e938e82a7ee2c10fa8c0b7c7a34e9e65a6d5a
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Aug 8 10:05:20 2011 -0700
+
+    fix function name typo
+
+commit 969e866af983d986a26bebca85fef0f6c623ce26
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Aug 8 09:56:43 2011 -0700
+
+    make nspull/nspush check for a clean repo
+
+commit 7e6fdc8b2a3d86a79543673435371621a2858737
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Aug 8 09:56:13 2011 -0700
+
+    new function "nsmakeall" to test building on every branch
+
+commit e25be7c82d5545d88abea10e4e255c92bed3de6e
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Aug 8 09:53:03 2011 -0700
+
+    default to merge
+
+commit bcb81b796dd6a92195d6db13177ad30f05fc63f7
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Aug 8 09:51:26 2011 -0700
+
+    separate nssync into nspull and nspush
+
+commit 7f42d0d93320484152271427cc9808cbda49bbd0
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Aug 8 09:50:51 2011 +0200
+
+    CHANGES: Windows: Avoid that if the Net-SNMP Perl modules have been built with another version of Microsoft Visual Studio than ActivePerl that using one of these Perl modules triggers a "Free to wrong pool" crash. This regression was caused by commit 3b14c59cf8278d410207ff42debda2636426a468 (the netsnmp_free() into SNMP_FREE() changes in the *.xs files).
+
+commit a3b8654a232c563bc97cc9925cd98590a30c5bc5
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Aug 8 17:24:18 2011 +0200
+
+    Fix a recently introduced MinGW compiler warning
+
+commit a0dd3caf25926e43465718bf417a464c2fb36366
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Sun Aug 7 10:17:01 2011 +0200
+
+    find \( -name '*.[ch]' -o -name '*.in' -o -name '*.dsp' \) -perm -u+x | xargs -r chmod a-x
+
+commit a9a252522fbe7dc1ed70ff2721a4f81583c0d92a
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Fri Aug 5 10:20:51 2011 -0700
+
+    make rollup and sync support --rebase and change the default back to merge
+
+commit 96f5f47ad427972d8d9a6ce06c5e16147362083b
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Fri Aug 5 09:25:25 2011 -0700
+
+    try a multiple branch push
+
+commit 0dbc869fec07d8e90dbd1c95493ee7cbc623c95c
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Aug 5 12:40:31 2011 +0200
+
+    CHANGES: Windows: build.bat: Generate PDB files in release mode.
+    
+    CHANGES: Windows: build.bat: Write PDB files to the output directory instead of the intermediate directory.
+
+commit 5b0291f91ed94835f8ae7d9436b15f40afb19473
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Aug 5 13:17:19 2011 +0200
+
+    .gitignore: Add perl/agent/default_store/default_store.def and perl/SNMP/t
+
+commit 2f8d4f5796cbc1c7e967acdaa8019b24f1520a36
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Aug 5 12:02:51 2011 +0200
+
+    CHANGES: Windows: Avoid that running the Perl regression tests makes snmpd crash
+
+commit 0c7507a1e0101f4b135a3ed8a961635b87093f1a
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Aug 5 10:57:33 2011 +0200
+
+    Unbreak the V5-4-patches - revert commit d2c4768bd2efb48664434a831425c2dda85d7133 (CHANGES: libnetsnmp: PATCH 3362233: from yaberauneya: Mute unnecessary cannot find module noise).
+
+commit 9b7ff4abfc9529bb9e18a3b874201520bc0e7141
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Aug 5 11:07:55 2011 +0200
+
+    Unbreak the V5-4-patches branch - was broken by commit bf7178b0b22587d43d1a80c269cd216bd5930214 (agent: change type of snmp_enableauthentraps to long)
+
+commit 03049e1036c2c06cbd6e5ed5fe084999d5468a5f
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Aug 5 10:56:48 2011 +0200
+
+    Unbreak the V5-4-patches branch - was broken by commit 0e6842fe080cec853b08cd2323015ababc381ce1 (CHANGES: snmptrapd: PATCH 3383441: from sachinsurendran: Fix crash on 5.4.4 due to access of freed memory).
+
+commit 3aa949fbdfc1a94a8340ad8baf8b314756a0bb9d
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Aug 5 10:26:15 2011 +0200
+
+    Win32 makefile whitespace cleanup
+
+commit 943930e1e124385fd94738b6dcda37d29dc7ac7f
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu Aug 4 10:41:41 2011 -0700
+
+    CHANGES: agent: PATCH 3324769: from hardaker: Fix -Wunused warning
+    
+    Signed-off-by: Wes Hardaker <hardaker@users.sourceforge.net>
+
+commit 90c0e75f3e0de73d6aaab3e3d7146f18a8f9e187
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Aug 4 19:12:24 2011 +0200
+
+    snmpusm: Fix recently introduced compiler warnings
+
+commit 2dd9ed0858daa982b4160b4d2a7d5a2b80944171
+Author: Stuart Henderson <t0jw2fu0kmg@users.sourceforge.net>
+Date:   Thu Aug 4 10:06:57 2011 -0700
+
+    CHANGES: openbsd: PATCH 3357932: from t0jw2fu0kmg: Cleaning in memory_netbsd.c
+    
+    Signed-off-by: Wes Hardaker <hardaker@users.sourceforge.net>
+
+commit f8f6f7071644b7e771df8e62a93227cf960a04e7
+Author: Vladimir Kondratiev <wulf2001@users.sourceforge.net>
+Date:   Thu Aug 4 09:56:29 2011 -0700
+
+    CHANGES: agent: PATCH 3386147: from wulf2001: fix UCD-SNMP-MIB::dskUsed
+    
+    Signed-off-by: Wes Hardaker <hardaker@users.sourceforge.net>
+
+commit 2101bb2d7ad6db038c755aa9193c8ace0dbd4f58
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu Aug 4 09:28:06 2011 -0700
+
+    added the missing freebsd9.h file from the freebsd9 patch
+
+commit b6a481fa3062893e589bf6163c9d06d0f2053240
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu Aug 4 09:27:05 2011 -0700
+
+    ignore *.orig and *.rej
+
+commit cc5134e53d1c233dc41e31fbb78faab098f09361
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu Aug 4 09:26:44 2011 -0700
+
+    help output describes rebase vs merge better
+
+commit b372e5ab30aa155741e94df22e0752535c59e4bb
+Author: Stuart Henderson <t0jw2fu0kmg@users.sourceforge.net>
+Date:   Thu Aug 4 09:22:28 2011 -0700
+
+    CHANGES: openbsd: PATCH 3357927: from t0jw2fu0kmg: Recognise openbsd5
+    
+    Signed-off-by: Wes Hardaker <hardaker@users.sourceforge.net>
+
+commit 0548a4e97b2a1f0399e58c4efc004c9497398cd6
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu Aug 4 09:22:15 2011 -0700
+
+    fix where arguments are set
+
+commit 3b3780bca9adeebf4ef7508aee6b8ebcb94f656c
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu Aug 4 09:20:40 2011 -0700
+
+    split nssfpatchapply into two parts: apply and commiting
+
+commit 0422514a62bcaae6005017d7e9ed485075fe701c
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu Aug 4 09:15:25 2011 -0700
+
+    patch using -N
+
+commit dc755a6aeb9b9c889727d9fc842fc89f729e6ec0
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu Aug 4 08:33:25 2011 -0700
+
+    added spacing to match the later branches
+
+commit 7b726e103c1960f4c8603859c9a8d8aa8c404520
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu Aug 4 08:32:23 2011 -0700
+
+    removed accidentially duplicated code
+
+commit ecbab0a98a02fde6bbca7dd370bcd9c3ca76affe
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu Aug 4 08:27:41 2011 -0700
+
+    nssync supports --merge now
+
+commit e7dd1c437afe6e26a55aa772d468012655741d31
+Author: Garrett Cooper <yaberauneya@users.sourceforge.net>
+Date:   Thu Aug 4 08:23:22 2011 -0700
+
+    CHANGES: libnetsnmp: PATCH 3362233: from yaberauneya: Mute unnecessary cannot find module noise
+    
+    Signed-off-by: Wes Hardaker <hardaker@users.sourceforge.net>
+
+commit c53d8c3525f590f2213d35b0da94123862f3e366
+Author: Garrett Cooper <yaberauneya@users.sourceforge.net>
+Date:   Thu Aug 4 08:19:16 2011 -0700
+
+    CHANGES: freebsd: PATCH 3363308: from yaberauneya: Fix compilation on FreeBSD 9.x with recent header shuffling
+    
+    Signed-off-by: Wes Hardaker <hardaker@users.sourceforge.net>
+
+commit 3b8c8b85085aae2d1a1c7ca35e7d066d3d74fa9f
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu Aug 4 08:15:17 2011 -0700
+
+    allow nsrollup to take a --merge flag for merging instead of rebasing
+
+commit 7100aedffd98cda4b05164bccf17876020196e79
+Author: Sachin Surendran <sachinsurendran@users.sourceforge.net>
+Date:   Thu Aug 4 08:12:09 2011 -0700
+
+    CHANGES: snmptrapd: PATCH 3383441: from sachinsurendran: Fix crash on 5.4.4 due to access of freed memory
+    
+    Signed-off-by: Wes Hardaker <hardaker@users.sourceforge.net>
+
+commit d2c4768bd2efb48664434a831425c2dda85d7133
+Author: Garrett Cooper <yaberauneya@users.sourceforge.net>
+Date:   Thu Aug 4 08:23:22 2011 -0700
+
+    CHANGES: libnetsnmp: PATCH 3362233: from yaberauneya: Mute unnecessary cannot find module noise
+    
+    Signed-off-by: Wes Hardaker <hardaker@users.sourceforge.net>
+
+commit d19b8fca2384077f732a30f2946ab0c03bc0e738
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu Aug 4 08:15:17 2011 -0700
+
+    allow nsrollup to take a --merge flag for merging instead of rebasing
+
+commit 0e6842fe080cec853b08cd2323015ababc381ce1
+Author: Sachin Surendran <sachinsurendran@users.sourceforge.net>
+Date:   Thu Aug 4 08:12:09 2011 -0700
+
+    CHANGES: snmptrapd: PATCH 3383441: from sachinsurendran: Fix crash on 5.4.4 due to access of freed memory
+    
+    Signed-off-by: Wes Hardaker <hardaker@users.sourceforge.net>
+
+commit 25988be836924a33020113c94aa02614d1dbf1be
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu Aug 4 07:36:36 2011 -0700
+
+    autoconf
+
+commit 4db6b64509dc350839d596e32504b2d80ca0c7b0
+Author: Garrett Cooper <yaberauneya@users.sourceforge.net>
+Date:   Thu Aug 4 07:36:10 2011 -0700
+
+    CHANGES: building: PATCH 3383949: from yaberauneya: Fix autoconf tests for sys/mbuf.h
+    
+    Signed-off-by: Wes Hardaker <hardaker@users.sourceforge.net>
+
+commit f3bc55184d96c58dcfd58953796c10f7354dd4a7
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu Aug 4 06:54:22 2011 -0700
+
+    prompt for patch and an area, and use the proper CHANGES line format
+
+commit ad696ba1249d3c4bc12c0eb38481ff0fc433f8a1
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu Aug 4 06:42:42 2011 -0700
+
+    Use fetch --all and rebase as suggested by Bart for speed improvements
+
+commit 44969b4e57c27194e5bd357bc45275feb8695d22
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jul 8 20:52:25 2011 +0200
+
+    CHANGES: Win32: Fix the compiler warnings triggered by the winExtDLL source code and that are triggered by the change of the "oid" typedef from uint32_t to u_long.
+
+commit ea58b67b4f318acf1f9e852582bccad47b4d8e67
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jul 8 20:52:25 2011 +0200
+
+    CHANGES: Win32: winExtDLL: Invoke SnmpUtilOidFree() before SnmpUtilOidCpy(). It's not clear yet why the original code did not make snmpwalk trigger a memory leak.
+
+commit 8a01ec6423d400c4a13ccac68a3791d0218a0885
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Aug 4 11:19:17 2011 +0200
+
+    CHANGES: Windows: Make linking with recent OpenSSL binaries succeed.
+
+commit e21eef2fc5cfdc1200479118a2c5b29a70b0df60
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Aug 4 08:52:43 2011 +0200
+
+    CHANGES: agent: Avoid that a MIB walk on the host resources MIB triggers a crash on Fedora 15
+
+commit d8b2052a0359ad9d1a68d8d587bc6be156158d20
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Aug 3 11:00:31 2011 -0700
+
+    at end of nsrollup mention that now would be a good time to run nssync
+
+commit 4eea9ee38f06e000a95dc209d0a71ce60da494b9
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Aug 3 10:56:14 2011 -0700
+
+    a new nssync() function for push/pulling active branches
+
+commit 284f5fb79e056a272f73b90937d7bf057c2af021
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Aug 3 11:06:23 2011 -0700
+
+    added a comment
+
+commit 8c0432a74fedf8a1385c8ad0ff1fb429a28eab99
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Aug 3 11:00:31 2011 -0700
+
+    at end of nsrollup mention that now would be a good time to run nssync
+
+commit ca3ad3a28f81f59dffa3dbb809a770147241e3e5
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Aug 3 10:56:14 2011 -0700
+
+    a new nssync() function for push/pulling active branches
+
+commit 2fa7d87d3979ec0fbb835bcfff898e6bec2abbd9
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Aug 3 10:23:00 2011 -0700
+
+    A new function: nssfpatchapply that auto-pulls git command line info from SF
+
+commit 73e76574ae728a4a4a30623597ec0b95fa2797c5
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Tue Aug 2 14:43:52 2011 -0700
+
+    added variables names to the generated error messages.
+
+commit b24a4f0c9565335220ee217d0c0b51321cc1a44f
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Tue Aug 2 13:22:38 2011 -0700
+
+    Wording changes to help describe contexts better
+
+commit e837c7cb62c676a0059d2846e02e32f5bb63c1b1
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Tue Aug 2 13:22:21 2011 -0700
+
+    Added the missing U64 m2i file
+
+commit 9736234b3798ba5462a0a74943ede80e90a6485b
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Aug 3 10:23:00 2011 -0700
+
+    A new function: nssfpatchapply that auto-pulls git command line info from SF
+
+commit bf7178b0b22587d43d1a80c269cd216bd5930214
+Author: Ilya Yanok <yanok@emcraft.com>
+Date:   Mon Jul 18 04:31:08 2011 +0400
+
+    agent: change type of snmp_enableauthentraps to long
+    
+    Type of snmp_enableauthentraps variable is changed from int to long.
+    This fixes the bug with writing to snmpEnableAuthenTraps if server is
+    compiled for 64bit (snmpset reports wrong length). This bug was
+    introduced a long time ago (by faeecd0 commit).
+    
+    Actually this is a 'less effort' type of fix but I wonder why we need a
+    long to store an INTEGER in the first place?
+    
+    Signed-off-by: Ilya Yanok <yanok@emcraft.com>
+    Signed-off-by: Wes Hardaker <hardaker@users.sourceforge.net>
+
+commit 16c02d69cc9ce4fd4e7710a0bf9430f52175ed50
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Tue Aug 2 14:43:52 2011 -0700
+
+    added variables names to the generated error messages.
+
+commit 7fed61bf0af1477eb740a0588f6a11a12b723595
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Tue Aug 2 13:22:38 2011 -0700
+
+    Wording changes to help describe contexts better
+
+commit 9380612fdcb4f9bb081c4a46746692124abede50
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Tue Aug 2 13:22:21 2011 -0700
+
+    Added the missing U64 m2i file
+
+commit 61b178f1ee8952aa03aa3b1ba51f4a6655e47f01
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Wed Aug 3 18:09:47 2011 +0200
+
+    CHANGES: Windows: Perl modules build now with IPv6 enabled.
+
+commit 7fcc0b8032f8da5b7bc30059af0ba656eae71091
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Aug 1 14:11:28 2011 +0200
+
+    smux: Fix recently reintroduced compiler warnings about size_t <> ssize_t mismatches
+
+commit b484b88d6e57b425a8467f5a39333312fed2acf2
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Tue Aug 2 09:31:50 2011 +0200
+
+    Fix a compiler warning in agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable_data_access.c
+
+commit 944612ef56ad2564aafe14df6d08e048b7228b86
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Aug 1 14:49:41 2011 +0200
+
+    .gitignore: Add file names and patterns for output files generated during the Windows build
+
+commit 26009012785f828bbfc8759afbbbfc58700ff1f6
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jul 29 09:59:31 2011 +0200
+
+    .gitignore: Sort alphabetically
+
+commit 5e3ff5596648e0907d571d7a4d3a3a8c2402d8ee
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jul 29 08:43:19 2011 +0200
+
+    .gitignore: Add apps/sshtosnmp
+
+commit 31a3a2a0624046511ca07ec1f521a22d7966db80
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Mon Aug 1 13:38:01 2011 +0200
+
+    Remove two generated Perl files.
+
+commit adadcb99e57b93be670a7c517fc989dffe7396e9
+Author: Thomas Anders <tanders@users.sourceforge.net>
+Date:   Tue Aug 2 00:56:49 2011 +0200
+
+    suppress "ok" test output in nsb
+
+commit ae9ac6c9812824bf5b848dc1f3ccf7227c436d0d
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Sun Jul 31 09:11:28 2011 +0200
+
+    Fix an incorrect source code comment: there is no requirement in the ANSI C standard that stack variables should be initialized to zero.
+
+commit 82d73fb11be3ae31f39c9d618d5388dc9b1006d7
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jul 29 20:51:27 2011 +0200
+
+    Unbreak the Windows build
+
+commit 9e47ac439333d2bb7c80686241db7331a88770fb
+Author: Thomas Anders <tanders@users.sourceforge.net>
+Date:   Sat Jul 30 00:18:14 2011 +0200
+
+    minor nsb fixes/enhancements from my old svn tree
+
+commit c48173c06a9eaadbf81e6b4962d55ef0a54db251
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jul 29 10:27:39 2011 +0200
+
+    Fix a bug in a debug statement
+
+commit eca1b9a25450cd875b2012c51c090ba2b97e0628
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jul 29 10:04:02 2011 +0200
+
+    Rerun autoreconf
+
+commit 69aa9e032caf5eb713bb00745134640fe9fd0235
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jul 29 09:59:31 2011 +0200
+
+    .gitignore: Sort alphabetically
+
+commit c38597dfa0b1d367d52bbdc0aeaadff0155850ad
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jul 29 08:43:19 2011 +0200
+
+    .gitignore: Add apps/sshtosnmp
+
+commit 774d0b66ee0acafeafa21fc8d993864779e50e63
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Fri Jul 29 07:43:54 2011 +0200
+
+    Fix two filenames in host mib source code comments.
+
+commit 3458128b4a3c5971998894f9d9d8ccc6c76d3c9b
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jul 28 16:16:15 2011 +0200
+
+    Fix potential sigsegv when an ifTable entry is removed as result of both interface_replace_old and interface_fadeout at the same time.
+
+commit a2f9ece06cf00ee47ce7e85672210c1b5786f311
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Thu Jul 28 15:19:22 2011 +0200
+
+    CHANGES: snmpd: Restore storage tables on Linux
+
+commit d62a0eb9070b4d8d9fe2bcfdb4d53d37ef814f9b
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jul 28 14:49:08 2011 +0200
+
+    Document interface_replace_old option.
+
+commit f660b8c0d8c2707bd73142f076079c9169f35956
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jul 28 14:40:27 2011 +0200
+
+    CHANGES: snmpd: added 'interface_replace_old' option to remove old entries
+    in ifTable when an interface with the same name as already exising one
+    appears.
+    
+    E.g. remove old ppp0 interface when new ppp0 shows up.
+
+commit 406cab818926499c3121dece4377d67638894042
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jul 28 14:32:57 2011 +0200
+
+    Document the interface_fadeout option.
+
+commit 42b883ce18e58ca89fdfd514ec698e2f7ffd1f63
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jul 28 14:32:38 2011 +0200
+
+    Allow ifTable entries to be deleted immediately when appropriate interface
+    disappears (i.e. interface_fadeout = 0 works as expected).
+
+commit 45062ea47be1cd8df4933a0de7f72f8cf9183aae
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu Jul 28 12:24:10 2011 +0200
+
+    CHANGES: snmpd: added 'interface_fadeout' configuration option to set lifetime of ifTable entries of removed interfaces.
+    
+    Previous lifetime was hardcoded 5 minutes, now it's configurable.
+
+commit 31fa07cd9ffde46d41d2b5838c3fc4d01548bfb5
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Jul 27 14:45:47 2011 +0200
+
+    CHANGES: snmpd: purge zombies of pass_persist child processes.
+    
+    If pass_persist process ends, we should process its sigchild signal.
+
+commit 11bd6e032d15ffb11d72e352ca6bc95023c3371a
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Jul 27 14:45:09 2011 +0200
+
+    CHANGES: snmpd: run signal handlers when select() is interrupted.
+    
+    This behavior is indicated in comment on line 1244, but it was not actually done.
+
+commit cd6e382beda8d40edd0664e8faec8db224e5d5d6
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Tue Jul 26 16:16:46 2011 +0200
+
+    Clarify an IPv6 source code comment
+
+commit 2cec624792af8546505fba02ca0a2e2116a559e7
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Tue Jul 26 14:59:33 2011 +0200
+
+    Spelling fix: definedy -> defined
+
+commit f95a1f380ea18ff633f273a9aa5e9eb27627010e
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Tue Jul 26 14:19:14 2011 +0200
+
+    Spelling fix: aleviate -> alleviate
+
+commit c5a8464c42a94c250ee2dfa2a473109a734203d8
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue Jul 26 14:24:55 2011 +0200
+
+    CHANGES: python: PATCH: 3310375: from Erinn Looney-Triggs: fixed parsing of varbinds with MIB names
+
+commit ebdd216c074bf41cd3a084bd14689cf01c887b31
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Tue Jul 19 18:36:11 2011 -0700
+
+    remove broken whitespace lines that leads to reading confusion
+
+commit d65c7b14a0f91560bbf65274f62e48db97a34b3e
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Tue Jul 19 18:46:10 2011 -0700
+
+    updated gitignore to ignore a number of auto-generated files
+
+commit ab1d887ba383c33d853aa4d348bbceab981aa245
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Tue Jul 19 18:36:11 2011 -0700
+
+    remove broken whitespace lines that leads to reading confusion
+
+commit 70dee4b8dd37e8b1d59db03cd7f631fe356f19e4
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Tue Jul 19 09:38:16 2011 +0200
+
+    CHANGES: snmpd: PATCH: 3369680: from Ilya Yanok: change snmp_enableauthentraps from int to long such that modifying the corresponding MIB object does not overwrite memory in 64-bit builds.
+
+commit 690ea7dc45c6fe1a7bbfa1584ed9bf921f19b28f
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Tue Jul 19 08:28:59 2011 +0200
+
+    CHANGES: snmptrapd: Add missing newline character in a log message
+
+commit dd2fc2ed88d0f9bb81de35dbe1f9bd3bbbbb3d90
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Tue Jul 19 08:28:13 2011 +0200
+
+    CHANGES: snmptrapd: Invoke shutdown_perl() when shutting down
+
+commit 6deec1a89048c8db26523517af98ddd397fc77c3
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Tue Jul 19 08:23:05 2011 +0200
+
+    Spelling fix: branket -> bracket
+
+commit 8d9dcc806eab37fe2ddf9cc34cf86467265b62cf
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Sun Jul 17 11:38:58 2011 +0200
+
+    Run autoreconf. Fixes build breakage caused by patch d588ec853bd0531f212fcbf51b962b96c6828b59 (RPM 4.9 support)
+
+commit a56721a3e7754e389daa7e8a3d5792899edc9de3
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Thu Jul 14 16:18:32 2011 +0200
+
+    Add autom4te.cache and stamp-h to .gitignore
+
+commit 851bcf53fcd13cdf0ba9f12e5d603e73f8bb9611
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Fri Jul 15 15:32:49 2011 -0700
+
+    mentione the 'before' part of the injectHandler line
+
+commit 9f793630162cb7713ac4b68c9aabe50e67514071
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu Jul 14 07:31:30 2011 -0700
+
+    fix a typo
+
+commit edc2c88375feccb176bcadeb58810dd57bd97fb7
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Jul 11 19:33:03 2011 -0700
+
+    added a copy of the shell-functions to the older branch
+
+commit 964d63514982d6dd9fa95020d24a3e88b22f2d0c
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Jul 11 19:30:29 2011 -0700
+
+    a copy of the release file applied to the older branches
+
+commit 196e110b314e37e73a74edb03c43da0299ea8b44
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Jul 11 19:34:06 2011 -0700
+
+    added 5.7 patches
+
+commit a2ac24dd4b5b709773fe827687c85982775d9998
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Jul 11 19:33:03 2011 -0700
+
+    added a copy of the shell-functions to the older branch
+
+commit 8ad32cefb37c62080c4f3d74443884bec1c49add
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Mon Jul 11 19:30:29 2011 -0700
+
+    a copy of the release file applied to the older branches
+
+commit 9ff471439e326255066377c76d995e1aaf296bd2
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Jun 29 23:15:42 2011 -0700
+
+    fix tag pushing
+
+commit f9a65385b23d06dbbe9430a23c8ebcf68d12127e
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Jun 29 22:32:10 2011 -0700
+
+    misc publication fixes found while publishing
+
+commit df9cf9a1e293d05a24786694f68c05a2be13a9b3
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Jun 29 16:34:11 2011 -0700
+
+    xml fixes
+
+commit ee8d160416c2f7d1941863e7d37512658e3f2f36
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Jun 29 16:33:50 2011 -0700
+
+    use git2cl to generate the ChangeLog file; needs much more work.
+
+commit 5d4bb80113ddcce5cee293a4e537b201fafcab83
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Jun 29 14:48:39 2011 -0700
+
+    use the new run-autoconf script
+
+commit 61ffef6268675a91e230d44b3407a3d0c3ffc89d
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Jun 29 14:47:56 2011 -0700
+
+    A script to invoke the correct version of the autoconf tool
+
+commit d0f6f8de37292b7fbc9e05793690b5784a041d46
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Jun 29 08:41:45 2011 -0700
+
+    remaining command line changes for svn -> git
+
+commit 16560840020dc5e0c4b28cc2e30bb2cd034ce0d0
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Jun 29 07:26:55 2011 -0700
+
+    make the branch echo output and svn update converted to git equivalents
+
+commit f775bcd6a7a50f33782526ecdb1beea55e3fe823
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Jun 29 07:11:29 2011 -0700
+
+    pull the branch info from git
+
+commit d588ec853bd0531f212fcbf51b962b96c6828b59
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Wed Jun 29 16:07:00 2011 +0200
+
+    Tweak RPM handling to work with library version 4.9
+
+commit af8b235234f72944a649a76f0d30cff95ac2e895
+Author: Wes Hardaker <opensource@hardakers.net>
+Date:   Tue Jun 28 13:11:19 2011 -0700
+
+    Mention the Git wiki page
+
+commit 9bc82e4ca4837f00072dba86b9497a27186909f9
+Author: Bart Van Assche <bvanassche@acm.org>
+Date:   Tue Jun 28 19:13:35 2011 +0200
+
+    Add .gitignore
+
+commit f2df8a2b0165e0137fd017b41c7d04e3a5e168e6
+Author: Wes Hardaker <opensource@hardakers.net>
+Date:   Tue Jun 28 08:29:08 2011 -0700
+
+    We're now using git!
+
+commit 7d917cfc8f74574032564815ab0fb483b691864e
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri Jun 24 13:00:50 2011 +0000
+
+    version update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20524 06827809-a52a-0410-b366-d66718629ded
+
+commit a162e931f29931ce03d40d73dd969f6086083b80
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri Jun 24 12:38:14 2011 +0000
+
+    Missing check for rpmts.h
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20523 06827809-a52a-0410-b366-d66718629ded
+
+commit 0787ff1f632e08440e8bb240dabca5c5e63fd82d
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri Jun 24 12:20:20 2011 +0000
+
+    Version number update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20522 06827809-a52a-0410-b366-d66718629ded
+
+commit 4530d877531083bfffd3bbca4a82c30009bef8fd
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri Jun 24 12:08:23 2011 +0000
+
+    documentation update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20521 06827809-a52a-0410-b366-d66718629ded
+
+commit 49575f136b40d08d21a168a0d545d85f59c58701
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri Jun 24 12:02:15 2011 +0000
+
+    Version number update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20520 06827809-a52a-0410-b366-d66718629ded
+
+commit 599e3cdff9e78622535683a69f42977df4089ba9
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Thu Jun 23 15:41:38 2011 +0000
+
+    Tweak RPM handling to work with library version 4.9
+    Based on a patch by Jan Safranek
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20519 06827809-a52a-0410-b366-d66718629ded
+
+commit 5c2a691bd29ea343046d218621502a66bc96a1bb
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Wed Jun 22 14:27:39 2011 +0000
+
+    Provide a framework for reading RPM package information from
+    a cache directory (rather than querying the RPMdb directly).
+    
+    My apologies to Jeff Johnson for the delay in adding this functionality.
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20518 06827809-a52a-0410-b366-d66718629ded
+
+commit 2707435ef5e011c3637f37981cbe4d50f2e729dc
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Wed Jun 22 13:26:45 2011 +0000
+
+    version update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20516 06827809-a52a-0410-b366-d66718629ded
+
+commit 272f96aec937ed74cc4db980745d2dbe00ca53a0
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Wed Jun 22 13:06:45 2011 +0000
+
+    Version number update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20515 06827809-a52a-0410-b366-d66718629ded
+
+commit 9e471adc2a40212b4c017cbced6e25882e306a4d
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Wed Jun 22 13:04:12 2011 +0000
+
+    Version number update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20514 06827809-a52a-0410-b366-d66718629ded
+
+commit 8a5ac775de575416070665c30bc3d77336e12bcb
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Tue Jun 21 14:28:48 2011 +0000
+
+    Provide a framework for reading RPM package information from
+    a cache directory (rather than querying the RPMdb directly).
+    
+    My apologies to Jeff Johnson for the delay in adding this functionality.
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20513 06827809-a52a-0410-b366-d66718629ded
+
+commit 4524255ba6083d25c03f6436ecbe398836f4a0f8
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Sun Jun 19 07:52:26 2011 +0000
+
+    Follow-up for r20511: really use the proper format specification.
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20512 06827809-a52a-0410-b366-d66718629ded
+
+commit 621c9eda1282b7f562b3777b5fb57fd355c1a206
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Fri Jun 17 19:09:52 2011 +0000
+
+    Fix a bug in a debug statement introduced by patch 3310250 / r20494: use %ld to print a value of type oid instead of %d.
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20511 06827809-a52a-0410-b366-d66718629ded
+
+commit 3b3e97b309a535df1a99b03693869050649d53a0
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Fri Jun 17 19:06:42 2011 +0000
+
+    Use %p to print a pointer instead of %ld
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20510 06827809-a52a-0410-b366-d66718629ded
+
+commit 878bcd8764be5d158d65f4b20a68cb3a948dbddf
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Fri Jun 17 19:06:42 2011 +0000
+
+    Use %p to print a pointer instead of %ld
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20510 06827809-a52a-0410-b366-d66718629ded
+
+commit 374af0758644e9abcc4998fb291ca373869048f8
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Fri Jun 3 06:30:33 2011 +0000
+
+    Reverted r20362: that patch makes sense on the trunk and the 5.6 branch but not on the 5.5 nor on the 5.4 branch.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20495 06827809-a52a-0410-b366-d66718629ded
+
+commit 7189356d88b4cbd920fd934111e4b6d690513f50
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Jun 1 22:24:23 2011 +0000
+
+    CHANGES: snmpd: patch 3310250: from fenner: misc fixes for debugging output of agentx
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20494 06827809-a52a-0410-b366-d66718629ded
+
+commit c9c3db15752d6e4b8b9600cd7d1a8d79d6d83c3e
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Wed Jun 1 15:57:18 2011 +0000
+
+    version update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20487 06827809-a52a-0410-b366-d66718629ded
+
+commit 0eefeccf76d630796b7c8c64a0e33d0175262fcb
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Wed Jun 1 15:48:49 2011 +0000
+
+    version update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20486 06827809-a52a-0410-b366-d66718629ded
+
+commit 35f0a3822af8f00855242906b132e702de899213
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Wed Jun 1 15:47:04 2011 +0000
+
+    make depend
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20485 06827809-a52a-0410-b366-d66718629ded
+
+commit b1e5acbb605bed3210c7f5ddaeeef2a050cf6bea
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Wed Jun 1 15:42:00 2011 +0000
+
+    Reinstate an "unused" label that is actually still required.
+    (referenced in line 2710)
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20484 06827809-a52a-0410-b366-d66718629ded
+
+commit 2487579d1e977137dc643acee762aeaafa60f4bd
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Wed Jun 1 15:32:23 2011 +0000
+
+    Fix typo
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20483 06827809-a52a-0410-b366-d66718629ded
+
+commit cac11a92c04a5cc51e231be0ab116db855221de1
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Wed Jun 1 15:08:51 2011 +0000
+
+    documentation update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20482 06827809-a52a-0410-b366-d66718629ded
+
+commit fa8ee4f97c2fa8fb6e59cf055e0d81a3bdecfb97
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Wed Jun 1 14:51:14 2011 +0000
+
+    Version number update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20481 06827809-a52a-0410-b366-d66718629ded
+
+commit 865ccff3220d017f3ef3b619f0f8f447d33514eb
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Wed Jun 1 10:19:33 2011 +0000
+
+    version update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20479 06827809-a52a-0410-b366-d66718629ded
+
+commit 7b619b10e912bdd1c7633ce3b1e72574c2341ce9
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Wed Jun 1 10:01:01 2011 +0000
+
+    version update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20478 06827809-a52a-0410-b366-d66718629ded
+
+commit 55f6e8c3a0f7741bf8a689a0fcf06cc480ad1eff
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Wed Jun 1 09:54:04 2011 +0000
+
+    make depend
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20477 06827809-a52a-0410-b366-d66718629ded
+
+commit d7a273ccbee56901e8679a0de32bc6aa16d44bf5
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Wed Jun 1 09:06:32 2011 +0000
+
+    documentation update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20476 06827809-a52a-0410-b366-d66718629ded
+
+commit 126353551f4937f7c0bc1aa8c80c2d48d1349c93
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Wed Jun 1 09:00:24 2011 +0000
+
+    Version number update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20475 06827809-a52a-0410-b366-d66718629ded
+
+commit 7fa30fce08ac494c358e6a31b9702e12ffebd461
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Tue May 31 22:49:32 2011 +0000
+
+    CHANGES: snmpd: PATCH 3066862: from fhew: fix the agent for comparing unsigned large indexes of the disk and extend tables.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20471 06827809-a52a-0410-b366-d66718629ded
+
+commit b41d4aaf7a06b45a9ec07a5511bac5bad6fdda2a
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Tue May 31 22:49:32 2011 +0000
+
+    CHANGES: snmpd: PATCH 3066862: from fhew: fix the agent for comparing unsigned large indexes of the disk and extend tables.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20471 06827809-a52a-0410-b366-d66718629ded
+
+commit 1a8438650405ae38491f3a5c9a2b10fc99b1b9c2
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Tue May 31 22:49:32 2011 +0000
+
+    CHANGES: snmpd: PATCH 3066862: from fhew: fix the agent for comparing unsigned large indexes of the disk and extend tables.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20471 06827809-a52a-0410-b366-d66718629ded
+
+commit c07d59bd92cc34bc96964b5e743cfdee79875b7a
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue May 31 12:30:30 2011 +0000
+
+    CHANGES: snmpd: fixed hrSWRunPath of swapped-out processes on Linux.
+    
+    fgets() returns NULL both when /proc/PID/cmdline is empty (= swapped out) and when the process exited after fopen(), so check /proc/PID/status in both cases.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20470 06827809-a52a-0410-b366-d66718629ded
+
+commit ba68806dd064f655536d6f69371c699e6162056e
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue May 31 12:30:30 2011 +0000
+
+    CHANGES: snmpd: fixed hrSWRunPath of swapped-out processes on Linux.
+    
+    fgets() returns NULL both when /proc/PID/cmdline is empty (= swapped out) and when the process exited after fopen(), so check /proc/PID/status in both cases.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20470 06827809-a52a-0410-b366-d66718629ded
+
+commit 91cdb815bb365757f84c2234d9e5f5763ac4b04f
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu May 26 16:12:48 2011 +0000
+
+    CHANGES: snmpd: patch 3299384: fix INFORMs so they retry probing for an engineID.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20458 06827809-a52a-0410-b366-d66718629ded
+
+commit a5a9d1e8a24f02dfe4e97af04d6f5e0b590a52ae
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu May 26 16:12:48 2011 +0000
+
+    CHANGES: snmpd: patch 3299384: fix INFORMs so they retry probing for an engineID.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20458 06827809-a52a-0410-b366-d66718629ded
+
+commit 4b956c470ac7e49399e7e1239798e2a060fe58ba
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu May 26 16:12:48 2011 +0000
+
+    CHANGES: snmpd: patch 3299384: fix INFORMs so they retry probing for an engineID.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20458 06827809-a52a-0410-b366-d66718629ded
+
+commit a9bc34f6f450b4751def8b8572b25c0f7918ad5e
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu May 26 16:06:11 2011 +0000
+
+    Applied (roughly) patch 3299370 to avoid rewriting existing authkey/privkey/etcs
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20457 06827809-a52a-0410-b366-d66718629ded
+
+commit 1d331375d86282e23b4ae602052753aa4a4f87ac
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu May 26 16:06:11 2011 +0000
+
+    Applied (roughly) patch 3299370 to avoid rewriting existing authkey/privkey/etcs
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20457 06827809-a52a-0410-b366-d66718629ded
+
+commit aa5ec8d19de295151032639e138e8b76587866bc
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu May 26 16:06:11 2011 +0000
+
+    Applied (roughly) patch 3299370 to avoid rewriting existing authkey/privkey/etcs
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20457 06827809-a52a-0410-b366-d66718629ded
+
+commit 880132daf2f53dadfe41b22ad322d70650a82cc1
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Wed May 25 13:07:23 2011 +0000
+
+    CHANGES: Win32: Microsoft Visual Studio: Link with gdi32.lib if OpenSSL has been enabled because gdi32.lib is a dependency of OpenSSL.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20451 06827809-a52a-0410-b366-d66718629ded
+
+commit 885d1f55cefa82d95356e3e35ecae81158af3b59
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Wed May 25 09:21:05 2011 +0000
+
+    CHANGES: snmpd: Use proper format specifier in debug statements for printing values of type 'oid'.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20449 06827809-a52a-0410-b366-d66718629ded
+
+commit 723bc387571757426b861b6a8854a4b8d89dcd15
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Wed May 25 09:21:05 2011 +0000
+
+    CHANGES: snmpd: Use proper format specifier in debug statements for printing values of type 'oid'.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20449 06827809-a52a-0410-b366-d66718629ded
+
+commit 0f2ecd6f05dee37f93ea9a9ac9e7276d6b478dd0
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue May 24 12:51:39 2011 +0000
+
+    Added NULL-checks after malloc
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20446 06827809-a52a-0410-b366-d66718629ded
+
+commit c89c95bccd138bdaee3e01f2d0f663328e8e7e88
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Tue May 24 12:51:39 2011 +0000
+
+    Added NULL-checks after malloc
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20446 06827809-a52a-0410-b366-d66718629ded
+
+commit e3b20caabc313d888ca4cc9544e7ecf2e1ab09d4
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Sun May 22 19:34:10 2011 +0000
+
+    CHANGES: agent: BUG: 3305157: Fix ipAddressPrefix handling of IPv6 addresses
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20445 06827809-a52a-0410-b366-d66718629ded
+
+commit 9b125c713be1ecca63f2b169d2c10d1d24a2d476
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Sun May 22 19:34:10 2011 +0000
+
+    CHANGES: agent: BUG: 3305157: Fix ipAddressPrefix handling of IPv6 addresses
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20445 06827809-a52a-0410-b366-d66718629ded
+
+commit 04331882a0c9df79d9135457382a2725c3030f81
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Sun May 22 19:07:56 2011 +0000
+
+    CHANGES: python: BUG: 3295407: Fix handling of void pointer
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20444 06827809-a52a-0410-b366-d66718629ded
+
+commit 6e2bf91aba562ccaeb130419893a7170bb2312f9
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Sun May 22 19:07:56 2011 +0000
+
+    CHANGES: python: BUG: 3295407: Fix handling of void pointer
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20444 06827809-a52a-0410-b366-d66718629ded
+
+commit caba651f84f7102cba181d195b59c79768d94561
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Sun May 22 18:57:53 2011 +0000
+
+    CHANGES: snmplib: BUG: 3264852: Recognise missing report types (snmp{Unavailable,Unknown}Contexts,snmpUnknownPDUHandlers)
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20443 06827809-a52a-0410-b366-d66718629ded
+
+commit c5a4580b924ed5c49cffd1b7fd8e932ed168ecdb
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Sun May 22 18:57:53 2011 +0000
+
+    CHANGES: snmplib: BUG: 3264852: Recognise missing report types (snmp{Unavailable,Unknown}Contexts,snmpUnknownPDUHandlers)
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20443 06827809-a52a-0410-b366-d66718629ded
+
+commit 98815003f345ece93fcf836fb0c3ea5997c8f900
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Sun May 22 18:57:53 2011 +0000
+
+    CHANGES: snmplib: BUG: 3264852: Recognise missing report types (snmp{Unavailable,Unknown}Contexts,snmpUnknownPDUHandlers)
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20443 06827809-a52a-0410-b366-d66718629ded
+
+commit 30245d00d30cfc526939bb2ff721b2076546e8c7
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri May 20 15:41:06 2011 +0000
+
+    CHANGES: snmplib: BUG: 3234754: Ensure old f_create_from_tstring hook is initialized to NULL
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20442 06827809-a52a-0410-b366-d66718629ded
+
+commit 56c74c5a49386330a581564a6ee1579bcf6c509e
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri May 20 15:41:06 2011 +0000
+
+    CHANGES: snmplib: BUG: 3234754: Ensure old f_create_from_tstring hook is initialized to NULL
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20442 06827809-a52a-0410-b366-d66718629ded
+
+commit 45b4bd537b627534b1c6218219fd770eb5a4a155
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu May 19 19:46:20 2011 +0000
+
+    use #ifdef rather than #if for define checks.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20441 06827809-a52a-0410-b366-d66718629ded
+
+commit 5cc5a4cd0d648935ec76e09616229d0ceebc41a0
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu May 19 19:46:20 2011 +0000
+
+    use #ifdef rather than #if for define checks.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20441 06827809-a52a-0410-b366-d66718629ded
+
+commit b588d1a1da681b26f35f2bbf0492242cf4d83c96
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Thu May 19 19:46:20 2011 +0000
+
+    use #ifdef rather than #if for define checks.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20441 06827809-a52a-0410-b366-d66718629ded
+
+commit 98d6223e10af0b207395c9a71190dff6fa87959c
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Thu May 19 17:19:31 2011 +0000
+
+    CHANGES: man: BUG: 3190725: Document snmp{,_sess}synch_response and snmp_async_send
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20440 06827809-a52a-0410-b366-d66718629ded
+
+commit c26e7a93851ed678447dc32ab72fbc1a008a135d
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Thu May 19 17:19:31 2011 +0000
+
+    CHANGES: man: BUG: 3190725: Document snmp{,_sess}synch_response and snmp_async_send
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20440 06827809-a52a-0410-b366-d66718629ded
+
+commit c00f88f33888edd480acc9ec9312d6b61e170a76
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Thu May 19 17:19:31 2011 +0000
+
+    CHANGES: man: BUG: 3190725: Document snmp{,_sess}synch_response and snmp_async_send
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20440 06827809-a52a-0410-b366-d66718629ded
+
+commit ca053996022e3c1de3e2d5b558fadf6d79e9fdd3
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Fri May 13 12:05:19 2011 +0000
+
+    Follow-up for r20417: replaced a malloc()/free() pair by a call to realloc().
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20424 06827809-a52a-0410-b366-d66718629ded
+
+commit 06869520856976ff4590a0bb61c4e96f16c35d6e
+Author: Jan Safranek <jsafranek@users.sourceforge.net>
+Date:   Thu May 12 11:47:36 2011 +0000
+
+    CHANGES: snmpd: Fixed memory leak in TCP-MIB tables introduced by patch #3053436.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20421 06827809-a52a-0410-b366-d66718629ded
+
+commit 05d3d3a82311bf9b55386216f188198cd849fff1
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Thu May 12 09:03:02 2011 +0000
+
+    CHANGES: snmplib: Fixed a memory leak in snmp_free_session().
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20418 06827809-a52a-0410-b366-d66718629ded
+
+commit 4e94ab7f0c6509b6282eefc888ab0dcf78e575a6
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Thu May 12 09:03:02 2011 +0000
+
+    CHANGES: snmplib: Fixed a memory leak in snmp_free_session().
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20418 06827809-a52a-0410-b366-d66718629ded
+
+commit cc78d06239755c6ebb831903b6cedd3e1dbab583
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Thu May 12 08:25:33 2011 +0000
+
+    CHANGES: snmplib: _mibindex_add() no longer reads past the end of the dynamically allocated array _mibindexes.
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20417 06827809-a52a-0410-b366-d66718629ded
+
+commit adced4a84876a2e3cb8687b5ffa5830a3b5003aa
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Thu May 12 08:12:47 2011 +0000
+
+    CHANGES: Win32: Fixed a memory leak in the Net-SNMP (non-winExtDLL) implementation of the MIB-II ipNetToMediaTable.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20414 06827809-a52a-0410-b366-d66718629ded
+
+commit f0012dec2c98baf1c0e25fa17d5bf89bacd0a4a4
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Thu May 12 08:12:47 2011 +0000
+
+    CHANGES: Win32: Fixed a memory leak in the Net-SNMP (non-winExtDLL) implementation of the MIB-II ipNetToMediaTable.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20414 06827809-a52a-0410-b366-d66718629ded
+
+commit 8ecd298dbccee1e327ce65852f98928d7bc041d7
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Thu May 12 08:08:41 2011 +0000
+
+    CHANGES: Win32: Fixed a memory leak in the Net-SNMP (non-winExtDLL) implementation of the MIB-II ifTable.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20413 06827809-a52a-0410-b366-d66718629ded
+
+commit d962fda677814b6342ad1b9c3fa84225b555cda2
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Thu May 12 08:08:41 2011 +0000
+
+    CHANGES: Win32: Fixed a memory leak in the Net-SNMP (non-winExtDLL) implementation of the MIB-II ifTable.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20413 06827809-a52a-0410-b366-d66718629ded
+
+commit aa032769bc3da8302c38dd9d62d53f7f054eb2c7
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Thu May 12 07:33:02 2011 +0000
+
+    CHANGES: Win32: Fixed a memory leak in the Net-SNMP (non-winExtDLL) implementation of the MIB-II ipAddrTable.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20412 06827809-a52a-0410-b366-d66718629ded
+
+commit 4ffa908d02cfad9ff31a2018192d4ad5f959467c
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Thu May 12 07:33:02 2011 +0000
+
+    CHANGES: Win32: Fixed a memory leak in the Net-SNMP (non-winExtDLL) implementation of the MIB-II ipAddrTable.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20412 06827809-a52a-0410-b366-d66718629ded
+
+commit 271914512dc8268d8bc49ba7ec38cc2acec656c3
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Thu May 12 06:54:33 2011 +0000
+
+    Documentation / source code comment spelling fix: exitent -> existent.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20411 06827809-a52a-0410-b366-d66718629ded
+
+commit c009c12d72bbc2e2795d3a6b22cab6ba06e48535
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Thu May 12 06:54:33 2011 +0000
+
+    Documentation / source code comment spelling fix: exitent -> existent.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20411 06827809-a52a-0410-b366-d66718629ded
+
+commit c2d35bd5c322d7a8536a1ff31d73e41f77c85b97
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Tue May 10 15:02:51 2011 +0000
+
+    MinGW: avoid that gcc complains about pasing a (char *) argument while (unsigned char *) is expected.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20402 06827809-a52a-0410-b366-d66718629ded
+
+commit 3dbe27799a3f065bbf212599466969beb72690d2
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Tue May 10 15:02:51 2011 +0000
+
+    MinGW: avoid that gcc complains about pasing a (char *) argument while (unsigned char *) is expected.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20402 06827809-a52a-0410-b366-d66718629ded
+
+commit 94b5238d88a027306aa9115758111c785a4abad8
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Mon May 9 20:52:01 2011 +0000
+
+    Use symbolic named for ifType values
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20375 06827809-a52a-0410-b366-d66718629ded
+
+commit 04b8e279a7a785a76ebf4b6575f41ce6299452c6
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Mon May 9 20:52:01 2011 +0000
+
+    Use symbolic named for ifType values
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20375 06827809-a52a-0410-b366-d66718629ded
+
+commit 3dcbfdd4f1ffead5524149b4efb00128688e1505
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Mon May 9 20:52:01 2011 +0000
+
+    Use symbolic named for ifType values
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20375 06827809-a52a-0410-b366-d66718629ded
+
+commit 5bb1c9a8fdc47b3ef355cb42e9e18ad88ce496fb
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Sun May 8 20:01:26 2011 +0000
+
+    Fix warnings and data format for DateAndTime objects.
+    These modules work, but:
+    - They are Linux only
+    - Rows must be created with rowStatus createAndWait before they are populated
+    - Agent must run as root
+    - Agent is blocked while tests run
+    - Data format for InetAddress objects is wrong. It is ASCII, not binary
+      (making it easier to use from the command line, but ...)
+    
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20363 06827809-a52a-0410-b366-d66718629ded
+
+commit dbb8795a7df595f0603f2ec61704799f4c482667
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Sun May 8 20:01:26 2011 +0000
+
+    Fix warnings and data format for DateAndTime objects.
+    These modules work, but:
+    - They are Linux only
+    - Rows must be created with rowStatus createAndWait before they are populated
+    - Agent must run as root
+    - Agent is blocked while tests run
+    - Data format for InetAddress objects is wrong. It is ASCII, not binary
+      (making it easier to use from the command line, but ...)
+    
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20363 06827809-a52a-0410-b366-d66718629ded
+
+commit e9ac86278c3588022914758a345fb982bb5d4ec4
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Sun May 8 20:01:26 2011 +0000
+
+    Fix warnings and data format for DateAndTime objects.
+    These modules work, but:
+    - They are Linux only
+    - Rows must be created with rowStatus createAndWait before they are populated
+    - Agent must run as root
+    - Agent is blocked while tests run
+    - Data format for InetAddress objects is wrong. It is ASCII, not binary
+      (making it easier to use from the command line, but ...)
+    
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20363 06827809-a52a-0410-b366-d66718629ded
+
+commit e3db95e1619dd57dfb55ac7494f48d2add56d973
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Sat May 7 15:22:27 2011 +0000
+
+    Removed an unused label from perl/SNMP/SNMP.xs.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20362 06827809-a52a-0410-b366-d66718629ded
+
+commit ea8ce00744e83233d8543852f884aa037c1183a2
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Sat May 7 15:22:27 2011 +0000
+
+    Removed an unused label from perl/SNMP/SNMP.xs.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20362 06827809-a52a-0410-b366-d66718629ded
+
+commit a58969eddb3b669877d7229f719087bbd727d033
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Fri May 6 21:32:01 2011 +0000
+
+    NEWS: PATCH 3198781: from fenner: Get disman/ping and disman/traceroute to at least compile
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20352 06827809-a52a-0410-b366-d66718629ded
+
+commit 2cca6125d538faa9b51b772141f192d7b63cc0cb
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Fri May 6 21:32:01 2011 +0000
+
+    NEWS: PATCH 3198781: from fenner: Get disman/ping and disman/traceroute to at least compile
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20352 06827809-a52a-0410-b366-d66718629ded
+
+commit b1e76bef81bfce16c8d0bc01e856cb4c75930b5c
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Fri May 6 21:32:01 2011 +0000
+
+    NEWS: PATCH 3198781: from fenner: Get disman/ping and disman/traceroute to at least compile
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20352 06827809-a52a-0410-b366-d66718629ded
+
+commit fcb8a8d27c2cc379dce263dbee6720d7b4e02d74
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri May 6 17:46:29 2011 +0000
+
+    version update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20347 06827809-a52a-0410-b366-d66718629ded
+
+commit 515af99cb9e6a3b0923e650466f74464e3b9b5f6
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri May 6 17:37:59 2011 +0000
+
+    version update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20346 06827809-a52a-0410-b366-d66718629ded
+
+commit 6f927fd73af2a4ceb67fc4090826a284a7e6fc19
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri May 6 17:35:50 2011 +0000
+
+    make depend
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20345 06827809-a52a-0410-b366-d66718629ded
+
+commit 8080a8189ed7ee73ca3218c8280c68717d4535de
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri May 6 17:22:14 2011 +0000
+
+    documentation update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20344 06827809-a52a-0410-b366-d66718629ded
+
+commit 62fb93e28728b0e93c134c88b65b1d453b6e89c2
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri May 6 17:17:46 2011 +0000
+
+    Version number update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20343 06827809-a52a-0410-b366-d66718629ded
+
+commit 74e13cc95bee4655df23ba514bd2657886c9e4b6
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri May 6 14:23:24 2011 +0000
+
+    version update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20340 06827809-a52a-0410-b366-d66718629ded
+
+commit 793187aaa04c881f6b57fcf361296b52a940e1f8
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri May 6 14:21:45 2011 +0000
+
+    version update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20339 06827809-a52a-0410-b366-d66718629ded
+
+commit 1466e15e52380965f844c6d98b3eb257899a4ce2
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri May 6 14:19:57 2011 +0000
+
+    make depend
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20338 06827809-a52a-0410-b366-d66718629ded
+
+commit dec7d47ca3767c37d17981f1cf9e580ae2fe0214
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri May 6 14:02:04 2011 +0000
+
+    documentation update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20337 06827809-a52a-0410-b366-d66718629ded
+
+commit 0ec1c929167adb3d96b41eac24353496c3371b08
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri May 6 13:59:20 2011 +0000
+
+    Version number update
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20336 06827809-a52a-0410-b366-d66718629ded
+
+commit 1a014529c5c4a07c8407e955a7f1fe686cb7ee7c
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri May 6 13:50:06 2011 +0000
+
+    Fix incomplete uninstall configuration:
+    - broken removal of Microsoft DLL
+    - remove assorted new MIBs and header files
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20335 06827809-a52a-0410-b366-d66718629ded
+
+commit dac102bd5b63a21181a8030adaf5ff96b9f826c3
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri May 6 13:50:06 2011 +0000
+
+    Fix incomplete uninstall configuration:
+    - broken removal of Microsoft DLL
+    - remove assorted new MIBs and header files
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20335 06827809-a52a-0410-b366-d66718629ded
+
+commit fc3b416794cf72922f8b2d636bbed377ca1a36ed
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri May 6 13:50:06 2011 +0000
+
+    Fix incomplete uninstall configuration:
+    - broken removal of Microsoft DLL
+    - remove assorted new MIBs and header files
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20335 06827809-a52a-0410-b366-d66718629ded
+
+commit f3b13725b7bd64ac948d970d9fe9652988ea4118
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri May 6 12:58:28 2011 +0000
+
+    Support Tar/GZip command paths containing spaces
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20334 06827809-a52a-0410-b366-d66718629ded
+
+commit eec17876a653fd052ff62424a87958fa8d029442
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri May 6 12:57:07 2011 +0000
+
+    Report GZip command correctly
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20333 06827809-a52a-0410-b366-d66718629ded
+
+commit c1fb3722914741fa998e6b7cee9ce8e07cd4700e
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Thu May 5 06:07:51 2011 +0000
+
+    CHANGES: MinGW: Made regression test output independent of the Net-SNMP variables defined in the Windows registry. Some tests that failed previously after the Net-SNMP binaries (MSVC build) had been installed do now pass.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20329 06827809-a52a-0410-b366-d66718629ded
+
+commit bc5258de2030228b369e13d2a4748c857a0a4b5e
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Thu May 5 06:07:51 2011 +0000
+
+    CHANGES: MinGW: Made regression test output independent of the Net-SNMP variables defined in the Windows registry. Some tests that failed previously after the Net-SNMP binaries (MSVC build) had been installed do now pass.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20329 06827809-a52a-0410-b366-d66718629ded
+
+commit f67c150fb05ed38df44f8b526091d6e9b88d9f30
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Tue May 3 19:15:27 2011 +0000
+
+    CHANGES: snmplib: Guard netsnmp_udp_recvfrom() etc. declarations consistently.
+    CHANGES: Win32: Builds with Visual Studio 2010.
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20279 06827809-a52a-0410-b366-d66718629ded
+
+commit 0981e600a62d524bba0fc8784435d76d275d7f33
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Tue May 3 15:29:46 2011 +0000
+
+    CHANGES: Win32: PATCH: 3293842: Eliminate registry argument limit of 127 characters (this limitation was reported by Sylvain Dery).
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20277 06827809-a52a-0410-b366-d66718629ded
+
+commit f3ea341fb1944dc6a6396add72ac39f5794a2d69
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Tue May 3 15:29:46 2011 +0000
+
+    CHANGES: Win32: PATCH: 3293842: Eliminate registry argument limit of 127 characters (this limitation was reported by Sylvain Dery).
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20277 06827809-a52a-0410-b366-d66718629ded
+
+commit a2900c45d1d927e1d891800a1422a922b376d85c
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Mon May 2 11:22:34 2011 +0000
+
+    CHANGES: Win32: header file <net-snmp/net-snmp-config.h> can now be used in the MinGW environment.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20276 06827809-a52a-0410-b366-d66718629ded
+
+commit 4205f53829a725b5b5ee835d7918a7835b26adc6
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Mon May 2 11:22:34 2011 +0000
+
+    CHANGES: Win32: header file <net-snmp/net-snmp-config.h> can now be used in the MinGW environment.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20276 06827809-a52a-0410-b366-d66718629ded
+
+commit 2e00914d408b0ef9a45d2b317b03329e81456586
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Mon May 2 11:13:23 2011 +0000
+
+    Win32 DLL build fixes.
+    (Backported r20184 from trunk.)
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20275 06827809-a52a-0410-b366-d66718629ded
+
+commit e7864207f888230de679acfda1fd9b657d792610
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Fri Apr 29 11:17:11 2011 +0000
+
+    Spelling and grammar fixes for the source code comments in snmplib/winservice.c.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20274 06827809-a52a-0410-b366-d66718629ded
+
+commit e7b33f43d0c3125162abbd264d7e1fa3fa406302
+Author: Bart Van Assche <bvassche@users.sourceforge.net>
+Date:   Fri Apr 29 11:17:11 2011 +0000
+
+    Spelling and grammar fixes for the source code comments in snmplib/winservice.c.
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20274 06827809-a52a-0410-b366-d66718629ded
+
+commit 311ade23de4a0014fe0fc23cf83d077cd663ad05
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Apr 27 21:16:23 2011 +0000
+
+    Don't free the ifXTable row found on load failure as we don't own it
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20241 06827809-a52a-0410-b366-d66718629ded
+
+commit ede24689461b75c441a36a384a6c559723dde2d3
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Apr 27 21:16:23 2011 +0000
+
+    Don't free the ifXTable row found on load failure as we don't own it
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20241 06827809-a52a-0410-b366-d66718629ded
+
+commit 1af08e1d608b7bd13361ead5c42f4c47a283b599
+Author: Wes Hardaker <hardaker@users.sourceforge.net>
+Date:   Wed Apr 27 21:16:23 2011 +0000
+
+    Don't free the ifXTable row found on load failure as we don't own it
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20241 06827809-a52a-0410-b366-d66718629ded
+
+commit 40abd8e5ab11a07c496ab25f1ad54cc3e58327a4
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Sun Apr 17 20:56:48 2011 +0000
+
+    CHANGES: snmpd: PATCHES: 3175640: Use IP_RECVDSTADDR sockopt where available (*BSD)
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20183 06827809-a52a-0410-b366-d66718629ded
+
+commit c048f2ce43bfa82e8d3ad8a2bd312290c6ba27f0
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri Apr 15 13:42:14 2011 +0000
+
+    CHANGES: snmplib: PATCHES: 3183000: Fix calculation of common OID prefix length
+    CHANGES: snmplib: BUGS: 3182985: Fix calculation of common OID prefix length
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20182 06827809-a52a-0410-b366-d66718629ded
+
+commit 0e2d8e8337af7257f7eb727678f8034e84ae74ce
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri Apr 15 13:42:14 2011 +0000
+
+    CHANGES: snmplib: PATCHES: 3183000: Fix calculation of common OID prefix length
+    CHANGES: snmplib: BUGS: 3182985: Fix calculation of common OID prefix length
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20182 06827809-a52a-0410-b366-d66718629ded
+
+commit 391597cffd9abde5ff46b74c5b6c7e321ab7d3c1
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Fri Apr 15 13:42:14 2011 +0000
+
+    CHANGES: snmplib: PATCHES: 3183000: Fix calculation of common OID prefix length
+    CHANGES: snmplib: BUGS: 3182985: Fix calculation of common OID prefix length
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20182 06827809-a52a-0410-b366-d66718629ded
+
+commit e4574372e478d37efa3975ca0fc718fcda30608f
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Thu Apr 14 21:31:09 2011 +0000
+
+    CHANGES: python: PATCHES: 3185085: Fix segfault on 64-bit systems
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20180 06827809-a52a-0410-b366-d66718629ded
+
+commit 6c06a2594f6e87c72251ff793e7d9187b8915fbc
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Thu Apr 14 21:31:09 2011 +0000
+
+    CHANGES: python: PATCHES: 3185085: Fix segfault on 64-bit systems
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20180 06827809-a52a-0410-b366-d66718629ded
+
+commit 7e899b5cf2db2164e0c1d58706b9502e86596970
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Thu Apr 14 21:10:56 2011 +0000
+
+    CHANGES: mib2c: PATCHES: 3175323: Fix handling of 'while (false)' blocks
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20179 06827809-a52a-0410-b366-d66718629ded
+
+commit 6967d78999b7f4cb527020750cd35927fe4f2fe7
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Thu Apr 14 21:10:56 2011 +0000
+
+    CHANGES: mib2c: PATCHES: 3175323: Fix handling of 'while (false)' blocks
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20179 06827809-a52a-0410-b366-d66718629ded
+
+commit 50239f6650586bb4b99205424592b7b5191d5404
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Thu Apr 14 21:10:56 2011 +0000
+
+    CHANGES: mib2c: PATCHES: 3175323: Fix handling of 'while (false)' blocks
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20179 06827809-a52a-0410-b366-d66718629ded
+
+commit 5d5d6fd481528adf7ca01ec0790849ca73196dc2
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Thu Apr 14 20:52:59 2011 +0000
+
+    CHANGES: mib2c: PATCHES: 3204883: Fix handling of non-table objects named fooTable
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20178 06827809-a52a-0410-b366-d66718629ded
+
+commit 3a8dca3143c5ca11443feb07f7af4bed808bdd32
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Thu Apr 14 20:52:59 2011 +0000
+
+    CHANGES: mib2c: PATCHES: 3204883: Fix handling of non-table objects named fooTable
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20178 06827809-a52a-0410-b366-d66718629ded
+
+commit b4bc7b27cda499391b9ecb2cbe541e10c151abd5
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Thu Apr 14 20:52:59 2011 +0000
+
+    CHANGES: mib2c: PATCHES: 3204883: Fix handling of non-table objects named fooTable
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20178 06827809-a52a-0410-b366-d66718629ded
+
+commit 6a29968cbdc0166a47a93d1c14d39a2e39fa98d2
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Thu Apr 14 20:44:37 2011 +0000
+
+    CHANGES: mib2c: PATCHES: 3211484: Support enumerations in notification varbinds
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20177 06827809-a52a-0410-b366-d66718629ded
+
+commit 342ca9db5371cbad7fa96af32aced750c2d77db1
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Thu Apr 14 20:44:37 2011 +0000
+
+    CHANGES: mib2c: PATCHES: 3211484: Support enumerations in notification varbinds
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20177 06827809-a52a-0410-b366-d66718629ded
+
+commit c6a71eaebef6c831daa36f57ec1ff230f052b330
+Author: Dave Shield <dts12@users.sourceforge.net>
+Date:   Thu Apr 14 20:44:37 2011 +0000
+
+    CHANGES: mib2c: PATCHES: 3211484: Support enumerations in notification varbinds
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20177 06827809-a52a-0410-b366-d66718629ded
+
+commit f08a1998071b6d4f4ec8d9f5fbf8aefe5629ce7a
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Tue Apr 12 20:01:55 2011 +0000
+
+    Add missing system oids to mib
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20176 06827809-a52a-0410-b366-d66718629ded
+
+commit 3331e09bbec734034dbdb767e66c03e14a4548d5
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Tue Apr 12 20:01:55 2011 +0000
+
+    Add missing system oids to mib
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20176 06827809-a52a-0410-b366-d66718629ded
+
+commit dd889d56abc4a6a2b76b1f7489ea55b0467be184
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Tue Apr 12 20:01:55 2011 +0000
+
+    Add missing system oids to mib
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20176 06827809-a52a-0410-b366-d66718629ded
+
+commit d9477251d154fbb526f53367b0b6ebcd1d2674ac
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Tue Apr 12 19:53:10 2011 +0000
+
+    Fix for garbage output when agent presents more columns in bulk
+    response than our local MIB file  specified.
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20175 06827809-a52a-0410-b366-d66718629ded
+
+commit 79c698a1474e10855f210a6998708096712be608
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Tue Apr 12 19:53:10 2011 +0000
+
+    Fix for garbage output when agent presents more columns in bulk
+    response than our local MIB file  specified.
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20175 06827809-a52a-0410-b366-d66718629ded
+
+commit f394a266604af9f3e1b53ef6da375baa4a3901fe
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Tue Apr 12 19:53:10 2011 +0000
+
+    Fix for garbage output when agent presents more columns in bulk
+    response than our local MIB file  specified.
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20175 06827809-a52a-0410-b366-d66718629ded
+
+commit 007e76d6dc38acdfab756fe9bd8e23d82095b4c6
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Tue Apr 12 19:50:08 2011 +0000
+
+    Fix wrong name for config token 'doNotRetainNotificationLogs'
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-3-patches@20174 06827809-a52a-0410-b366-d66718629ded
+
+commit f1edcfd049b760bc50104cfe82838ed2b3632861
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Tue Apr 12 19:50:08 2011 +0000
+
+    Fix wrong name for config token 'doNotRetainNotificationLogs'
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-4-patches@20174 06827809-a52a-0410-b366-d66718629ded
+
+commit af50924069a88b5badc084065e21b691f31f313d
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Tue Apr 12 19:50:08 2011 +0000
+
+    Fix wrong name for config token 'doNotRetainNotificationLogs'
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20174 06827809-a52a-0410-b366-d66718629ded
+
+commit 2fb0b89c2323db309b162d60a943c1e3a0a17d07
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Sat Apr 9 21:59:11 2011 +0000
+
+    Remove bogus (Linux) defines
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20173 06827809-a52a-0410-b366-d66718629ded
+
+commit c3dbbd9fc57acbca999356cdf9be958cc11735ef
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Sat Apr 9 21:56:33 2011 +0000
+
+    HAVE_TM_TM_GMTOFF is HAVE_STRUCT_TM_TM_GMTOFF
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20172 06827809-a52a-0410-b366-d66718629ded
+
+commit b1cd21a4d71c17c122134ac3284917f65363e4d2
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Sat Apr 9 20:04:29 2011 +0000
+
+    Solaris support for SCTP-MIB
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20170 06827809-a52a-0410-b366-d66718629ded
+
+commit c6659c94ad9ba8060dde18942761ce85d1a5cc19
+Author: Niels Baggesen <nba@users.sourceforge.net>
+Date:   Sat Apr 9 19:50:30 2011 +0000
+
+    TZ is one hour off if HAVE_TM_TM_GMTOFF and SYSV (such is Linux)
+    
+    
+    git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/branches/V5-5-patches@20169 06827809-a52a-0410-b366-d66718629ded
+
+----------------------------------------------------------------------
+
+Changes: V5.5 -> V5.5.1
+
+2011-03-18 11:15  dts12
 
    *  agent/Makefile.depend, agent/helpers/Makefile.depend,   
-      agent/mibgroup/Makefile.depend, apps/Makefile.depend,   
-      apps/snmpnetstat/Makefile.depend, snmplib/Makefile.depend:
+      agent/mibgroup/Makefile.depend, apps/snmpnetstat/Makefile.depend, 
+        snmplib/Makefile.depend:
 
    make depend
 
-2011-06-01 15:42  dts12
+2011-03-18 10:36  dts12
 
-   * perl/SNMP/SNMP.xs:
-
-   Reinstate an "unused" label that is actually still required.
-   (referenced in line 2710)
-
-2011-06-01 15:32  dts12
-
-   * agent/mibgroup/ucd-snmp/disk.c:
-
-   Fix typo
-
-2011-06-01 15:08  dts12
-
-   *  man/netsnmp_agent.3, man/netsnmp_agent_registry.3,   
+   *  man/netsnmp_access_multiplexer.3, man/netsnmp_agent.3,   
+      man/netsnmp_agent_handler.h.3, man/netsnmp_agent_registry.3,   
       man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
       man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
       man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
-      man/netsnmp_container.3, man/netsnmp_data_list.3,   
+      man/netsnmp_container.3, man/netsnmp_container_iterator.3,   
+      man/netsnmp_container_iterator.h.3, man/netsnmp_data_list.3,   
       man/netsnmp_debug.3, man/netsnmp_default_store.3,   
       man/netsnmp_handler.3, man/netsnmp_instance.3,   
       man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
@@ -141,437 +4792,52 @@
       man/netsnmp_netsnmp_mib_handler_access_methods.3,   
       man/netsnmp_netsnmp_mib_handler_methods.3,   
       man/netsnmp_netsnmp_mib_handler_s.3,   
+      man/netsnmp_netsnmp_monitor_callback_header_s.3,   
       man/netsnmp_netsnmp_request_info_s.3,   
       man/netsnmp_netsnmp_table_registration_info_s.3,   
       man/netsnmp_netsnmp_table_request_info_s.3,   
-      man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,   
-      man/netsnmp_read_config.3, man/netsnmp_read_only.3,   
-      man/netsnmp_row_merge.3, man/netsnmp_scalar.3,   
-      man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,   
-      man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,   
-      man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,   
-      man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,   
-      man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,   
-      man/netsnmp_table.3, man/netsnmp_table_array.3,   
-      man/netsnmp_table_container.3, man/netsnmp_table_data.3,   
-      man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,   
-      man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,   
-      man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,  
-       man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
-      man/netsnmp_util.3, man/netsnmp_utilities.3,   
-      man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
+      man/netsnmp_null_container.3, man/netsnmp_oid_stash.3,   
+      man/netsnmp_old_api.3, man/netsnmp_read_config.3,   
+      man/netsnmp_read_only.3, man/netsnmp_row_merge.3,   
+      man/netsnmp_scalar.3, man/netsnmp_scalar_group_group.3,   
+      man/netsnmp_serialize.3, man/netsnmp_snmp_agent.3,   
+      man/netsnmp_snmp_alarm.3, man/netsnmp_snmp_client.3,   
+      man/netsnmp_snmp_logging.3, man/netsnmp_snmp_pdu.3,   
+      man/netsnmp_snmp_session.3, man/netsnmp_stash_cache.3,   
+      man/netsnmp_stash_to_next.3, man/netsnmp_table.3,   
+      man/netsnmp_table_array.3, man/netsnmp_table_container.3,   
+      man/netsnmp_table_data.3, man/netsnmp_table_dataset.3,   
+      man/netsnmp_table_generic.3, man/netsnmp_table_indexes.3,   
+      man/netsnmp_table_iterator.3, man/netsnmp_table_iterator.h.3,   
+      man/netsnmp_table_maintenance.3, man/netsnmp_table_row.3,   
+      man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
+      man/netsnmp_tools.h.3, man/netsnmp_util.3,   
+      man/netsnmp_utilities.3, man/netsnmp_variable_list.3,   
+      man/netsnmp_watcher.3:
 
    documentation update
 
-2011-06-01 14:51  dts12
+2011-03-18 10:32  dts12
 
-   *  FAQ, README, configure, configure.in, dist/net-snmp.spec,   
-      snmplib/snmp_version.c:
+   *  FAQ, README, configure, configure.ac, dist/Makefile,   
+      dist/net-snmp.spec:
 
    Version number update
 
-2011-05-31 22:49  hardaker
+2011-03-13 20:09  dts12
 
-   * agent/mibgroup/agent/extend.c, agent/mibgroup/ucd-snmp/disk.c:
+   * include/net-snmp/library/large_fd_set.h, snmplib/large_fd_set.c:
 
-   CHANGES: snmpd: PATCH 3066862: from fhew: fix the agent for
-   comparing unsigned large indexes of the disk and extend tables.
+   Bring the naming of the large_fd_set select call into
+   line with the rest of the API.
 
-2011-05-31 12:30  jsafranek
+2011-03-13 20:06  dts12
 
-   * agent/mibgroup/host/hr_swrun.c:
+   * include/net-snmp/library/large_fd_set.h, snmplib/large_fd_set.c:
 
-   CHANGES: snmpd: fixed hrSWRunPath of swapped-out processes on
-   Linux.
-   
-   fgets() returns NULL both when /proc/PID/cmdline is empty (=
-   swapped out) and when the process exited after fopen(), so check
-   /proc/PID/status in both cases.
-
-2011-05-26 16:12  hardaker
-
-   * snmplib/snmp_api.c:
-
-   CHANGES: snmpd: patch 3299384: fix INFORMs so they retry probing
-   for an engineID.
-
-2011-05-26 16:06  hardaker
-
-   * snmplib/snmp_api.c:
-
-   Applied (roughly) patch 3299370 to avoid rewriting existing
-   authkey/privkey/etcs
-
-2011-05-25 09:21  bvassche
-
-   * agent/mibgroup/tunnel/tunnel.c:
-
-   CHANGES: snmpd: Use proper format specifier in debug statements
-   for printing values of type 'oid'.
-
-2011-05-24 12:51  jsafranek
-
-   * agent/mibgroup/ip-mib/data_access/arp_common.c:
-
-   Added NULL-checks after malloc
-
-2011-05-22 19:34  dts12
-
-   * agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c:
-
-   CHANGES: agent: BUG: 3305157: Fix ipAddressPrefix handling of
-   IPv6 addresses
-
-2011-05-22 19:07  dts12
-
-   * python/netsnmp/client_intf.c:
-
-   CHANGES: python: BUG: 3295407: Fix handling of void pointer
-
-2011-05-22 18:57  dts12
-
-   * include/net-snmp/library/snmp_api.h, snmplib/snmp_api.c:
-
-   CHANGES: snmplib: BUG: 3264852: Recognise missing report types
-   (snmp{Unavailable,Unknown}Contexts,snmpUnknownPDUHandlers)
-
-2011-05-20 15:41  dts12
-
-   *  snmplib/snmpAAL5PVCDomain.c, snmplib/snmpIPXDomain.c,   
-      snmplib/snmpSTDDomain.c, snmplib/snmpTCPDomain.c,   
-      snmplib/snmpTCPIPv6Domain.c, snmplib/snmpUDPDomain.c,   
-      snmplib/snmpUDPIPv6Domain.c, snmplib/snmpUnixDomain.c:
-
-   CHANGES: snmplib: BUG: 3234754: Ensure old f_create_from_tstring
-   hook is initialized to NULL
-
-2011-05-19 19:46  hardaker
-
-   * acconfig.h, include/net-snmp/net-snmp-config.h.in:
-
-   use #ifdef rather than #if for define checks.
-
-2011-05-19 17:19  dts12
-
-   * man/snmp_api.3.def, man/snmp_sess_api.3.def:
-
-   CHANGES: man: BUG: 3190725: Document snmp{,_sess}synch_response
-   and snmp_async_send
-
-2011-05-12 09:03  bvassche
-
-   * snmplib/snmp_api.c:
-
-   CHANGES: snmplib: Fixed a memory leak in snmp_free_session().
-
-2011-05-12 08:12  bvassche
-
-   * agent/mibgroup/mibII/at.c:
-
-   CHANGES: Win32: Fixed a memory leak in the Net-SNMP
-   (non-winExtDLL) implementation of the MIB-II ipNetToMediaTable.
-
-2011-05-12 08:08  bvassche
-
-   * agent/mibgroup/mibII/interfaces.c:
-
-   CHANGES: Win32: Fixed a memory leak in the Net-SNMP
-   (non-winExtDLL) implementation of the MIB-II ifTable.
-
-2011-05-12 07:33  bvassche
-
-   * agent/mibgroup/mibII/ipAddr.c:
-
-   CHANGES: Win32: Fixed a memory leak in the Net-SNMP
-   (non-winExtDLL) implementation of the MIB-II ipAddrTable.
-
-2011-05-12 06:54  bvassche
-
-   * ChangeLog:
-
-   Documentation / source code comment spelling fix: exitent ->
-   existent.
-
-2011-05-10 15:02  bvassche
-
-   * snmplib/winservice.c:
-
-   MinGW: avoid that gcc complains about pasing a (char *) argument
-   while (unsigned char *) is expected.
-
-2011-05-09 20:52  nba
-
-   * agent/mibgroup/if-mib/data_access/interface_ioctl.c:
-
-   Use symbolic named for ifType values
-
-2011-05-08 20:01  nba
-
-   *  agent/mibgroup/disman/ping/pingCtlTable.c,   
-      agent/mibgroup/disman/ping/pingCtlTable.h,   
-      agent/mibgroup/disman/ping/pingProbeHistoryTable.c,   
-      agent/mibgroup/disman/ping/pingResultsTable.c,   
-      agent/mibgroup/disman/traceroute/traceRouteCtlTable.c,   
-      agent/mibgroup/disman/traceroute/traceRouteCtlTable.h,   
-      agent/mibgroup/disman/traceroute/traceRouteHopsTable.c,   
-      agent/mibgroup/disman/traceroute/traceRouteProbeHistoryTable.c,   
-      agent/mibgroup/disman/traceroute/traceRouteResultsTable.c:
-
-   Fix warnings and data format for DateAndTime objects.
-   These modules work, but:
-   - They are Linux only
-   - Rows must be created with rowStatus createAndWait before they
-   are populated
-   - Agent must run as root
-   - Agent is blocked while tests run
-   - Data format for InetAddress objects is wrong. It is ASCII, not
-   binary
-   (making it easier to use from the command line, but ...)
-
-2011-05-07 15:22  bvassche
-
-   * perl/SNMP/SNMP.xs:
-
-   Removed an unused label from perl/SNMP/SNMP.xs.
-
-2011-05-06 21:32  hardaker
-
-   *  agent/mibgroup/disman/ping/pingCtlTable.c,   
-      agent/mibgroup/disman/ping/pingCtlTable.h,   
-      agent/mibgroup/disman/traceroute/traceRouteCtlTable.c,   
-      agent/mibgroup/disman/traceroute/traceRouteCtlTable.h:
-
-   NEWS: PATCH 3198781: from fenner: Get disman/ping and
-   disman/traceroute to at least compile
-
-2011-05-06 17:46  dts12
-
-   * CHANGES:
-
-   version update
-
-2011-05-06 17:37  dts12
-
-   * ChangeLog:
-
-   version update
-
-2011-05-06 17:35  dts12
-
-   * agent/mibgroup/Makefile.depend:
-
-   make depend
-
-2011-05-06 17:22  dts12
-
-   *  man/netsnmp_agent.3, man/netsnmp_agent_registry.3,   
-      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
-      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
-      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
-      man/netsnmp_container.3, man/netsnmp_data_list.3,   
-      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
-      man/netsnmp_handler.3, man/netsnmp_instance.3,   
-      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
-      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
-      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
-      man/netsnmp_multiplexer.3,   
-      man/netsnmp_netsnmp_agent_request_info_s.3,   
-      man/netsnmp_netsnmp_column_info_t.3,   
-      man/netsnmp_netsnmp_data_list_s.3,   
-      man/netsnmp_netsnmp_handler_registration_s.3,   
-      man/netsnmp_netsnmp_iterator_info_s.3,   
-      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_s.3,   
-      man/netsnmp_netsnmp_request_info_s.3,   
-      man/netsnmp_netsnmp_table_registration_info_s.3,   
-      man/netsnmp_netsnmp_table_request_info_s.3,   
-      man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,   
-      man/netsnmp_read_config.3, man/netsnmp_read_only.3,   
-      man/netsnmp_row_merge.3, man/netsnmp_scalar.3,   
-      man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,   
-      man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,   
-      man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,   
-      man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,   
-      man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,   
-      man/netsnmp_table.3, man/netsnmp_table_array.3,   
-      man/netsnmp_table_container.3, man/netsnmp_table_data.3,   
-      man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,   
-      man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,   
-      man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,  
-       man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
-      man/netsnmp_util.3, man/netsnmp_utilities.3,   
-      man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
-
-   documentation update
-
-2011-05-06 17:17  dts12
-
-   *  FAQ, README, configure, configure.in, dist/net-snmp.spec,   
-      snmplib/snmp_version.c:
-
-   Version number update
-
-2011-05-06 13:50  dts12
-
-   * win32/dist/installer/net-snmp.nsi:
-
-   Fix incomplete uninstall configuration:
-   - broken removal of Microsoft DLL
-   - remove assorted new MIBs and header files
-
-2011-05-05 06:07  bvassche
-
-   * snmplib/tools.c, testing/TESTCONF.sh:
-
-   CHANGES: MinGW: Made regression test output independent of the
-   Net-SNMP variables defined in the Windows registry. Some tests
-   that failed previously after the Net-SNMP binaries (MSVC build)
-   had been installed do now pass.
-
-2011-05-03 15:29  bvassche
-
-   * snmplib/winservice.c:
-
-   CHANGES: Win32: PATCH: 3293842: Eliminate registry argument limit
-   of 127 characters (this limitation was reported by Sylvain Dery).
-
-2011-05-02 11:22  bvassche
-
-   *  win32/net-snmp/net-snmp-config.h,   
-      win32/net-snmp/net-snmp-config.h.in:
-
-   CHANGES: Win32: header file <net-snmp/net-snmp-config.h> can now
-   be used in the MinGW environment.
-
-2011-04-29 11:17  bvassche
-
-   * snmplib/winservice.c:
-
-   Spelling and grammar fixes for the source code comments in
-   snmplib/winservice.c.
-
-2011-04-27 21:16  hardaker
-
-   * agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c:
-
-   Don't free the ifXTable row found on load failure as we don't own
-   it
-
-2011-04-15 13:42  dts12
-
-   * snmplib/snmp_api.c:
-
-   CHANGES: snmplib: PATCHES: 3183000: Fix calculation of common OID
-   prefix length
-   CHANGES: snmplib: BUGS: 3182985: Fix calculation of common OID
-   prefix length
-
-2011-04-14 21:31  dts12
-
-   * python/netsnmp/client_intf.c:
-
-   CHANGES: python: PATCHES: 3185085: Fix segfault on 64-bit systems
-
-2011-04-14 21:10  dts12
-
-   * local/mib2c:
-
-   CHANGES: mib2c: PATCHES: 3175323: Fix handling of 'while (false)'
-   blocks
-
-2011-04-14 20:52  dts12
-
-   * local/mib2c:
-
-   CHANGES: mib2c: PATCHES: 3204883: Fix handling of non-table
-   objects named fooTable
-
-2011-04-14 20:44  dts12
-
-   * local/mib2c:
-
-   CHANGES: mib2c: PATCHES: 3211484: Support enumerations in
-   notification varbinds
-
-2011-04-12 20:01  nba
-
-   * mibs/UCD-SNMP-MIB.txt:
-
-   Add missing system oids to mib
-
-2011-04-12 19:53  nba
-
-   * apps/snmptable.c:
-
-   Fix for garbage output when agent presents more columns in bulk
-   response than our local MIB file specified.
-
-2011-04-12 19:50  nba
-
-   * man/snmptrapd.8.def:
-
-   Fix wrong name for config token 'doNotRetainNotificationLogs'
-
-2011-03-15 12:37  dts12
-
-   * CHANGES, NEWS:
-
-   version update
-
-2011-03-15 10:57  dts12
-
-   * ChangeLog:
-
-   version update
-
-2011-03-15 10:56  dts12
-
-   *  agent/Makefile.depend, agent/helpers/Makefile.depend,   
-      agent/mibgroup/Makefile.depend, apps/Makefile.depend,   
-      apps/snmpnetstat/Makefile.depend, snmplib/Makefile.depend:
-
-   make depend
-
-2011-03-15 10:42  dts12
-
-   *  FAQ, README, configure, configure.in, dist/net-snmp.spec,   
-      perl/ASN/ASN.pm, perl/AnyData_SNMP/Storage.pm, perl/OID/OID.pm,   
-      perl/SNMP/SNMP.pm, perl/TrapReceiver/TrapReceiver.pm,   
-      perl/agent/Support/Support.pm, perl/agent/agent.pm,   
-      perl/agent/default_store/default_store.pm,   
-      perl/default_store/default_store.pm, snmplib/snmp_version.c:
-
-   Version number update
-
-2011-03-15 10:41  dts12
-
-   * Makefile.top:
-
-   version update
-
-2011-03-12 06:59  rstory
-
-   * snmplib/container_binary_array.c:
-
-   CHANGES: snmplib: realloc+init instead of calloc
-   
-   inspired by patch 3195532 from Stephen Hemminger
-
-2011-03-12 05:47  rstory
-
-   *  agent/mibgroup/ip-forward-mib/data_access/route_common.c,   
-      agent/mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable_interface.c,
-        
-      agent/mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable_interface.c,
-         include/net-snmp/library/container_binary_array.h:
-
-   CHANGES: snmpd: PATCH: optimizations for large route tables from
-   Stephen Hemminger
-   
-   applied parts 1-3 of 4 from him (msgs to coders on 2/28/11;
-   subject
-   ip-forward-mib performance improvements; part 4 needs more work
+   CHANGES: snmplib: PATCH: 3203806: Add the function
+   netsnmp_large_select()
+   (plus tweaks to netsnmp_large_fd_set_resize)
 
 2011-03-11 11:11  jsafranek
 
@@ -606,6 +4872,84 @@
    command is now wrong for *all* branches, rather
    than just most of them!)
 
+2011-02-25 11:49  dts12
+
+   *  man/netsnmp_access_multiplexer.3, man/netsnmp_agent.3,   
+      man/netsnmp_agent_handler.h.3, man/netsnmp_agent_registry.3,   
+      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
+      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
+      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
+      man/netsnmp_container.3, man/netsnmp_container_iterator.3,   
+      man/netsnmp_container_iterator.h.3, man/netsnmp_data_list.3,   
+      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
+      man/netsnmp_handler.3, man/netsnmp_instance.3,   
+      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
+      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
+      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
+      man/netsnmp_multiplexer.3,   
+      man/netsnmp_netsnmp_agent_request_info_s.3,   
+      man/netsnmp_netsnmp_column_info_t.3,   
+      man/netsnmp_netsnmp_data_list_s.3,   
+      man/netsnmp_netsnmp_handler_registration_s.3,   
+      man/netsnmp_netsnmp_iterator_info_s.3,   
+      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_s.3,   
+      man/netsnmp_netsnmp_monitor_callback_header_s.3,   
+      man/netsnmp_netsnmp_request_info_s.3,   
+      man/netsnmp_netsnmp_table_registration_info_s.3,   
+      man/netsnmp_netsnmp_table_request_info_s.3,   
+      man/netsnmp_null_container.3, man/netsnmp_oid_stash.3,   
+      man/netsnmp_old_api.3, man/netsnmp_read_config.3,   
+      man/netsnmp_read_only.3, man/netsnmp_row_merge.3,   
+      man/netsnmp_scalar.3, man/netsnmp_scalar_group_group.3,   
+      man/netsnmp_serialize.3, man/netsnmp_snmp_agent.3,   
+      man/netsnmp_snmp_alarm.3, man/netsnmp_snmp_client.3,   
+      man/netsnmp_snmp_logging.3, man/netsnmp_snmp_pdu.3,   
+      man/netsnmp_snmp_session.3, man/netsnmp_stash_cache.3,   
+      man/netsnmp_stash_to_next.3, man/netsnmp_table.3,   
+      man/netsnmp_table_array.3, man/netsnmp_table_container.3,   
+      man/netsnmp_table_data.3, man/netsnmp_table_dataset.3,   
+      man/netsnmp_table_generic.3, man/netsnmp_table_indexes.3,   
+      man/netsnmp_table_iterator.3, man/netsnmp_table_iterator.h.3,   
+      man/netsnmp_table_maintenance.3, man/netsnmp_table_row.3,   
+      man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
+      man/netsnmp_tools.h.3, man/netsnmp_util.3,   
+      man/netsnmp_utilities.3, man/netsnmp_variable_list.3,   
+      man/netsnmp_watcher.3:
+
+   documentation update
+
+2011-02-25 11:41  dts12
+
+   *  FAQ, README, configure, configure.ac, dist/Makefile,   
+      dist/net-snmp.spec, perl/ASN/ASN.pm,   
+      perl/AnyData_SNMP/Storage.pm, perl/OID/OID.pm, perl/SNMP/SNMP.pm, 
+        perl/TrapReceiver/TrapReceiver.pm,
+      perl/agent/Support/Support.pm,    perl/agent/agent.pm,
+      perl/agent/default_store/default_store.pm,   
+      perl/default_store/default_store.pm:
+
+   Version number update
+
+2011-02-25 11:39  dts12
+
+   * ChangeLog:
+
+   version update
+
+2011-02-25 11:15  dts12
+
+   *  FAQ, README, configure, configure.ac, dist/Makefile,   
+      dist/net-snmp.spec, perl/ASN/ASN.pm,   
+      perl/AnyData_SNMP/Storage.pm, perl/OID/OID.pm, perl/SNMP/SNMP.pm, 
+        perl/TrapReceiver/TrapReceiver.pm,
+      perl/agent/Support/Support.pm,    perl/agent/agent.pm,
+      perl/agent/default_store/default_store.pm,   
+      perl/default_store/default_store.pm:
+
+   Version number update
+
 2011-02-25 11:10  dts12
 
    * snmplib/snmpv3.c:
@@ -616,8 +4960,7 @@
 
    * apps/snmptable.c:
 
-   Fix bug 3118631: snmptable segfaults if index contains :
-   character
+   Fix bug 3118631: snmptable segfaults if index contains : character
 
 2011-02-23 09:30  nba
 
@@ -625,11 +4968,78 @@
 
    FreeBSD 8 support
 
-2011-02-21 19:08  hardaker
+2011-02-22 15:25  dts12
 
-   * dist/makerelease.xml:
+   * agent/mibgroup/host/hr_swinst.c:
 
-   Updated comment about where makerelease comes from (now github)
+   Revert a bogus change that crept into the code.
+
+2011-02-22 08:55  dts12
+
+   * {everything}:
+
+   Fix 5.5.x branch structure
+
+2011-02-21 13:44  dts12
+
+   * configure:
+
+   Version number update
+
+2011-02-21 13:24  dts12
+
+   *  man/netsnmp_access_multiplexer.3, man/netsnmp_agent.3,   
+      man/netsnmp_agent_handler.h.3, man/netsnmp_agent_registry.3,   
+      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
+      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
+      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
+      man/netsnmp_container.3, man/netsnmp_container_iterator.3,   
+      man/netsnmp_container_iterator.h.3, man/netsnmp_data_list.3,   
+      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
+      man/netsnmp_handler.3, man/netsnmp_instance.3,   
+      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
+      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
+      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
+      man/netsnmp_multiplexer.3,   
+      man/netsnmp_netsnmp_agent_request_info_s.3,   
+      man/netsnmp_netsnmp_column_info_t.3,   
+      man/netsnmp_netsnmp_data_list_s.3,   
+      man/netsnmp_netsnmp_handler_registration_s.3,   
+      man/netsnmp_netsnmp_iterator_info_s.3,   
+      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_s.3,   
+      man/netsnmp_netsnmp_monitor_callback_header_s.3,   
+      man/netsnmp_netsnmp_request_info_s.3,   
+      man/netsnmp_netsnmp_table_registration_info_s.3,   
+      man/netsnmp_netsnmp_table_request_info_s.3,   
+      man/netsnmp_null_container.3, man/netsnmp_oid_stash.3,   
+      man/netsnmp_old_api.3, man/netsnmp_read_config.3,   
+      man/netsnmp_read_only.3, man/netsnmp_row_merge.3,   
+      man/netsnmp_scalar.3, man/netsnmp_scalar_group_group.3,   
+      man/netsnmp_serialize.3, man/netsnmp_snmp_agent.3,   
+      man/netsnmp_snmp_alarm.3, man/netsnmp_snmp_client.3,   
+      man/netsnmp_snmp_logging.3, man/netsnmp_snmp_pdu.3,   
+      man/netsnmp_snmp_session.3, man/netsnmp_stash_cache.3,   
+      man/netsnmp_stash_to_next.3, man/netsnmp_table.3,   
+      man/netsnmp_table_array.3, man/netsnmp_table_container.3,   
+      man/netsnmp_table_data.3, man/netsnmp_table_dataset.3,   
+      man/netsnmp_table_generic.3, man/netsnmp_table_indexes.3,   
+      man/netsnmp_table_iterator.3, man/netsnmp_table_iterator.h.3,   
+      man/netsnmp_table_maintenance.3, man/netsnmp_table_row.3,   
+      man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
+      man/netsnmp_tools.h.3, man/netsnmp_util.3,   
+      man/netsnmp_utilities.3, man/netsnmp_variable_list.3,   
+      man/netsnmp_watcher.3:
+
+   documentation update
+
+2011-02-21 13:17  dts12
+
+   *  FAQ, README, agent/mibgroup/host/hr_swinst.c, configure,   
+      configure.ac, dist/Makefile, dist/net-snmp.spec:
+
+   Version number update
 
 2011-02-21 11:14  bvassche
 
@@ -689,6 +5099,12 @@
 
    rerun autoheader/autoconf
 
+2011-02-15 21:26  nba
+
+   * m4/netsnmp_search_libs.m4:
+
+   Too much quoting is bad
+
 2011-02-15 21:11  nba
 
    *  agent/mibgroup/mibII.h, agent/mibgroup/mibII/ipv6.c,   
@@ -710,6 +5126,25 @@
 
    Filter IPv6 entries from IPv4 table
 
+2011-02-15 20:42  nba
+
+   *  agent/mibgroup/host/data_access/swrun.h,   
+      agent/mibgroup/host/data_access/swrun_kinfo.c:
+
+   Proper use of getproc2 and dragonfly support
+
+2011-02-15 20:41  nba
+
+   * agent/mibgroup/hardware/fsys/fsys_getfsstats.c:
+
+   getvfsstat is only for NetBSD
+
+2011-02-15 20:39  nba
+
+   * configure.d/config_os_libs1, configure.d/config_os_libs2:
+
+   Detect need for -lkvm in proper time
+
 2011-02-14 14:38  bvassche
 
    * agent/snmpd.c:
@@ -811,6 +5246,12 @@
    CHANGES: snmpd: BUG: 3151897: fd leak w/ /proc/partitions
    read in diskio
 
+2011-01-29 23:36  tanders
+
+   * agent/mibgroup/host/hr_system.c:
+
+   NEWS: snmpd: BUG: 3166568: hrSystemProcesses missing in 5.6/5.6.1
+
 2011-01-27 09:35  dts12
 
    * include/net-snmp/library/snmp_api.h, snmplib/snmp_api.c:
@@ -836,12 +5277,43 @@
    fgets() from it. snmpd should continue with other processes and
    not to stop.
 
+2011-01-19 13:57  jsafranek
+
+   * configure.d/config_os_libs1:
+
+   Make us compatible with rpm-4.9, rpmGetFilesystemList does not
+   exist anymore, so the configure script should not check it.
+
+2011-01-19 06:31  nba
+
+   * configure.d/config_os_libs1:
+
+   diskIOLAx requires exp which may require -lm
+
 2011-01-19 06:20  nba
 
    * acconfig.h:
 
    Define DRAGONFLYID
 
+2011-01-18 22:01  nba
+
+   * agent/mibgroup/host/hr_swrun.c:
+
+   typo
+
+2011-01-18 21:56  nba
+
+   * configure.d/config_os_libs1:
+
+   Check for -lkinfo
+
+2011-01-18 21:54  nba
+
+   * agent/mibgroup/if-mib/data_access/interface.h:
+
+   Find proper if-mib interface for NetBSD
+
 2011-01-14 12:28  jsafranek
 
    * agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c:
@@ -860,6 +5332,22 @@
    [1]:
    http://sourceforge.net/mailarchive/forum.php?thread_name=20060920134935.35b36ed6%40dev.futz.org&forum_name=net-snmp-coders
 
+2011-01-14 08:39  bvassche
+
+   *  configure, configure.d/config_os_progs, net-snmp-config.in,   
+      snmplib/Makefile.in:
+
+   CHANGES: Cygwin: libnetsnmp does now build as a DLL when
+   configured with --enable-shared.
+   CHANGES: Cygwin: perl modules do now build (--with-perl-modules).
+   (Backported r18825 from the trunk.)
+
+2011-01-14 08:22  bvassche
+
+   * include/net-snmp/net-snmp-config.h.in:
+
+   Regenerated with autoreconf -iv.
+
 2011-01-14 06:25  rstory
 
    * agent/mibgroup/agentx/protocol.c:
@@ -873,15 +5361,101 @@
    Ensure releases are installed to the correct path within the
    /tags SVN tree
 
+2011-01-13 15:45  dts12
+
+   * CHANGES, NEWS:
+
+   version update
+
+2011-01-13 15:33  dts12
+
+   * ChangeLog:
+
+   version update
+
+2011-01-13 15:26  dts12
+
+   * agent/mibgroup/Makefile.depend, snmplib/Makefile.depend:
+
+   make depend
+
 2011-01-13 15:15  dts12
 
    * agent/mibgroup/mibII/kernel_netbsd.c:
 
    Remove C++ comments
 
+2011-01-13 14:55  dts12
+
+   *  man/netsnmp_access_multiplexer.3, man/netsnmp_agent.3,   
+      man/netsnmp_agent_handler.h.3, man/netsnmp_agent_registry.3,   
+      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
+      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
+      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
+      man/netsnmp_container.3, man/netsnmp_container_iterator.3,   
+      man/netsnmp_container_iterator.h.3, man/netsnmp_data_list.3,   
+      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
+      man/netsnmp_handler.3, man/netsnmp_instance.3,   
+      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
+      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
+      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
+      man/netsnmp_multiplexer.3,   
+      man/netsnmp_netsnmp_agent_request_info_s.3,   
+      man/netsnmp_netsnmp_column_info_t.3,   
+      man/netsnmp_netsnmp_data_list_s.3,   
+      man/netsnmp_netsnmp_handler_registration_s.3,   
+      man/netsnmp_netsnmp_iterator_info_s.3,   
+      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_s.3,   
+      man/netsnmp_netsnmp_monitor_callback_header_s.3,   
+      man/netsnmp_netsnmp_request_info_s.3,   
+      man/netsnmp_netsnmp_table_registration_info_s.3,   
+      man/netsnmp_netsnmp_table_request_info_s.3,   
+      man/netsnmp_null_container.3, man/netsnmp_oid_stash.3,   
+      man/netsnmp_old_api.3, man/netsnmp_read_config.3,   
+      man/netsnmp_read_only.3, man/netsnmp_row_merge.3,   
+      man/netsnmp_scalar.3, man/netsnmp_scalar_group_group.3,   
+      man/netsnmp_serialize.3, man/netsnmp_snmp_agent.3,   
+      man/netsnmp_snmp_alarm.3, man/netsnmp_snmp_client.3,   
+      man/netsnmp_snmp_logging.3, man/netsnmp_snmp_pdu.3,   
+      man/netsnmp_snmp_session.3, man/netsnmp_stash_cache.3,   
+      man/netsnmp_stash_to_next.3, man/netsnmp_table.3,   
+      man/netsnmp_table_array.3, man/netsnmp_table_container.3,   
+      man/netsnmp_table_data.3, man/netsnmp_table_dataset.3,   
+      man/netsnmp_table_generic.3, man/netsnmp_table_indexes.3,   
+      man/netsnmp_table_iterator.3, man/netsnmp_table_iterator.h.3,   
+      man/netsnmp_table_maintenance.3, man/netsnmp_table_row.3,   
+      man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
+      man/netsnmp_tools.h.3, man/netsnmp_util.3,   
+      man/netsnmp_utilities.3, man/netsnmp_variable_list.3,   
+      man/netsnmp_watcher.3:
+
+   documentation update
+
+2011-01-13 14:42  dts12
+
+   * configure:
+
+   Version number update
+
+2011-01-13 14:41  dts12
+
+   *  FAQ, README, configure, configure.ac, dist/Makefile,   
+      dist/net-snmp.spec:
+
+   Version number update
+
+2011-01-13 13:17  dts12
+
+   * agent/auto_nlist.c:
+
+   Fix broken patch
+
 2011-01-13 12:14  dts12
 
-   * configure, configure.in:
+   *  configure, configure.d/config_os_functions,   
+      configure.d/config_os_headers:
 
    Configure fixes for DragonFly support
 
@@ -929,7 +5503,8 @@
 
 2011-01-12 14:37  rstory
 
-   *  agent/mibgroup/if-mib/ifTable/ifTable.c,   
+   *  agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable.c,   
+      agent/mibgroup/if-mib/ifTable/ifTable.c,   
       agent/mibgroup/if-mib/ifXTable/ifXTable.c,   
       agent/mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable.c,
         
@@ -939,10 +5514,14 @@
       
       agent/mibgroup/ip-mib/ipAddressPrefixTable/ipAddressPrefixTable.c,
          agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c,   
+      agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable.c,
+         agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable.c,   
       agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c,   
       agent/mibgroup/ip-mib/ipv4InterfaceTable/ipv4InterfaceTable.c,   
       agent/mibgroup/ip-mib/ipv6InterfaceTable/ipv6InterfaceTable.c,   
-      agent/mibgroup/notification-log-mib/notification_log.c,   
+      agent/mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable.c,
+         agent/mibgroup/notification-log-mib/notification_log.c,   
+      agent/mibgroup/rmon-mib/etherStatsTable/etherStatsTable.c,   
       agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable.c,
          agent/mibgroup/udp-mib/udpEndpointTable/udpEndpointTable.c:
 
@@ -988,12 +5567,12 @@
       agent/mibgroup/ucd-snmp/memory_freebsd2.c,   
       agent/mibgroup/ucd-snmp/vmstat_freebsd2.c:
 
-   CHANGES: NetBSD: DragonFly support
+   NEWS: NetBSD: DragonFly support
    [From NetBSD patch archive]
 
 2011-01-11 14:36  dts12
 
-   * configure, configure.in:
+   * configure, configure.d/config_os_struct_members:
 
    NetBSD/DragonFly 'struct ifnet' requires KERNEL, but not _KERNEL
    [From NetBSD patch archive]
@@ -1021,7 +5600,7 @@
 
 2011-01-11 12:24  dts12
 
-   * configure, configure.in:
+   * configure, configure.d/config_os_headers:
 
    Additional headers when testing for IPv6 headers
    [From NetBSD patch archive]
@@ -1033,9 +5612,16 @@
    Missing type under darwin
    [From NetBSD patch archive]
 
+2011-01-11 12:10  dts12
+
+   * agent/mibgroup/ucd-snmp/diskio.c:
+
+   NetBSD support for Disk I/O stats
+   [From NetBSD patch archive]
+
 2011-01-11 12:01  dts12
 
-   *  acconfig.h, configure, configure.in,   
+   *  configure, configure.d/config_os_struct_members,   
       include/net-snmp/net-snmp-config.h.in:
 
    Handle systems with 'struct timespec ifnet.if_lastchange' (rather
@@ -1091,6 +5677,23 @@
    Fix divide-by-zero error in CPU performance statistics
    [From NetBSD patch archive]
 
+2011-01-09 22:54  dts12
+
+   *  agent/mibgroup/host/data_access/swrun_kinfo.c,   
+      agent/mibgroup/host/hr_swrun.c, configure,   
+      configure.d/config_os_libs2:
+
+   CHANGES: OpenBSD: Update SWRun code to use kvm_getproc2
+   [From OpenBSD patch archive]
+
+2011-01-09 21:30  dts12
+
+   * configure, configure.d/config_os_headers:
+
+   CHANGES: build: OpenBSD: Fix order of headers when checking
+   <netinet/in_pcb.h>
+   [From OpenBSD patch archive]
+
 2011-01-09 19:44  dts12
 
    * agent/mibgroup/hardware/cpu/cpu_sysctl.c:
@@ -1115,13 +5718,14 @@
 
    *  agent/mibgroup/hardware/cpu/cpu_nlist.c,   
       agent/mibgroup/hardware/cpu/cpu_sysctl.c,   
-      agent/mibgroup/hardware/memory/memory_netbsd.c:
+      agent/mibgroup/hardware/memory/memory_netbsd.c,   
+      agent/mibgroup/host/data_access/swrun_kinfo.c:
 
    sysctl takes a 'size_t' variable for the size parameter
 
 2011-01-08 00:47  magfr
 
-   * acconfig.h:
+   * acconfig.h, include/net-snmp/net-snmp-config.h.in:
 
    Update acconfig.h with changes from r19819.
    Rerun autoheader.
@@ -1170,6 +5774,13 @@
    Update retrieval of cache usage statistics on FreeBSD
    [From FreeBSD patch archive]
 
+2011-01-07 14:31  dts12
+
+   * agent/mibgroup/mibII/system_mib.c:
+
+   Fix handling of sysObjectID length
+   (backport of revisions 19382 & 19404)
+
 2011-01-07 14:20  dts12
 
    * include/net-snmp/net-snmp-config.h.in:
@@ -1177,6 +5788,12 @@
    Increase maximum size of execute output cache
    [From FreeBSD patch archive]
 
+2011-01-07 14:10  dts12
+
+   * agent/mibgroup/sctp-mib/sctpTables_freebsd.c:
+
+   Add missing standard Net-SNMP header files
+
 2011-01-07 14:09  dts12
 
    *  agent/mibgroup/sctp-mib/sctpAssocRemAddrTable.c,   
@@ -1277,12 +5894,12 @@
    CHANGES: snmpd: PATCHES: 2941811: Handle successful requests with
    reqID 0
 
-2011-01-05 16:31  dts12
+2011-01-06 09:38  bvassche
 
-   * apps/snmptrapd_handlers.c:
+   *  agent/mibgroup/agent/nsModuleTable.c,   
+      agent/mibgroup/agent/nsTransactionTable.c:
 
-   Use the appropriate API call for reporting config errors.
-   ("Don't be so impatient, Dave....")
+   Spelling fix: Initialzies -> Initializes.
 
 2011-01-05 14:06  dts12
 
@@ -1304,18 +5921,47 @@
 
    Copyright update for 2011
 
+2011-01-04 12:19  bvassche
+
+   * agent/mibgroup/mibII/var_route.c:
+
+   Fix compiler warnings triggered by the Win32 MIB-II
+   implementation (backported r19790 from the trunk).
+
+2011-01-04 12:17  bvassche
+
+   * agent/mibgroup/sctp-mib/sctpScalars.c:
+
+   Removed two unused variables from the sctp-mib implementation
+   (backported r19780 from the trunk).
+
+2011-01-04 12:15  bvassche
+
+   * agent/mibgroup/ip-mib/data_access/arp_linux.c:
+
+   Fixed a recently introduced mismatch between format specification
+   and argument list in the ip-mib implementation (backported r19779
+   from the trunk).
+
+2011-01-02 05:42  rstory
+
+   * agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c:
+
+   CHANGES: snmpd: skip non-AF_INET interfaces when loading ipv4
+   addrs
+
 2010-12-29 01:37  hardaker
 
    * agent/mibgroup/agentx/protocol.c:
 
-   NEWS: snmpd: Patch 3141462: from fenner: fix agentx subagent
+   CHANGES: snmpd: PATCHES: 3141462: fix agentx subagent
    issues with multiple-object requests
 
 2010-12-29 01:33  hardaker
 
    * snmplib/vacm.c:
 
-   NEWS: snmpd: Patch from Niels to fix VACM persistant storage.
+   CHANGES: snmpd: Patch from Niels to fix VACM persistant storage.
 
 2010-12-21 11:29  dts12
 
@@ -1323,6 +5969,146 @@
 
    Bring all versions of makerelease.xml into line
 
+2010-12-21 09:44  dts12
+
+   * ChangeLog:
+
+   version update
+
+2010-12-21 09:25  dts12
+
+	* man/netsnmp_access_multiplexer.3, man/netsnmp_agent.3,
+	  man/netsnmp_agent_handler.h.3, man/netsnmp_agent_registry.3,
+	  man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,
+	  man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,
+	  man/netsnmp_cache_handler.3, man/netsnmp_callback.3,
+	  man/netsnmp_container.3, man/netsnmp_container_iterator.3,
+	  man/netsnmp_container_iterator.h.3, man/netsnmp_data_list.3,
+	  man/netsnmp_debug.3, man/netsnmp_default_store.3,
+	  man/netsnmp_handler.3, man/netsnmp_instance.3,
+	  man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,
+	  man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,
+	  man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,
+	  man/netsnmp_multiplexer.3,
+	  man/netsnmp_netsnmp_agent_request_info_s.3,
+	  man/netsnmp_netsnmp_column_info_t.3,
+	  man/netsnmp_netsnmp_data_list_s.3,
+	  man/netsnmp_netsnmp_handler_registration_s.3,
+	  man/netsnmp_netsnmp_iterator_info_s.3,
+	  man/netsnmp_netsnmp_mib_handler_access_methods.3,
+	  man/netsnmp_netsnmp_mib_handler_methods.3,
+	  man/netsnmp_netsnmp_mib_handler_s.3,
+	  man/netsnmp_netsnmp_monitor_callback_header_s.3,
+	  man/netsnmp_netsnmp_request_info_s.3,
+	  man/netsnmp_netsnmp_table_registration_info_s.3,
+	  man/netsnmp_netsnmp_table_request_info_s.3,
+	  man/netsnmp_null_container.3, man/netsnmp_oid_stash.3,
+	  man/netsnmp_old_api.3, man/netsnmp_read_config.3,
+	  man/netsnmp_read_only.3, man/netsnmp_row_merge.3,
+	  man/netsnmp_scalar.3, man/netsnmp_scalar_group_group.3,
+	  man/netsnmp_serialize.3, man/netsnmp_snmp_agent.3,
+	  man/netsnmp_snmp_alarm.3, man/netsnmp_snmp_client.3,
+	  man/netsnmp_snmp_logging.3, man/netsnmp_snmp_pdu.3,
+	  man/netsnmp_snmp_session.3, man/netsnmp_stash_cache.3,
+	  man/netsnmp_stash_to_next.3, man/netsnmp_table.3,
+	  man/netsnmp_table_array.3, man/netsnmp_table_container.3,
+	  man/netsnmp_table_data.3, man/netsnmp_table_dataset.3,
+	  man/netsnmp_table_generic.3, man/netsnmp_table_indexes.3,
+	  man/netsnmp_table_iterator.3, man/netsnmp_table_iterator.h.3,
+	  man/netsnmp_table_maintenance.3, man/netsnmp_table_row.3,
+	  man/netsnmp_table_rows.3, man/netsnmp_tdata.3,
+	  man/netsnmp_tools.h.3, man/netsnmp_util.3,
+	  man/netsnmp_utilities.3, man/netsnmp_variable_list.3,
+	  man/netsnmp_watcher.3:
+	  documentation update
+	  (re-running makerelease)
+
+2010-12-21 09:16  dts12
+
+	* CHANGES, NEWS, configure:
+	  Version number update
+	  (re-running makerelease)
+	  Actually log of recent significant changes
+
+2010-12-20 16:10  dts12
+
+	* ChangeLog:
+	  version update
+
+2010-12-20 16:07  dts12
+
+   *  agent/Makefile.depend, agent/helpers/Makefile.depend,   
+      agent/mibgroup/Makefile.depend, apps/Makefile.depend,   
+      apps/snmpnetstat/Makefile.depend, snmplib/Makefile.depend:
+
+   make depend
+
+2010-12-20 15:45  dts12
+
+   *  man/netsnmp_access_multiplexer.3, man/netsnmp_agent.3,   
+      man/netsnmp_agent_handler.h.3, man/netsnmp_agent_registry.3,   
+      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
+      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
+      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
+      man/netsnmp_container.3, man/netsnmp_container_iterator.3,   
+      man/netsnmp_container_iterator.h.3, man/netsnmp_data_list.3,   
+      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
+      man/netsnmp_handler.3, man/netsnmp_instance.3,   
+      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
+      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
+      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
+      man/netsnmp_multiplexer.3,   
+      man/netsnmp_netsnmp_agent_request_info_s.3,   
+      man/netsnmp_netsnmp_column_info_t.3,   
+      man/netsnmp_netsnmp_data_list_s.3,   
+      man/netsnmp_netsnmp_handler_registration_s.3,   
+      man/netsnmp_netsnmp_iterator_info_s.3,   
+      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_s.3,   
+      man/netsnmp_netsnmp_monitor_callback_header_s.3,   
+      man/netsnmp_netsnmp_request_info_s.3,   
+      man/netsnmp_netsnmp_table_registration_info_s.3,   
+      man/netsnmp_netsnmp_table_request_info_s.3,   
+      man/netsnmp_null_container.3, man/netsnmp_oid_stash.3,   
+      man/netsnmp_old_api.3, man/netsnmp_read_config.3,   
+      man/netsnmp_read_only.3, man/netsnmp_row_merge.3,   
+      man/netsnmp_scalar.3, man/netsnmp_scalar_group_group.3,   
+      man/netsnmp_serialize.3, man/netsnmp_snmp_agent.3,   
+      man/netsnmp_snmp_alarm.3, man/netsnmp_snmp_client.3,   
+      man/netsnmp_snmp_logging.3, man/netsnmp_snmp_pdu.3,   
+      man/netsnmp_snmp_session.3, man/netsnmp_stash_cache.3,   
+      man/netsnmp_stash_to_next.3, man/netsnmp_table.3,   
+      man/netsnmp_table_array.3, man/netsnmp_table_container.3,   
+      man/netsnmp_table_data.3, man/netsnmp_table_dataset.3,   
+      man/netsnmp_table_generic.3, man/netsnmp_table_indexes.3,   
+      man/netsnmp_table_iterator.3, man/netsnmp_table_iterator.h.3,   
+      man/netsnmp_table_maintenance.3, man/netsnmp_table_row.3,   
+      man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
+      man/netsnmp_tools.h.3, man/netsnmp_util.3,   
+      man/netsnmp_utilities.3, man/netsnmp_variable_list.3,   
+      man/netsnmp_watcher.3:
+
+   documentation update
+
+2010-12-20 15:23  dts12
+
+   *  FAQ, README, configure, configure.ac, dist/Makefile,   
+      dist/net-snmp.spec, perl/ASN/ASN.pm,   
+      perl/AnyData_SNMP/Storage.pm, perl/OID/OID.pm, perl/SNMP/SNMP.pm, 
+        perl/TrapReceiver/TrapReceiver.pm,
+      perl/agent/Support/Support.pm,    perl/agent/agent.pm,
+      perl/agent/default_store/default_store.pm,   
+      perl/default_store/default_store.pm:
+
+   Version number update
+
+2010-12-20 14:07  dts12
+
+   * Makefile.top:
+
+   version update
+
 2010-12-10 15:50  hardaker
 
    * agent/agent_trap.c, snmplib/snmpusm.c:
@@ -1343,6 +6129,13 @@
    the loading
    of the list a bit.
 
+2010-12-06 23:23  hardaker
+
+   * agent/mibgroup/etherlike-mib/data_access/dot3stats_linux.c:
+
+   Patch from Niels to remove extra headers from the linux dot3stats
+   implementation
+
 2010-12-06 16:24  hardaker
 
    * apps/snmptrap.c:
@@ -1379,6 +6172,15 @@
    CHANGES: snmpd: PATCH: 3053436: from: takevos: fix:
    tcpListenerTable_data_access invalid memory access
 
+2010-11-30 05:56  hardaker
+
+   *  agent/mibgroup/if-mib/data_access/interface_linux.c, configure,   
+      configure.d/config_os_struct_members,   
+      include/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: snmpd: PATCH: 3057090: from shemminger: make ethtool
+   support on linux use the high speed struct info for 100G+.
+
 2010-11-30 04:58  hardaker
 
    * agent/mibgroup/ip-mib/data_access/systemstats_linux.c:
@@ -1406,6 +6208,15 @@
    
    netsnmp_cache_is_valid() is not meant for mib modules
 
+2010-11-16 10:04  bvassche
+
+   * agent/mibgroup/ip-mib/data_access/arp_linux.c:
+
+   CHANGES: Linux: agent: ipNetToPhysicalTable: Do not log an error
+   message if one or more interfaces are present that do not have
+   such information (NUD_NOARP), e.g. tunnels. Reported by Stephen
+   Hemminger. See also patch #3107003.
+
 2010-11-15 14:15  bvassche
 
    * snmplib/asn1.c:
@@ -1415,12 +6226,6 @@
    asn_build_signed_int64(). Most but not all of these bugs were
    specific to 64-bit systems. Fixes bug #3093199.
 
-2010-11-15 14:12  bvassche
-
-   * agent/mibgroup/struct.h:
-
-   Builds again.
-
 2010-11-11 22:48  nba
 
    * agent/mibgroup/notification-log-mib/notification_log.c:
@@ -1428,9 +6233,17 @@
    Fix r19636: TrapOID is not the first varbind in the converted v2
    trap
 
+2010-11-11 08:38  bvassche
+
+   *  agent/mibgroup/if-mib/data_access/interface_linux.c,   
+      agent/mibgroup/util_funcs.c, agent/mibgroup/util_funcs.h:
+
+   Cleanup: Removed superfluous references to the POSIX threads
+   library.
+
 2010-11-10 12:31  bvassche
 
-   * configure, configure.in:
+   * configure, configure.d/config_os_progs:
 
    CHANGES: BUG: 3102904: All Net-SNMP C source files are now
    compiled with -fno-st
@@ -1504,12 +6317,48 @@
    CHANGES: snmplib: force a ; at the end of the static_assert
    macro.
 
-2010-11-07 16:21  dts12
+2010-11-05 15:41  bvassche
 
-   * agent/agent_trap.c:
+   * configure, configure.d/config_os_functions:
 
-   Backport of revision 17596
-   Trivial warning fixes
+   Made sure that rpmGetPath() can be found by configure.
+
+2010-11-05 14:52  bvassche
+
+   *  Makefile.in, configure, configure.ac,   
+      configure.d/config_os_headers, configure.d/config_os_libs,   
+      configure.d/config_os_libs1, configure.d/config_os_libs2:
+
+   CHANGES: agent: Fixed order of rpmlib detection and agent module
+   configuration (backported r19621 from the trunk).
+
+2010-11-05 14:36  bvassche
+
+   * include/net-snmp/net-snmp-config.h.in:
+
+   Reverted r19623.
+
+2010-11-05 13:42  bvassche
+
+   * include/net-snmp/net-snmp-config.h.in:
+
+   Regenerated include/net-snmp/net-snmp-config.h.in.
+
+2010-11-05 10:00  bvassche
+
+   * agent/mibgroup/host/data_access/swinst_rpm.c:
+
+   CHANGES: agent: host/data_access/swinst_rpm: Fixed a memory leak
+   in netsnm_swinst_arch_init().
+
+2010-11-05 09:23  bvassche
+
+   * agent/mibgroup/host/data_access/swinst_rpm.c:
+
+   CHANGES: agent: host/data_access/swinst_rpm: Pass correct path to
+   rpmdbOpen() such that opening the database succeeds.
+   CHANGES: agent: host/data_access/swinst_rpm: Log an error message
+   if rpmdbOpen() fails.
 
 2010-11-05 08:48  bvassche
 
@@ -1531,18 +6380,11 @@
    Backported r19602, which fixes the double free at exit that was
    introduced by r19462.
 
-2010-11-03 14:59  bvassche
-
-   * configure, configure.in:
-
-   CHANGES: building: VERSION is again a number instead of a C
-   expression, such that the Perl modules build again.
-
-2010-11-03 14:47  bvassche
+2010-11-03 14:51  bvassche
 
    * include/net-snmp/agent/instance.h:
 
-   Fixed an incorrect file header (a source code comment).
+   Forward-ported r19608.
 
 2010-11-01 16:50  dts12
 
@@ -1559,10 +6401,10 @@
 
 2010-11-01 16:30  dts12
 
-   *  man/snmp_sess_api.3.def, man/snmpbulkget.1.def,   
-      man/snmpbulkwalk.1.def, man/snmpget.1.def, man/snmpgetnext.1.def, 
-        man/snmpset.1.def, man/snmptrap.1.def, man/snmptrapd.8.def,   
-      man/snmpwalk.1.def:
+   *  man/session_api.3.def, man/snmp_sess_api.3.def,   
+      man/snmpbulkget.1.def, man/snmpbulkwalk.1.def, man/snmpget.1.def, 
+        man/snmpgetnext.1.def, man/snmpset.1.def, man/snmptrap.1.def,   
+      man/snmptrapd.8.def, man/snmpwalk.1.def:
 
    Remove CMU copyright notice from man pages that
    were not inherited from CMU-SNMP
@@ -1570,22 +6412,24 @@
 
 2010-11-01 13:55  dts12
 
-   *  man/encode_keychange.1.def, man/fixproc.1.def,   
-      man/mib2c-update.1.def, man/mib2c.1.def, man/mib_api.3.def,   
-      man/net-snmp-config.1.def, man/read_config.3.def,   
-      man/snmp.conf.5.def, man/snmp_agent_api.3.def,   
-      man/snmp_alarm.3.def, man/snmp_api.3.def, man/snmp_config.5.def,  
-       man/snmp_sess_api.3.def, man/snmp_trap_api.3.def,   
-      man/snmpbulkget.1.def, man/snmpbulkwalk.1.def, man/snmpcmd.1.def, 
-        man/snmpconf.1.def, man/snmpd.8.def, man/snmpd.conf.5.def,   
-      man/snmpd.examples.5.def, man/snmpd.internal.5.def,   
-      man/snmpdelta.1.def, man/snmpdf.1.def, man/snmpget.1.def,   
-      man/snmpgetnext.1.def, man/snmpnetstat.1.def, man/snmpset.1.def,  
-       man/snmpstatus.1.def, man/snmptable.1.def, man/snmptest.1.def,   
-      man/snmptranslate.1.def, man/snmptrap.1.def, man/snmptrapd.8.def, 
-        man/snmptrapd.conf.5.def, man/snmpusm.1.def, man/snmpvacm.1.def,
-         man/snmpwalk.1.def, man/tkmib.1.def, man/traptoemail.1.def,   
-      man/variables.5.def:
+   *  man/config_api.3.def, man/encode_keychange.1.def,   
+      man/fixproc.1.def, man/mib2c-update.1.def, man/mib2c.1.def,   
+      man/mib_api.3.def, man/net-snmp-config.1.def,   
+      man/net-snmp-create-v3-user.1.def, man/pdu_api.3.def,   
+      man/session_api.3.def, man/snmp.conf.5.def,   
+      man/snmp_agent_api.3.def, man/snmp_alarm.3.def,   
+      man/snmp_config.5.def, man/snmp_sess_api.3.def,   
+      man/snmp_trap_api.3.def, man/snmpbulkget.1.def,   
+      man/snmpbulkwalk.1.def, man/snmpcmd.1.def, man/snmpconf.1.def,   
+      man/snmpd.8.def, man/snmpd.conf.5.def, man/snmpd.examples.5.def,  
+       man/snmpd.internal.5.def, man/snmpdelta.1.def, man/snmpdf.1.def, 
+        man/snmpget.1.def, man/snmpgetnext.1.def, man/snmpnetstat.1.def,
+         man/snmpset.1.def, man/snmpstatus.1.def, man/snmptable.1.def,  
+       man/snmptest.1.def, man/snmptranslate.1.def, man/snmptrap.1.def, 
+        man/snmptrapd.8.def, man/snmptrapd.conf.5.def,
+      man/snmpusm.1.def,    man/snmpvacm.1.def, man/snmpwalk.1.def,
+      man/tkmib.1.def,    man/traptoemail.1.def, man/varbind_api.3.def, 
+        man/variables.5.def:
 
    Suppress forcing of "Berkeley Distribution" footer
    (Allows Net-SNMP version information to be displayed in the man
@@ -1593,9 +6437,9 @@
 
 2010-11-01 13:42  dts12
 
-   *  man/mib2c.1.def, man/mib_api.3.def, man/read_config.3.def,   
-      man/snmp.conf.5.def, man/snmp_agent_api.3.def,   
-      man/snmp_alarm.3.def, man/snmp_api.3.def,   
+   *  man/config_api.3.def, man/mib2c.1.def, man/mib_api.3.def,   
+      man/session_api.3.def, man/snmp.conf.5.def,   
+      man/snmp_agent_api.3.def, man/snmp_alarm.3.def,   
       man/snmp_sess_api.3.def, man/snmp_trap_api.3.def,   
       man/snmpbulkget.1.def, man/snmpbulkwalk.1.def, man/snmpcmd.1.def, 
         man/snmpconf.1.def, man/snmpd.8.def, man/snmpd.conf.5.def,   
@@ -1615,6 +6459,26 @@
 
    Spelling fix in log texts: containter -> container.
 
+2010-10-29 11:34  bvassche
+
+   * agent/mibgroup/ip-mib/data_access/arp_linux.c:
+
+   Backported r19588 and r19589 from the trunk.
+
+2010-10-29 07:56  bvassche
+
+   *  agent/mibgroup/etherlike-mib/data_access/dot3stats_linux.c,   
+      agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_access.h,
+         agent/mibgroup/rmon-mib/data_access/etherstats_linux.c:
+
+   More compiler warning fixes.
+
+2010-10-29 07:55  bvassche
+
+   * testing/eval_tools.sh:
+
+   Backported ISDEFINED from the trunk.
+
 2010-10-28 14:02  dts12
 
    * local/mib2c.check_values.conf:
@@ -1644,12 +6508,6 @@
    longer necessary to cast these two arguments (has been reverted
    via r19568).
 
-2010-10-28 10:06  bvassche
-
-   * testing/eval_tools.sh:
-
-   Backported ISDEFINED from r18670.
-
 2010-10-25 20:59  dts12
 
    * Makefile.in:
@@ -1684,6 +6542,26 @@
    CHANGES: Win32: testing: Avoid that T200 fails on known Microsoft
    SNMP extension DLL bugs.
 
+2010-10-25 08:06  bvassche
+
+   *  agent/mibgroup/if-mib/data_access/interface_linux.c,   
+      agent/mibgroup/ip-mib/data_access/ipaddress_linux.c,   
+      agent/mibgroup/util_funcs.c, agent/mibgroup/util_funcs.h,   
+      configure, configure.d/config_os_libs:
+
+   NEWS: Linux: snmpd is again single-threaded.
+   CHANGES: agent: PATCH: 2959811: from Jan Safranek: Reimplement
+   Linux Netlink IPv6 prefix listener.
+
+2010-10-22 09:20  bvassche
+
+   * agent/helpers/cache_handler.c:
+
+   CHANGES: agent: netsnmp_cache_free(): A more detailed message is
+   now logged when attempting to free a cache that is still in the
+   cache list.
+   (Backported r19524.)
+
 2010-10-22 09:19  bvassche
 
    * agent/agent_registry.c:
@@ -1701,7 +6579,7 @@
 
    *  agent/agent_handler.c, agent/agent_registry.c,   
       agent/snmp_agent.c, agent/snmpd.c,   
-      include/net-snmp/library/snmp_api.h, snmplib/snmp_api.c:
+      include/net-snmp/session_api.h, snmplib/snmp_api.c:
 
    CHANGES: snmplib: Added snmp_sess_session_lookup().
    CHANGES: agent: Call shutdown_master_agent() and shutdown_agent()
@@ -1726,6 +6604,13 @@
    analyzer supports following child processes.
    (Backported r19283 from the trunk.)
 
+2010-10-19 21:13  nba
+
+   * snmplib/parse.c:
+
+   BUG 3079072 from Dave Beal: fix buffer overflow from bad use of
+   strncat
+
 2010-10-19 18:08  bvassche
 
    *  win32/net-snmp/net-snmp-config.h,   
@@ -1783,6 +6668,33 @@
    uninitialized data for the buffers returned by
    netsnmp_callback_recv() and netsnmp_callback_hook_build().
 
+2010-10-17 16:51  bvassche
+
+   *  agent/mibgroup/host/data_access/swrun_procfs_psinfo.c,   
+      agent/mibgroup/host/data_access/swrun_procfs_status.c:
+
+   CHANGES: agent: Avoid that hrSWRunPath contains trailing garbage
+   characters on Linux systems.
+   Found this by analyzing a Valgrind complaint. For anyone who is
+   wondering why this patch makes sense, a quote from the glibc
+   snprintf() documentation
+   (http://www.gnu.org/software/libc/manual/html_node/Formatted-Output-Functions.html):
+   <quote>
+   The return value is the number of characters which would be
+   generated for the given input, excluding the trailing null. If
+   this value is greater or equal to size, not all characters from
+   the result have been stored in s.
+   </quote>
+   Please note that this differs from the standard behavior. A quote
+   from http://opengroup.org/onlinepubs/007908799/xsh/snprintf.html:
+   <quote>
+   RETURN VALUE
+   Upon successful completion, these functions return the number of
+   bytes transmitted excluding the terminating null in the case of
+   sprintf() or snprintf() or a negative value if an output error
+   was encountered.
+   </quote>
+
 2010-10-17 14:24  bvassche
 
    * agent/mibgroup/agentx/protocol.h:
@@ -1792,7 +6704,7 @@
 
 2010-10-16 08:37  bvassche
 
-   * configure, configure.in:
+   * configure, configure.d/config_modules_agent:
 
    Spelling fix: dulpicate -> duplicate.
 
@@ -1828,9 +6740,18 @@
    handler no longer causes a crash (double free) when
    handler->myvoid of the original handler was non-NULL.
 
+2010-10-15 10:56  bvassche
+
+   *  win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: Win32: building: Builds now correctly with a 64-bit
+   compiler.
+
 2010-10-15 10:02  bvassche
 
-   * agent/agent_handler.c, man/netsnmp_handler.3:
+   *  agent/agent_handler.c, man/netsnmp_agent_handler.h.3,   
+      man/netsnmp_handler.3:
 
    Spelling fix: dulpicates -> duplicates.
 
@@ -1848,13 +6769,21 @@
    se_add_pair_to_list() with a value that already existed in the
    list.
 
-2010-10-13 16:53  hardaker
+2010-10-13 16:55  hardaker
 
    * dist/autoconf-version, testing/tests/T000configure:
 
    added a autoconf version checking test to catch developers and
    scripts that fail to use the correct autoconf version
 
+2010-10-13 11:53  bvassche
+
+   *  win32/libsnmp_dll/Makefile.in, win32/snmpd/Makefile.in,   
+      win32/snmpnetstat/Makefile.in, win32/snmptrapd/Makefile.in:
+
+   CHANGES: Win32: building: batch build with OpenSSL enabled and
+   with recent OpenSSL development files works again.
+
 2010-10-13 07:43  bvassche
 
    * net-snmp-config.in:
@@ -1901,6 +6830,20 @@
    version of the patch to use MSG_DONTWAIT for the unix domain
    socket
 
+2010-09-03 21:56  hardaker
+
+   * agent/mibgroup/util_funcs/get_pid_from_inode.c:
+
+   CHANGES: snmpd: PATCH: 3058140: from takevos: check that inode is
+   non-zero
+
+2010-09-03 21:50  hardaker
+
+   * agent/mibgroup/util_funcs/get_pid_from_inode.c:
+
+   CHANGES: snmpd: PATCH: 3053428: from takevos: fix
+   get_pid_from_inode when the inode is not found.
+
 2010-08-24 05:37  magfr
 
    * apps/snmpusm.c:
@@ -1929,6 +6872,13 @@
    CHANGES: snmpd: patch 2825653: from bru5ce: fix sendmail.cf
    parsing in certain conditions
 
+2010-08-16 07:42  dts12
+
+   * perl/SNMP/SNMP.xs:
+
+   CHANGES: perl: PATCH: 2995098: Fix creation of SNMPv3 sessions
+   with API_SINGLE
+
 2010-08-14 16:30  dts12
 
    * agent/agent_read_config.c:
@@ -1942,6 +6892,13 @@
    CHANGES: snmpd: PATCH: 2904900: Documentation plus assorted
    handler code fixes
 
+2010-08-13 23:44  hardaker
+
+   * agent/mibgroup/mibII/system_mib.c:
+
+   CHANGES: snmpd: PATCH: 3044512: from philwebster: fix sysobjectid
+   directive.
+
 2010-08-13 12:22  dts12
 
    * local/mib2c.table_data.conf:
@@ -1960,6 +6917,13 @@
 
    Update "auth*" usage message with context support
 
+2010-08-03 07:27  dts12
+
+   * agent/mibgroup/hardware/fsys/fsys_mntctl.c:
+
+   AIX filesystem types are tagged as integers, not strings.
+   Fix a silly mistake.
+
 2010-08-01 06:00  bvassche
 
    * snmplib/snmp_enum.c:
@@ -1989,7 +6953,9 @@
 
 2010-07-28 14:36  dts12
 
-   * agent/mibgroup/default_modules.h, configure, configure.in:
+   *  agent/mibgroup/default_modules.h, configure,   
+      configure.d/config_modules_agent,   
+      configure.d/config_project_with_enable:
 
    Don't mix SMIv1 and SMIv2 MIBs in the list of default MIBs to
    load.
@@ -2003,6 +6969,14 @@
    CHANGES: mibs: patch 2974716: from bvassche: fix issues in the
    SMUX-MIB
 
+2010-07-27 08:14  jsafranek
+
+   *  agent/mibgroup/hardware/fsys/fsys_mntent.c,   
+      agent/mibgroup/hardware/fsys/mnttypes.h:
+
+   CHANGES: snmpd: report gfs filesystems in hrStorageTable and
+   hrFSTable.
+
 2010-07-24 15:36  dts12
 
    * snmplib/snmp_transport.c:
@@ -2011,6 +6985,12 @@
    when opening a new SNMP session.
    Fixes a bug with reporting later config errors.
 
+2010-07-21 18:03  nba
+
+   * agent/mibgroup/ucd-snmp/diskio.c:
+
+   r17495 erroneously disabled diskIOLAx for linux
+
 2010-07-20 10:38  jsafranek
 
    * snmplib/system.c:
@@ -2040,6 +7020,14 @@
    interfaces table does not trigger out-of-range array accesses
    (was detected by BoundsChecker).
 
+2010-07-11 11:18  bvassche
+
+   * configure, configure.d/config_os_functions:
+
+   CHANGES: BUG: 3027900: when cross-compiling it is now assumed
+   that memcmp() is available instead of assuming that it is not
+   available.
+
 2010-07-08 12:17  dts12
 
    * agent/agent_read_config.c:
@@ -2064,22 +7052,21 @@
    *  man/mib_api.3.def, man/netsnmp_agent.3, man/netsnmp_container.3,  
        man/netsnmp_example_scalar_int.3, man/netsnmp_handler.3,   
       man/netsnmp_library.3, man/netsnmp_mib_utilities.3,   
-      man/netsnmp_table.3, man/snmpcmd.1.def, man/snmpd.conf.5.def,   
-      man/snmptrapd.conf.5.def:
+      man/netsnmp_table.3, man/snmpcmd.1.def, man/snmptrapd.conf.5.def:
 
    CHANGES: man: clean up manual pages
    (from Debian patch 56_manpage)
 
-2010-06-28 00:21  tanders
+2010-06-28 00:20  tanders
 
-   * agent/object_monitor.c:
+   * man/config_api.3:
 
-   fix cpp syntax error
+   remove generated manual page from repository (partly revert
+   r17558)
 
 2010-06-27 23:29  tanders
 
-   *  agent/agent_read_config.c, apps/snmptrapd.c,   
-      apps/snmptrapd_auth.c:
+   * apps/snmptrapd.c, apps/snmptrapd_auth.c:
 
    CHANGES: build: Do not call vacm_standard_views() or
    init_vacm_config_tokens() if the corresponding module was not
@@ -2117,19 +7104,35 @@
 
    Fixed an error in a comment block.
 
-2010-06-16 19:14  dts12
+2010-06-21 08:01  dts12
 
-   * snmplib/vacm.c:
+   * snmplib/large_fd_set.c:
 
-   Fix processing of view masks (misplaced parentheses)
+   Ensure that fdset structure is resized sufficiently
+   to accomodate the specified socket ID.
+   Problem reported by Shiyalei.
 
-2010-06-07 20:18  jsafranek
+2010-06-21 07:56  dts12
 
    * agent/mibgroup/host/hr_proc.c:
 
    Reverting rev. 17616, the necessary check is already in rev.
    17415.
 
+2010-06-18 17:04  bvassche
+
+   * configure, configure.d/config_os_libs:
+
+   CHANGES: Linux: builds again with embedded Perl disabled (bug
+   2985915).
+   (Backported r18721)
+
+2010-06-16 19:14  dts12
+
+   * snmplib/vacm.c:
+
+   Fix processing of view masks (misplaced parentheses)
+
 2010-06-02 10:57  jsafranek
 
    *  agent/mibgroup/disman/mteEventTable.c,   
@@ -2159,150 +7162,206 @@
    CHANGES: snmpd: BUG: 2972579: fixed checking of
    snmpTargetAddrRowStatus SET requests.
 
-2010-05-27 06:49  bvassche
+2010-05-27 11:19  jsafranek
+
+   *  agent/mibgroup/if-mib/data_access/interface.c,   
+      agent/mibgroup/if-mib/data_access/interface_linux.c,   
+      include/net-snmp/data_access/interface.h:
+
+   CHANGES: correctly calculate ifXTable.ifHCInUcastPkts on 32-bit
+   Linux
+   
+   Linux does not provide standalone counter for incoming unicast
+   packets (iucast)
+   - it provides counter of all packets (iall) + separate counter
+   for the multicast
+   ones (imcast). Previous implementation of ifTable read these
+   counters and
+   calculated iucast = iall - imcast *before* these values were
+   expanded into
+   64bits. This produced errors on 32bit systems when iall
+   overflowed to zero and
+   imcast was nozero -> iucast got negative and 'c64 32 bit check
+   failed' error in
+   snmpd log. Now the agent expands these values to 64bits first and
+   *     *then* performs    the calculation, using a new flag. 
+      2010-05-24 10:10  jsafranek
+
+
+   *  agent/mibgroup/hardware/fsys/fsys_getfsstats.c,   
+      agent/mibgroup/hardware/fsys/fsys_mntent.c:
+
+   Use proper string sizes and make sure strings are
+   zero-terminated.
+
+2010-05-20 08:48  bvassche
+
+   * net-snmp-config.in:
+
+   Swapped link order of -lnetsnmphelpers -lnetsnmpmibs: netsnmpmibs
+   depends on netsnmphelpers and not the other way around.
+
+2010-05-19 12:05  dts12
+
+   *  agent/mibgroup/hardware/fsys.h,   
+      agent/mibgroup/hardware/fsys/fsys_mntctl.c:
+
+   First-draft support for AIX filesystem HAL module (untested)
+
+2010-05-19 11:25  dts12
+
+   * agent/mibgroup/hardware/fsys/fsys_mntent.c:
+
+   Support for Solaris-style 'getmntent' API.
+
+2010-05-19 09:57  dts12
+
+   *  agent/mibgroup/hardware/fsys/fsys_mntent.c,   
+      agent/mibgroup/hardware/fsys/mnttypes.h:
+
+   Simplify the handling of unknown/unwanted file systems.
+
+2010-05-19 09:30  dts12
+
+   *  agent/mibgroup/hardware/fsys/hw_fsys.c,   
+      agent/mibgroup/hardware/fsys/hw_fsys.h,   
+      agent/mibgroup/host/hrh_filesys.c,   
+      include/net-snmp/agent/hardware/fsys.h:
+
+   Fix missing/broken API declarations.
+
+2010-05-18 23:47  tanders
+
+   *  agent/mibgroup/host/data_access/swinst_pkginfo.c,   
+      agent/object_monitor.c:
+
+   fix syntax errors: #elsif -> #elif
+
+2010-05-18 14:56  dts12
+
+   * python/netsnmp/client_intf.c:
+
+   CHANGES: python: PATCH: 2001656: Handle null-termination of
+   string values properly.
+   Based on the principles of the patch from Tommy Beadle.
+
+2010-05-18 14:38  dts12
+
+   *  agent/mibgroup/hardware/fsys/fsys_mntent.c,   
+      agent/mibgroup/hardware/fsys/hw_fsys.c,   
+      agent/mibgroup/hardware/fsys/mnttypes.h, agent/mibgroup/host.h,   
+      agent/mibgroup/host/hrh_filesys.c,   
+      agent/mibgroup/host/hrh_filesys.h,   
+      agent/mibgroup/host/hrh_storage.c,   
+      agent/mibgroup/host/hrh_storage.h,   
+      include/net-snmp/agent/hardware/fsys.h:
+
+   Working(?) HAL-based version of hrFSTable.
+
+2010-05-17 15:18  dts12
+
+   *  agent/mibgroup/hardware/fsys/hw_fsys.c,   
+      include/net-snmp/agent/hardware/fsys.h:
+
+   Provide missing public interface to HAL-based filestore module.
+
+2010-05-17 07:46  jsafranek
+
+   * configure, configure.ac:
+
+   Check configure.d/config_os_headers before
+   configure.d/config_modules_* and fix lm_sensors version detection
+
+2010-05-17 06:53  bvassche
+
+   * configure, configure.d/config_modules_lib:
+
+   CHANGES: Cygwin: do neither compile nor link inet_ntop.c and
+   inet_pton.c.
+
+2010-05-16 10:05  bvassche
+
+   *  win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: Win32: building: don't warn about signed/unsigned
+   mismatches in comparisons, just like for the Unix builds.
+   (Backported this change from the trunk.)
+
+2010-05-16 09:59  bvassche
 
    * agent/mibgroup/winExtDLL.c:
 
-   CHANGES: winExtDLL: convert assert() statements into
-   netsnmp_assert() statements.
+   CHANGES: Win32: winExtDLL: don't trigger a netsnmp_assert() when
+   no extension DLLs have been loaded.
 
-2010-05-23 21:07  dts12
+2010-05-14 11:04  bvassche
 
-   * ChangeLog:
+   * agent/mibgroup/winExtDLL.c:
 
-   version update
+   Changed assert() into netsnmp_assert() (backported r18353
+   partially).
 
--------------------------------------------------------------------------------
-Changes: V5.4.2 -> V5.4.3
+2010-05-14 11:00  bvassche
 
-2010-05-23 20:42  dts12
+   * README.win32:
 
-   *  man/netsnmp_agent.3, man/netsnmp_agent_registry.3,   
-      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
-      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
-      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
-      man/netsnmp_container.3, man/netsnmp_data_list.3,   
-      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
-      man/netsnmp_handler.3, man/netsnmp_instance.3,   
-      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
-      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
-      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
-      man/netsnmp_multiplexer.3,   
-      man/netsnmp_netsnmp_agent_request_info_s.3,   
-      man/netsnmp_netsnmp_column_info_t.3,   
-      man/netsnmp_netsnmp_data_list_s.3,   
-      man/netsnmp_netsnmp_handler_registration_s.3,   
-      man/netsnmp_netsnmp_iterator_info_s.3,   
-      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_s.3,   
-      man/netsnmp_netsnmp_request_info_s.3,   
-      man/netsnmp_netsnmp_table_registration_info_s.3,   
-      man/netsnmp_netsnmp_table_request_info_s.3,   
-      man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,   
-      man/netsnmp_read_config.3, man/netsnmp_read_only.3,   
-      man/netsnmp_row_merge.3, man/netsnmp_scalar.3,   
-      man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,   
-      man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,   
-      man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,   
-      man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,   
-      man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,   
-      man/netsnmp_table.3, man/netsnmp_table_array.3,   
-      man/netsnmp_table_container.3, man/netsnmp_table_data.3,   
-      man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,   
-      man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,   
-      man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,  
-       man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
-      man/netsnmp_util.3, man/netsnmp_utilities.3,   
-      man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
+   Documentation: updated Cygwin build instructions.
 
-   documentation update
+2010-05-14 08:54  bvassche
 
-2010-05-23 20:39  dts12
+   * net-snmp-config.in:
 
-   *  FAQ, README, configure, configure.in, dist/net-snmp.spec,   
-      snmplib/parse.c, snmplib/snmp_version.c:
+   Reverted net-snmp-config.in changes from r18688 because although
+   these changes made the Perl modules build, the Perl module
+   regression tests still failed.
 
-   Version number update
+2010-05-13 14:35  jsafranek
 
-2010-05-14 12:46  dts12
+   * include/net-snmp/library/snmp_logging.h:
 
-   * CHANGES, NEWS:
+   add NETSNMP_LOGONCE macro from trunk
 
-   version update
+2010-05-13 09:18  bvassche
 
-2010-05-14 12:41  dts12
+   * configure, include/net-snmp/net-snmp-config.h.in:
 
-   * ChangeLog:
+   Ran autoreconf -i.
 
-   version update
+2010-05-12 14:14  jsafranek
 
-2010-05-14 12:28  dts12
+   * 
+      agent/mibgroup/tcp-mib/tcpConnectionTable/tcpConnectionTable_data_access.c:
 
-   * snmplib/Makefile.depend:
+   CHANGES: snmpd: fixed a memory leak in TCP-MIB.
 
-   make depend
+2010-05-12 13:02  jsafranek
 
-2010-05-14 12:19  dts12
+   * agent/mibgroup/hardware/sensors/lmsensors_v3.c:
 
-   *  man/netsnmp_agent.3, man/netsnmp_agent_registry.3,   
-      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
-      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
-      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
-      man/netsnmp_container.3, man/netsnmp_data_list.3,   
-      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
-      man/netsnmp_handler.3, man/netsnmp_instance.3,   
-      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
-      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
-      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
-      man/netsnmp_multiplexer.3,   
-      man/netsnmp_netsnmp_agent_request_info_s.3,   
-      man/netsnmp_netsnmp_column_info_t.3,   
-      man/netsnmp_netsnmp_data_list_s.3,   
-      man/netsnmp_netsnmp_handler_registration_s.3,   
-      man/netsnmp_netsnmp_iterator_info_s.3,   
-      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_s.3,   
-      man/netsnmp_netsnmp_request_info_s.3,   
-      man/netsnmp_netsnmp_table_registration_info_s.3,   
-      man/netsnmp_netsnmp_table_request_info_s.3,   
-      man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,   
-      man/netsnmp_read_config.3, man/netsnmp_read_only.3,   
-      man/netsnmp_row_merge.3, man/netsnmp_scalar.3,   
-      man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,   
-      man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,   
-      man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,   
-      man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,   
-      man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,   
-      man/netsnmp_table.3, man/netsnmp_table_array.3,   
-      man/netsnmp_table_container.3, man/netsnmp_table_data.3,   
-      man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,   
-      man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,   
-      man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,  
-       man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
-      man/netsnmp_util.3, man/netsnmp_utilities.3,   
-      man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
+   CHANGES: snmpd: fixed memory leak when reading sensors for
+   LM-SENSORS-MIB.
 
-   documentation update
-
-2010-05-14 12:10  dts12
-
-   *  FAQ, README, configure, configure.in, dist/net-snmp.spec,   
-      snmplib/snmp_version.c:
-
-   Version number update
-
-2010-05-11 17:26  bvassche
+2010-05-12 12:57  dts12
 
    * perl/agent/agent.xs:
 
-   Builds again with the Microsoft Visual C compilers, which do not
-   recognize the C99 ULL suffix.
+   Revert revision 18689
+   Latest Win32 builds include support for strtoull.
+
+2010-05-12 12:05  jsafranek
+
+   *  agent/mibgroup/hardware/sensors.h,   
+      configure.d/config_modules_lib, configure.d/config_os_headers:
+
+   CHANGES: building: added detection of lm_sensors version.
+   I am not Autoconf guru, so I hope I got it right. The goal is to
+   define NETSNMP_USE_SENSORS_V3 *before* config_modules_agent
+   processes agent/mibgroup/hardware/sensors.h.
 
 2010-05-11 15:46  dts12
 
-   * win32/libsnmp_dll/libsnmp.def, win32/libsnmp_dll/libsnmp.def.in:
+   * win32/libsnmp_dll/libsnmp.def:
 
    Ensure 'netsnmp_read_module' is available for perl build.
 
@@ -2312,11 +7371,47 @@
 
    Fix perl build under Windows (strtoull not available)
 
+2010-05-11 10:14  bvassche
+
+   *  net-snmp-config.in, perl/ASN/Makefile.PL, perl/Makefile.PL,   
+      perl/Makefile.subs.pl, perl/OID/Makefile.PL,   
+      perl/SNMP/Makefile.PL, perl/TrapReceiver/Makefile.PL,   
+      perl/agent/Makefile.PL, perl/agent/Support/Makefile.PL,   
+      perl/agent/default_store/Makefile.PL,   
+      perl/default_store/Makefile.PL:
+
+   CHANGES: Cygwin: builds now with embedded Perl support enabled
+   (embedded Perl regression tests do not yet pass however).
+
+2010-05-10 20:31  bvassche
+
+   * configure, configure.d/config_modules_lib:
+
+   CHANGES: Cygwin: removed winpipe.c from the list of source files.
+   CHANGES: Cygwin: enabled Unix transport.
+
+2010-05-09 16:46  bvassche
+
+   *  configure, configure.d/config_modules_agent,   
+      configure.d/config_os_headers, configure.d/config_os_libs,   
+      configure.d/config_os_misc2, configure.d/config_os_progs,   
+      configure.d/config_os_struct_members,   
+      configure.d/config_project_ipv6_types,   
+      include/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: Cygwin: builds now with OpenSSL enabled.
+   CHANGES: Cygwin: builds now with IPv6 support enabled.
+   CHANGES: MinGW: builds now with IPv6 support enabled.
+   CHANGES: Cygwin: builds now also when the source files are
+   located on a Samba filesystem instead of a local filesystem.
+   Note: all the above changes are backports from the trunk.
+
 2010-05-09 16:34  bvassche
 
    * include/net-snmp/system/cygwin.h:
 
-   CHANGES: Cygwin: BUG: 2997492: byte order of udpLocalPort is now correct
+   NEWS: Cygwin: BUG: 2997492: byte order of udpLocalPort is now
+   correct.
    (Backported r18074 from trunk.)
 
 2010-05-06 14:49  dts12
@@ -2328,87 +7423,73 @@
 
 2010-05-06 14:44  dts12
 
-   * win32/win32.dsw, win32/win32sdk.dsw:
+   * win32/win32.dsw:
 
    Add project dependencies for MSVC builds.
 
+2010-05-06 14:41  dts12
+
+   * apps/snmptrapd.c, apps/snmptrapd_log.c, snmplib/callback.c:
+
+   CHANGES: Windows: Fix build under MinGW
+   back/forward port of revision 18631
+
+2010-05-06 07:21  bvassche
+
+   *  configure, configure.d/config_project_ipv6_types,   
+      snmplib/inet_ntop.c, snmplib/inet_pton.c,   
+      snmplib/snmpTCPIPv6Domain.c, snmplib/snmpUDPIPv6Domain.c:
+
+   CHANGES: Cygwin: building: --enable-ipv6 does now work.
+   (ported the patches r18060 and r18619 to the V5.5 branch).
+
 2010-05-06 06:33  bvassche
 
    *  net-snmp-config.in, testing/TESTCONF.sh,   
       testing/tests/T030snmpv3usercreation,   
       testing/tests/T115agentxperl:
 
-   CHANGES: Cygwin: Detect free UDP ports correctly for use in test infrastructure.
+   CHANGES: Cygwin: fixed bug in regression test infrastructure
+   which made detection of a free UDP port fail.
    (Backported trunk r18073 and r18080).
 
-2010-04-30 19:10  bvassche
-
-   *  agent/mibgroup/mibII/system_mib.c, apps/snmptrapd.c,   
-      apps/snmptrapd_log.c, snmplib/callback.c:
-
-   CHANGES: Windows: Fix build under MinGW
-
-2010-04-30 18:44  bvassche
-
-   * configure:
-
-   Should have been included in r18627.
-
-2010-04-30 18:27  bvassche
-
-   * configure.in:
-
-   made sure that cross-compiling without specifying the endianness
-   does not trigger a syntax error in the configure script.
-
-2010-04-28 10:48  bvassche
-
-   * configure, configure.in:
-
-   left out inet_ntop() and inet_pton() from libnetsnmp since these
-   functions are already present in Cygwins C library.
-
-2010-04-28 10:26  bvassche
-
-   * README.win32:
-
-   Fixed a documentation bug with regard to the Cygwin build:
-   linking with ws2_32 is only necessary for really ancient Cygwin versions.
-
-2010-04-28 07:29  bvassche
-
-   *  snmplib/inet_ntop.c, snmplib/inet_pton.c,   
-      snmplib/snmpTCPIPv6Domain.c, snmplib/snmpUDPIPv6Domain.c:
-
-   CHANGES: Cygwin: builds now with IPv6 support enabled.
-
-2010-04-27 16:55  bvassche
-
-   *  win32/net-snmp/net-snmp-config.h,   
-      win32/net-snmp/net-snmp-config.h.in:
-
-   CHANGES: Win32: builds again with IPv6 support enabled.
-
-2010-04-27 15:42  dts12
-
-   *  win32/net-snmp/agent/mib_module_config.h,   
-      win32/netsnmpmibssdk/Makefile.in:
-
-   Re-instate Notification-Log MIB support when building with
-   Windows Platform SDK.
-
 2010-04-25 17:37  bvassche
 
    * README.win32:
 
    Documentation update.
 
-2010-04-21 11:05  bvassche
+2010-04-25 17:01  bvassche
 
-   * snmplib/strtoull.c:
+   *  snmplib/winservice.c, win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
 
-   Copied the source file snmplib/strtoull.c from the trunk to the
-   V5.4 branch.
+   Win32: builds again with MSVC 6 without PSDK.
+
+2010-04-25 15:06  bvassche
+
+   *  win32/libnetsnmptrapd/Makefile.in,   
+      win32/net-snmp/agent/mib_module_config.h,   
+      win32/netsnmpmibs/Makefile.in, win32/snmpd/Makefile.in,   
+      win32/snmptrapd/Makefile.in:
+
+   Win32: builds again with HAVE_WIN32_PLATFORM_SDK disabled.
+
+2010-04-25 12:05  bvassche
+
+   * win32/net-snmp/net-snmp-config.h.in:
+
+   Made it again possible to disable HAVE_WIN32_PLATFORM_SDK when
+   building via win32/build.bat.
+
+2010-04-20 12:44  jsafranek
+
+   * snmplib/asn1.c:
+
+   CHANGES: snmplib: PATCH: 2971270: refuse to parse ASN.1 tokens
+   with wrong type field.
+   This may yield to problems with third-party applications which
+   may depend on parsing ugly ASN.1 data - we'll see...
 
 2010-04-18 13:40  bvassche
 
@@ -2420,17 +7501,9 @@
    including both
    <stdargs.h> and <varargs.h> in the same source file.
 
-2010-04-18 13:24  bvassche
-
-   *  win32/net-snmp/net-snmp-config.h,   
-      win32/net-snmp/net-snmp-config.h.in:
-
-   Reverted another change that was introduced in r18495 and that's
-   obviously broken.
-
 2010-04-15 16:55  bvassche
 
-   * win32/net-snmp/net-snmp-config.h:
+   * win32/net-snmp/agent/mib_module_config.h:
 
    Partially reverted r18496:
    - Commented out #define NETSNMP_USE_DLL again in file
@@ -2444,6 +7517,20 @@
    or V5.5 branches and hence there was no reason to disable this
    preprocessor symbol.
 
+2010-04-15 10:52  jsafranek
+
+   * testing/tests/T120proxyget, testing/tests/T121proxyset:
+
+   Tests not working for TCP should be skipped also for TCP6.
+
+2010-04-14 13:12  jsafranek
+
+   *  testing/tests/Svacmconfig, testing/tests/T120proxyget,   
+      testing/tests/T121proxyset, testing/tests/T122proxysetfail:
+
+   Fixed tests 'Proxy GET/SET support' and 'SNMPv2 vacm denial
+   support' with udp6 transport.
+
 2010-04-14 09:47  dts12
 
    *  win32, win32/bin, win32/dist, win32/dist/htmlhelp,   
@@ -2452,102 +7539,31 @@
       win32/libnetsnmptrapd, win32/libsnmp, win32/libsnmp_dll,   
       win32/libucdmibs, win32/local, win32/net-snmp,   
       win32/net-snmp/agent, win32/net-snmp/library, win32/netsnmpmibs,  
-       win32/netsnmpmibssdk, win32/snmpbulkget, win32/snmpbulkwalk,   
-      win32/snmpd, win32/snmpdelta, win32/snmpdf, win32/snmpdsdk,   
-      win32/snmpget, win32/snmpgetnext, win32/snmpnetstat,   
-      win32/snmpset, win32/snmpstatus, win32/snmptable, win32/snmptest, 
-        win32/snmptranslate, win32/snmptrap, win32/snmptrapd,   
-      win32/snmpusm, win32/snmpvacm, win32/snmpwalk:
+       win32/snmpbulkget, win32/snmpbulkwalk, win32/snmpd,   
+      win32/snmpdelta, win32/snmpdf, win32/snmpget, win32/snmpgetnext,  
+       win32/snmpnetstat, win32/snmpset, win32/snmpstatus,   
+      win32/snmptable, win32/snmptest, win32/snmptranslate,   
+      win32/snmptrap, win32/snmptrapd, win32/snmpusm, win32/snmpvacm,   
+      win32/snmpwalk:
 
    Don't try to SVN-manage the Windows batch build infrastructure
    (add release, debug, Makefile to the previous ignore list)
 
 2010-04-14 08:16  dts12
 
-   * win32/libsnmp_dll/libsnmp.def, win32/libsnmp_dll/libsnmp.def.in:
+   * win32/libsnmp_dll/libsnmp.def:
 
    Fix Windows batch build using Visual Studio with dynamic linking.
    Unreferenced symbol introduced by SVN revision 18393
 
-2010-04-14 08:11  dts12
-
-   *  agent/mibgroup/mibII/interfaces.c,   
-      agent/mibgroup/mibII/interfaces.h:
-
-   Fix Windows batch build using Visual Studio 2008 with Platform
-   SDK enabled.
-
 2010-04-14 08:08  dts12
 
-   *  win32/build.pl, win32/net-snmp/agent/mib_module_config.h,   
-      win32/net-snmp/net-snmp-config.h,   
-      win32/net-snmp/net-snmp-config.h.in:
+   * win32/net-snmp/agent/mib_module_config.h:
 
-   CHANGES: Win32: Fix batch build using recent versions of Visual Studio.
+   CHANGES: Win32: Fix batch build using recent versions of Visual
+   Studio.
    Partial back port of SVN revisions 17573 and 17696.
 
-2010-04-07 14:37  dts12
-
-   * CHANGES, NEWS:
-
-   version update
-
-2010-04-07 14:22  dts12
-
-   * agent/Makefile.depend, agent/mibgroup/Makefile.depend:
-
-   make depend
-
-2010-04-07 14:12  dts12
-
-   *  man/netsnmp_agent.3, man/netsnmp_agent_registry.3,   
-      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
-      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
-      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
-      man/netsnmp_container.3, man/netsnmp_data_list.3,   
-      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
-      man/netsnmp_handler.3, man/netsnmp_instance.3,   
-      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
-      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
-      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
-      man/netsnmp_multiplexer.3,   
-      man/netsnmp_netsnmp_agent_request_info_s.3,   
-      man/netsnmp_netsnmp_column_info_t.3,   
-      man/netsnmp_netsnmp_data_list_s.3,   
-      man/netsnmp_netsnmp_handler_registration_s.3,   
-      man/netsnmp_netsnmp_iterator_info_s.3,   
-      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_s.3,   
-      man/netsnmp_netsnmp_request_info_s.3,   
-      man/netsnmp_netsnmp_table_registration_info_s.3,   
-      man/netsnmp_netsnmp_table_request_info_s.3,   
-      man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,   
-      man/netsnmp_read_config.3, man/netsnmp_read_only.3,   
-      man/netsnmp_row_merge.3, man/netsnmp_scalar.3,   
-      man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,   
-      man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,   
-      man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,   
-      man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,   
-      man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,   
-      man/netsnmp_table.3, man/netsnmp_table_array.3,   
-      man/netsnmp_table_container.3, man/netsnmp_table_data.3,   
-      man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,   
-      man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,   
-      man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,  
-       man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
-      man/netsnmp_util.3, man/netsnmp_utilities.3,   
-      man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
-
-   documentation update
-
-2010-04-07 14:08  dts12
-
-   *  FAQ, README, configure, configure.in, dist/net-snmp.spec,   
-      snmplib/snmp_version.c:
-
-   Version number update
-
 2010-04-07 14:05  dts12
 
    * local/mib2c.table_data.conf:
@@ -2560,12 +7576,26 @@
 
    Python is apparently client-side only.
 
-2010-04-06 08:56  dts12
+2010-04-06 10:06  dts12
 
-   * agent/mibgroup/ucd-snmp/disk.c, mibs/UCD-SNMP-MIB.txt:
+   * agent/snmpd.c:
 
-   NEWS: snmpd: Latch large-disk statistics at 2Tb (rather than
-   wrapping.
+   Set supplementary groups before changing UID
+   (which probably involves giving up privileges)
+
+2010-04-06 08:57  dts12
+
+   * mibs/UCD-SNMP-MIB.txt:
+
+   Document large-disk statistics as latching at 2Tb (rather than
+   wrapping).
+
+2010-03-29 17:17  bvassche
+
+   * configure, configure.d/config_os_progs:
+
+   Removed -Winline and -Wno-char-subscripts (backported r18286 from
+   the trunk).
 
 2010-03-29 15:26  dts12
 
@@ -2586,6 +7616,19 @@
    Note that this could potentially affect the behaviour of
    existing access control configurations.
 
+2010-03-29 15:16  bvassche
+
+   * perl/agent/agent.xs:
+
+   CHANGES: perl:
+   NetSNMP::agent::netsnmp_request_infoPtr::getValue(): don't return
+   a pointer to a buffer on the stack. How can this have worked
+   reliably ??
+   CHANGES: perl:
+   NetSNMP::agent::netsnmp_request_infoPtr::setValue(),
+   ASN_COUNTER64: fixed bug that could cause this method to fail
+   even when a valid number was provided.
+
 2010-03-29 15:15  dts12
 
    * snmplib/snmpusm.c:
@@ -2594,6 +7637,152 @@
    traps.
    Reported by Srikapilan Gandhi
 
+2010-03-29 12:46  bvassche
+
+   * perl/SNMP/t/startagent.pl:
+
+   Catch stderr on Windows too.
+
+2010-03-29 11:48  bvassche
+
+   * perl/agent/agent.xs:
+
+   Builds again with pre-C90 compilers.
+
+2010-03-29 11:19  bvassche
+
+   *  include/net-snmp/library/snmp_api.h, perl/OID/OID.xs,   
+      perl/SNMP/SNMP.xs, perl/agent/agent.xs:
+
+   CHANGES: perl: fixed a memory leak triggered by destroying a
+   NetSNMP::agent::netsnmp_handler_registration object.
+   CHANGES: perl: fixed a memory leak triggered by failure of
+   creating a NetSNMP::OID object.
+   CHANGES: perl: fixed a memory leak triggered by the
+   NetSNMP::OID::gettable() subroutine.
+   CHANGES: perl: fixed an out-of-bounds array access triggered by
+   the implementation of NetSNMP::SNMP.
+   CHANGES: perl: fixed a memory leak triggered by a PDU processing
+   error in NetSNMP::SNMP.
+   CHANGES: perl: fixed memory leaks triggered by creating an SNMPv3
+   session via NetSNMP::SNMP.
+   
+   Also fixed the uninitialized variable accesses triggered by
+   adding a varbind to a PDU via NetSNMP::SNMP introduced a few days
+   ago.
+   
+   The bugs mentioned above have been found by inspecting the output
+   of the following shell command:
+   cd perl && valgrind --trace-children=yes --leak-check=full make
+   test
+
+2010-03-29 10:59  bvassche
+
+   * perl/SNMP/t/startagent.pl:
+
+   Switched back to the previous way of starting processes
+   asynchronously because it is more reliable.
+
+2010-03-29 09:27  bvassche
+
+   * perl/SNMP/t/startagent.pl:
+
+   Do not only save snmpd / snmptrapd logs but also the stdout /
+   stderr output generated by these processes.
+
+2010-03-28 18:00  bvassche
+
+   *  win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   Partially reverted r18382 on the 5.5 branch in order to preserve
+   backwards compatibility with already released Windows-headers.
+
+2010-03-28 16:09  bvassche
+
+   * perl/SNMP/t/startagent.pl:
+
+   Changes in perl/SNMP/t/startagent.pl:
+   - Added command-line option -d for snmpd and snmptrapd.
+   - snmpd and snmptrapd output is now saved to a log file (one per
+   test).
+   - Rewrote Perl code for starting the snmpd/snmptrapd processes
+   such that the same code works on Unix and on Windows.
+
+2010-03-28 13:37  bvassche
+
+   *  include/net-snmp/library/snmp_api.h, snmplib/tools.c,   
+      win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: snmplib: added the functions netsnmp_malloc(),
+   netsnmp_calloc(), netsnmp_realloc(), netsnmp_strdup() and
+   netsnmp_free().
+   CHANGES: Win32: snmplib: removed the troublesome #define malloc
+   netsnmp_malloc etc. This means that when calling functions from
+   the Net-SNMP DLL from C or C++ code that is being linked against
+   another version of the MSVC runtime DLL than the Net-SNMP DLL,
+   and when allocating memory that will be freed by the Net-SNMP
+   DLL, you will either have to call the Net-SNMP memory allocation
+   functions explicitly or redefine malloc() etc. yourself.
+
+2010-03-28 12:46  bvassche
+
+   * perl/SNMP/SNMP.xs:
+
+   Fixed a recently reintroduced compiler warning.
+
+2010-03-28 12:04  bvassche
+
+   * perl/default_store/test.pl:
+
+   Backported r18287 from the trunk.
+
+2010-03-27 19:19  bvassche
+
+   * perl/OID/OID.xs, perl/SNMP/SNMP.xs:
+
+   Builds again.
+
+2010-03-27 18:57  bvassche
+
+   *  perl/ASN/ASN.xs, perl/OID/OID.xs, perl/SNMP/SNMP.xs,   
+      perl/TrapReceiver/TrapReceiver.xs, perl/TrapReceiver/ppport.h,   
+      perl/agent/agent.xs:
+
+   Backported r18282, r18283 and r18312 from trunk, which fix most
+   compiler warnings triggered by compilation of the XSUBs.
+
+2010-03-27 18:52  bvassche
+
+   *  perl/ASN/ASN.xs, perl/ASN/Makefile.PL, perl/OID/Makefile.PL,   
+      perl/OID/OID.xs, perl/TrapReceiver/Makefile.PL,   
+      perl/TrapReceiver/TrapReceiver.xs, perl/agent/Makefile.PL,   
+      perl/agent/Support/Makefile.PL, perl/agent/agent.xs,   
+      perl/agent/default_store/Makefile.PL,   
+      perl/agent/default_store/default_store.xs,   
+      perl/default_store/Makefile.PL,   
+      perl/default_store/default_store.xs:
+
+   Backported r18248, which makes compilation of the Perl XSUBs more
+   silent.
+
+2010-03-26 19:16  bvassche
+
+   *  include/net-snmp/library/snmp_api.h, perl/OID/OID.xs,   
+      perl/SNMP/SNMP.xs, perl/TrapReceiver/TrapReceiver.xs:
+
+   Follow-up for r18368 and r18369: made sure that the Net-SNMP Perl
+   extensions compile without triggering preprocessor warnings about
+   redefining malloc etc. nor trigger "Free to wrong pool" errors on
+   Windows.
+
+2010-03-26 12:04  bvassche
+
+   * snmplib/strtoull.c:
+
+   Removed a superfluous #include directive.
+
 2010-03-25 20:07  bvassche
 
    * agent/mibgroup/agentx/agentx_config.c:
@@ -2604,6 +7793,53 @@
    connect to an AgentX master agent running on the same system
    without having to set the variable NETSNMP_DS_AGENT_X_SOCKET.
 
+2010-03-25 16:11  bvassche
+
+   *  perl/OID/OID.xs, perl/SNMP/SNMP.xs,   
+      perl/TrapReceiver/TrapReceiver.xs, perl/agent/agent.xs:
+
+   CHANGES: Win32: perl: fixed several "Free to wrong pool" errors.
+   Note: since calloc() is not redefined in <CORE/XSUB.h> using
+   calloc() directly or indirectly leads to "Free to wrong pool"
+   errors, at least on Windows.
+
+2010-03-25 16:04  bvassche
+
+   *  win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: Win32: building: made building more silent by not
+   redefining malloc() or free() during compilation of Perl
+   extensions (resulted in warnings about malloc() / free()
+   redefinition in the Perl header CORE/XSUB.h).
+
+2010-03-25 15:06  bvassche
+
+   *  configure, configure.d/config_os_functions,   
+      include/net-snmp/library/system.h,   
+      include/net-snmp/net-snmp-config.h.in, perl/SNMP/SNMP.xs,   
+      perl/agent/agent.xs:
+
+   CHANGES: BUG: 2969872: made sure that SOCK_STARTUP is invoked
+   before init_agent() on Windows.
+
+2010-03-25 13:30  bvassche
+
+   *  win32/Configure, win32/libsnmp_dll/libsnmp.def,   
+      win32/libsnmp_dll/libsnmp.def.in:
+
+   CHANGES: Win32: building: simplified the build process by
+   removing the file win32/libsnmp_dll/libsnmp.def.in. Which IPv6
+   functions are exported from netsnmp.dll is now determined by
+   which of the functions in this DLL have been declared as
+   NETSNMP_IMPORT.
+
+2010-03-25 13:27  bvassche
+
+   * include/net-snmp/library/snmpUDPIPv6Domain.h:
+
+   Windows DLL build fix.
+
 2010-03-22 16:10  dts12
 
    * mibs/NET-SNMP-PASS-MIB.txt:
@@ -2618,6 +7854,15 @@
    Follow-up for r18349: added missing comma such that it is again
    possible to compile UCD-DISKIO-MIB.
 
+2010-03-22 13:59  dts12
+
+   *  man/snmp_api_errstring.3, man/snmp_close.3, man/snmp_error.3,   
+      man/snmp_free_pdu.3, man/snmp_open.3, man/snmp_perror.3,   
+      man/snmp_read.3, man/snmp_select_info.3, man/snmp_send.3,   
+      man/snmp_sess_perror.3, man/snmp_timeout.3:
+
+   CHANGES: man: BUG: 2972860: Update broken references
+
 2010-03-22 13:49  dts12
 
    *  mibs/UCD-DISKIO-MIB.txt, mibs/UCD-DLMOD-MIB.txt,   
@@ -2641,6 +7886,29 @@
 
    Fixed the compiler warnings reported by gcc (MinGW).
 
+2010-03-20 09:14  bvassche
+
+   * agent/mibgroup/winExtDLL.c:
+
+   Refactoring: moved duplicated code into a new function.
+
+2010-03-19 13:12  bvassche
+
+   * agent/agent_registry.c:
+
+   CHANGES: snmpd: made the error message that is logged when
+   duplicate registration is attempted more detailed.
+   
+   An example:
+   (before)
+   duplicate registration (mibII/snmp,
+   C:\WINDOWS\System32\snmpmib.dll)
+   handler registration failed.
+   (after)
+   duplicate registration: MIB modules mibII/snmp and
+   C:\WINDOWS\System32\snmpmib.dll (oid .1.3.6.1.2.1.11).
+   handler registration failed.
+
 2010-03-19 12:40  bvassche
 
    *  agent/mibgroup/winExtDLL.c, win32/libsnmp_dll/libsnmp.def,   
@@ -2659,13 +7927,6 @@
    by every request for which a response with non-zero error status
    is sent back.
 
-2010-03-19 11:41  bvassche
-
-   * agent/snmp_agent.c:
-
-   Reverted r18324 since the 5.4 branch is in RC stage and a
-   leak-at-exit is not a showstopper.
-
 2010-03-17 13:41  bvassche
 
    * mibs/NET-SNMP-AGENT-MIB.txt, mibs/NET-SNMP-EXTEND-MIB.txt:
@@ -2685,85 +7946,12 @@
    CHANGES: BUG: 2971257: Fixed winExtDLL handling of multi-varbind
    getNext requests with OIDs in reverse lexicographical order.
 
-2010-03-14 22:56  dts12
+2010-03-16 19:18  bvassche
 
-   * CHANGES, NEWS:
+   * agent/mibgroup/winExtDLL.c:
 
-   version update
-
-2010-03-14 22:31  dts12
-
-   * ChangeLog:
-
-   version update
-
-2010-03-14 22:28  dts12
-
-   * agent/Makefile.depend, agent/mibgroup/Makefile.depend:
-
-   make depend
-
-2010-03-14 22:19  dts12
-
-   * agent/Makefile.depend, agent/mibgroup/Makefile.depend:
-
-   make depend
-
-2010-03-14 22:19  dts12
-
-   * agent/Makefile.depend, agent/mibgroup/Makefile.depend:
-
-   make depend
-
-2010-03-14 22:10  dts12
-
-   *  man/netsnmp_agent.3, man/netsnmp_agent_registry.3,   
-      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
-      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
-      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
-      man/netsnmp_container.3, man/netsnmp_data_list.3,   
-      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
-      man/netsnmp_handler.3, man/netsnmp_instance.3,   
-      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
-      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
-      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
-      man/netsnmp_multiplexer.3,   
-      man/netsnmp_netsnmp_agent_request_info_s.3,   
-      man/netsnmp_netsnmp_column_info_t.3,   
-      man/netsnmp_netsnmp_data_list_s.3,   
-      man/netsnmp_netsnmp_handler_registration_s.3,   
-      man/netsnmp_netsnmp_iterator_info_s.3,   
-      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_s.3,   
-      man/netsnmp_netsnmp_request_info_s.3,   
-      man/netsnmp_netsnmp_table_registration_info_s.3,   
-      man/netsnmp_netsnmp_table_request_info_s.3,   
-      man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,   
-      man/netsnmp_read_config.3, man/netsnmp_read_only.3,   
-      man/netsnmp_row_merge.3, man/netsnmp_scalar.3,   
-      man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,   
-      man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,   
-      man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,   
-      man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,   
-      man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,   
-      man/netsnmp_table.3, man/netsnmp_table_array.3,   
-      man/netsnmp_table_container.3, man/netsnmp_table_data.3,   
-      man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,   
-      man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,   
-      man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,  
-       man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
-      man/netsnmp_util.3, man/netsnmp_utilities.3,   
-      man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
-
-   documentation update
-
-2010-03-14 22:07  dts12
-
-   *  FAQ, README, configure, configure.in, dist/net-snmp.spec,   
-      snmplib/snmp_version.c:
-
-   Version number update
+   CHANGES: Win32: winExtDLL: fixed a bug in getNext handling that
+   could cause the MIB output to be truncated.
 
 2010-03-12 11:53  dts12
 
@@ -2773,11 +7961,12 @@
    header token
    Patch supplied by Dan Nelson
 
-2010-03-11 16:52  dts12
+2010-03-12 11:43  dts12
 
-   * man/snmpcmd.1.def:
+   * agent/mibgroup/etherlike-mib/data_access/dot3stats_linux.c:
 
-   Document the format of the -e/-E command line options.
+   Remove duplicate definition of
+   getulongfromsysclassnetstatistics()
 
 2010-03-11 16:47  dts12
 
@@ -2808,6 +7997,15 @@
    CHANGES: PATCH: 2937996: Add Date: header to email send by
    traptoemail
 
+2010-03-11 14:50  dts12
+
+   *  agent/mibgroup/etherlike-mib/data_access/dot3stats_linux.c,   
+      agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_access.c:
+
+   CHANGES: snmpd: PATCH: 2967400: Retrieve error counters for the
+   EtherLike-MIB
+   Patch supplied by Josef Moellers.
+
 2010-03-11 14:23  dts12
 
    * agent/mibgroup/ucd-snmp/pass.c:
@@ -2823,6 +8021,21 @@
    CHANGES: snmpd: PATCH: 2956657: Handle over-length AgentX OIDs.
    Patch provided by Rob West
 
+2010-03-11 12:23  dts12
+
+   * agent/mibgroup/ip-mib/data_access/defaultrouter_common.c:
+
+   Provide missing debug parameter.
+   Patch provided by Andreas Jaeger.
+
+2010-03-11 12:21  dts12
+
+   * agent/mibgroup/hardware/sensors/hw_sensors.c:
+
+   Provide missing (dummy) return value, to suppress compiler
+   warning.
+   Patch provided by Andreas Jaeger.
+
 2010-03-11 12:19  dts12
 
    * agent/mibgroup/ucd-snmp/pass.c:
@@ -2837,7 +8050,7 @@
 
 2010-03-11 11:57  dts12
 
-   * configure, configure.in:
+   * configure, configure.d/config_os_misc4:
 
    Replace backquote with single quote in configure output message.
    While this change is probably not strictly necessary, it feels
@@ -2868,21 +8081,310 @@
    CHANGES: snmpd: PATCH: 2950845: Fix ifHighSpeed calculation
    Patch provided by Leonardo Chiquitto
 
-2010-03-03 16:11  jsafranek
+2010-03-09 17:48  bvassche
+
+   * include/net-snmp/mib_api.h:
+
+   CHANGES: Win32: exported netsnmp_read_module() from netsnmp.dll
+   such that NetSNMP.pm builds again.
+
+2010-03-09 17:47  bvassche
+
+   * win32/libagent/Makefile.in, win32/libsnmp_dll/Makefile.in:
+
+   Simplified two makefiles used by build.bat (Win32).
+
+2010-03-09 17:44  bvassche
+
+   *  win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: Win32: building: libsnmp.dll builds now with MSVC 2002
+   and above without triggering a linker error about strtoull.
+   (Backported trunk r17886.)
+
+2010-03-09 17:24  bvassche
+
+   * perl/SNMP/SNMP.xs:
+
+   CHANGES: Win32: building: building NetSNMP.pm does no longer
+   trigger compiler warnings about redefining _WIN32_WINNT nor
+   NTDDI_VERSION.
+
+2010-03-09 17:22  bvassche
+
+   * perl/SNMP/Makefile.PL:
+
+   CHANGES: Win32: building: made building NetSNMP.pm more silent by
+   adding the MSVC compiler flags -D_CRT_SECURE_NO_WARNINGS
+   -D_CRT_NONSTDC_NO_WARNINGS.
+
+2010-03-02 16:54  bvassche
+
+   *  win32/Configure, win32/netsnmpmibs/Makefile.in,   
+      win32/snmpd/Makefile.in:
+
+   Follow-up for r18167 (merge of snmpd and snmpdsdk and also of
+   netsnmpmibs and netsnmpmibssdk): the batch file win32/build.bat
+   works again with the Platform SDK enabled.
+
+2010-03-02 16:52  bvassche
+
+   * win32/Makefile-apps.in:
+
+   Follow-up for r18215 (replaced the obsolete cl.exe option /GX by
+   the equivalent /EHsc; added /D "_CRT_SECURE_NO_WARNINGS", added
+   /D "_CRT_NONSTDC_NO_WARNINGS" and removed /Fp... and /YX).
+
+2010-02-28 15:56  bvassche
+
+   * snmplib/winservice.c:
+
+   Win32: fixed a compiler warning about redefinition of
+   _WIN32_WINNT by making sure that <net-snmp/net-snmp-config.h> is
+   included before <windows.h>.
+
+2010-02-28 15:24  bvassche
+
+   *  win32/libagent/Makefile.in, win32/libhelpers/Makefile.in,   
+      win32/libnetsnmptrapd/Makefile.in, win32/libsnmp/Makefile.in,   
+      win32/libsnmp_dll/Makefile.in, win32/netsnmpmibs/Makefile.in,   
+      win32/snmpd/Makefile.in, win32/snmpnetstat/Makefile.in,   
+      win32/snmptrapd/Makefile.in:
+
+   CHANGES: Win32: batch build: replaced the obsolete /GX by the
+   equivalent /EHsc.
+   CHANGES: Win32: batch build: added /D "_CRT_SECURE_NO_WARNINGS"
+   /D "_CRT_NONSTDC_NO_WARNINGS" to make building with MSVC 2008
+   more silent.
+   CHANGES: Win32: batch build: removed /Fp... and /YX. These
+   options influence how precompiled header files are generated,
+   which are not used inside the Net-SNMP project. /YX is not
+   supported by MSVC 2008.
+   CHANGES: Win32: batch build: removed a duplicate occurrence of
+   strtoull.obj.
+
+2010-02-28 14:11  bvassche
+
+   * win32/Configure, win32/Makefile.in:
+
+   Follow-up for r18167 (merge of snmpd and snmpdsdk and also of
+   netsnmpmibs and netsnmpmibssdk): applied the necessary changes to
+   the win32/Configure script and win32/Makefile.in.
+
+2010-02-28 11:40  bvassche
+
+   * win32/net-snmp/net-snmp-config.h.in:
+
+   Follow-up for r18181: synchronized net-snmp-config.h.in with
+   net-snmp-config.h.
+
+2010-02-23 19:03  bvassche
+
+   * configure, configure.d/config_project_manual:
+
+   CHANGES: building: when generating a default value for the system
+   location and no domain name is found in /etc/resolv.conf, use
+   "@no.where" instead of "".
+
+2010-02-23 18:50  bvassche
+
+   * configure, m4/ac_prompt_user.m4:
+
+   CHANGES: building: made sure that the configure script does no
+   longer invoke "tail -1", which is not POSIX-compliant.
+
+2010-02-23 17:43  bvassche
 
    * configure, include/net-snmp/net-snmp-config.h.in:
 
-   Regerate configure script after rev. 18193 (automatic RPM version
-   detection).
-   Net-SNMP should compile with rpm-4.6 automatically.
+   Follow-up for r18193 (jsafranek): reran autoreconf for the trunk
+   and the 5.5 branch.
 
 2010-02-23 12:27  jsafranek
 
-   * configure.in:
+   * configure.d/config_os_libs:
 
    CHANGES: building: Fixed compilation with rpm-4.6.
    Turn on the legacy API when rpm-4.6 is detected.
 
+2010-02-22 19:33  bvassche
+
+   *  configure, configure.d/config_modules_agent,   
+      configure.d/config_project_manual:
+
+   CHANGES: building: made sure that the configure script does no
+   longer invoke "tail -1", which is not POSIX-compliant.
+
+2010-02-21 19:23  bvassche
+
+   *  snmplib/tools.c, win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: Win32: made sure that redefining malloc() etc. in
+   win32/net-snmp/net-snmp-config.h does not trigger strange
+   compiler and linker errors.
+   
+   (Backported trunk r17910 and r18165).
+
+2010-02-21 19:20  bvassche
+
+   * win32/libsnmp_dll/libsnmp.def, win32/libsnmp_dll/libsnmp.def.in:
+
+   CHANGES: Win32: exported
+   netsnmp_query_get_default_session_unchecked() from netsnmp.dll.
+   
+   (Backported trunk r17918.)
+
+2010-02-21 18:58  bvassche
+
+   *  README.win32, win32/libsdll.dsw,   
+      win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in, win32/win32dll.dsw:
+
+   CHANGES: Win32: building: renamed libsdll.dsw into win32dll.dsw.
+   CHANGES: Win32: building: simplified linking the Net-SNMP
+   applications with netsnmp.dll by adding all application projects
+   to the same workspace that is used for building the DLL.
+   CHANGES: Win32: building: made building netsnmp.dll less error
+   prone by letting the compiler print an error message if the
+   preprocessor symbol NETSNMP_USE_DLL has not been defined.
+
+2010-02-21 18:51  bvassche
+
+   * win32/libsnmp_dll/libsnmp_dll.dsp:
+
+   CHANGES: Win32: building: Added libsnmp.def to the list of
+   libsnmp_dll.dsp source files such that the DLL is rebuilt when
+   the .def file has been modified.
+
+2010-02-21 18:45  bvassche
+
+   * win32/libsnmp_dll/libsnmp.def, win32/libsnmp_dll/libsnmp.def.in:
+
+   CHANGES: Win32: exported netsnmp_set_line_buffering() from
+   netsnmp.dll.
+
+2010-02-21 17:39  bvassche
+
+   *  snmplib/snmpUDPIPv6Domain.c, win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   More Win32 IPv6 source code consistency improvements:
+   - Moved #undef HAVE_IF_NAMETOINDEX from snmplib/*.c to
+   win32/net-snmp/net-snmp-config.h.
+   - Changed the global in6addr_any variable into a static variable
+   such that
+   multiple definitions do not trigger a linker error.
+   - Added typedefs for uint8_t, int8_t, uint16_t and int16_t.
+   - Replaced '#if NETSNMP_ENABLE_IPV6' by '#ifdef
+   NETSNMP_ENABLE_IPV6'.
+
+2010-02-20 09:10  bvassche
+
+   * apps/snmptable.c:
+
+   Backported trunk r17883, which fixes a typo introduced in r17881.
+
+2010-02-19 20:23  bvassche
+
+   *  agent/mibgroup/utilities/iquery.c,   
+      include/net-snmp/library/snmp_client.h, snmplib/snmp_client.c:
+
+   CHANGES: agent: do not complain that iquerySecName is missing in
+   snmpd.conf when its value won't be used.
+   
+   (Backported trunk r17917.)
+
+2010-02-19 19:44  bvassche
+
+   * win32/bin, win32/lib:
+
+   Updated Subversion ignore list.
+
+2010-02-19 19:39  bvassche
+
+   * win32/net-snmp/net-snmp-config.h.in:
+
+   Synchronized win32/net-snmp/net-snmp-config.h and
+   win32/net-snmp/net-snmp-config.h.in.
+
+2010-02-19 19:36  bvassche
+
+   *  agent/mibgroup/disman/traceroute/traceRouteCtlTable.c,   
+      agent/snmpd.c, apps/snmptable.c, apps/snmptrapd.c,   
+      include/net-snmp/library/snmp_logging.h, snmplib/snmp_logging.c:
+
+   CHANGES: Win32: line buffering does now work when Net-SNMP is
+   built with MSVC. This makes it a lot easier to debug Net-SNMP on
+   Win32 since each line does now appear in the output as soon as it
+   has been generated.
+   
+   This is a backport of r17881 from the trunk.
+
+2010-02-19 14:18  bvassche
+
+   *  include/net-snmp/library/system.h, win32/libsnmp_dll/libsnmp.def, 
+        win32/libsnmp_dll/libsnmp.def.in:
+
+   CHANGES: Win32: libsnmp builds again as a DLL when IPv6 is
+   enabled.
+
+2010-02-19 13:02  bvassche
+
+   *  README.win32, agent/mibgroup/winExtDLL.c, snmplib/winservice.c,   
+      win32/MgmtApi-winExtDLL.h, win32/Snmp-winExtDLL.h,   
+      win32/net-snmp/net-snmp-config.h,   
+      win32/netsnmpmibs/netsnmpmibs.dsp, win32/netsnmpmibssdk,   
+      win32/snmpdsdk, win32/win32.dsw, win32/win32sdk.dsw:
+
+   CHANGES: Win32: building: winExtDLL module is only built if
+   USING_WINEXTDLL_MODULE is defined.
+   CHANGES: Win32: building: simplified building winExtDLL by
+   including a copy of the MinGW headers <snmp.h> and <mgmtapi.h>.
+   CHANGES: Win32: building: dropped support for building Net-SNMP
+   with MSVC 6.0 without Platform SDK.
+   CHANGES: Win32: building: added project dependencies in win32.dsw
+   such that the Microsoft Visual Studio IDE can figure out the
+   proper project build order.
+   
+   (these changes have been backported from trunk revisions 17884,
+   18157 and 18163).
+
+2010-02-19 12:35  bvassche
+
+   * include/net-snmp/library/system.h:
+
+   CHANGES: Win32: building: builds again with MSVC 6.0.
+   
+   Backported r17869: changed the return type of strtoull() from
+   'unsigned
+   long long' (which is not valid C89) to 'uint64_t' (declared in
+   <net-snmp/net-snmp-config.h>).
+
+2010-02-18 09:45  bvassche
+
+   * include/net-snmp/library/types.h:
+
+   Source code cleanup:
+   - Moved documentation of netsnmp_large_fd_set members to the
+   comment
+   block just above the definition of this type.
+   - Removed superfluous 'extern "C"' specifier: this linkage
+   specifier
+   only has an effect on declarations of variables of functions and
+   not
+   on typedefs or struct definitions.
+   - Ran this header file through indent.
+
+2010-02-10 16:39  dts12
+
+   *  agent/mibgroup/etherlike-mib/data_access/dot3stats_linux.c,   
+      agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_access.c:
+
+   CHANGES: Linux: Improved EtherLike-MIB support
+   Patch supplied by Josef Moellers
+
 2010-02-10 10:04  dts12
 
    * python/netsnmp/client_intf.c:
@@ -2890,49 +8392,15 @@
    CHANGES: python: Support null-bytes in octet strings
    Patch supplied by Tommy Beadle
 
-2010-02-09 15:05  bvassche
+2010-02-05 09:52  jsafranek
 
-   *  ., README.win32, agent/mibgroup/winExtDLL.c,   
-      agent/mibgroup/winExtDLL.h, win32/MgmtApi-winExtDLL.h,   
-      win32/Snmp-winExtDLL.h:
+   * 
+      agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_access.c,
+        
+      agent/mibgroup/rmon-mib/etherStatsTable/etherStatsTable_data_access.c:
 
-   CHANGES: Win32: winExtDLL: works now on Windows Vista, Windows 7
-   and Windows 2008 too.
-   CHANGES: Win32: simplified building Net-SNMP + winExtDLL with
-   MSVC.
-   CHANGES: MinGW: winExtDLL: builds now.
-   Note: all these changes have been backported from the trunk.
-
-2010-02-09 14:29  bvassche
-
-   * include/net-snmp/library/snmp_logging.h:
-
-   CHANGES: Win32: added #include <stdio.h> in
-   include/net-snmp/library/snmp_logging.h such that Net-SNMP 5.5
-   builds again with Microsoft Visual Studio 6.
-
-2010-02-08 19:47  bvassche
-
-   *  ., agent/agent_handler.c, agent/helpers/table_dataset.c,   
-      include/net-snmp/agent/agent_handler.h,   
-      include/net-snmp/agent/snmp_agent.h,   
-      include/net-snmp/agent/table_data.h,   
-      include/net-snmp/agent/table_dataset.h,   
-      include/net-snmp/library/data_list.h:
-
-   CHANGES: snmpd, snmplib: Remove the inline declarations for
-   functions that lack an inline definition.
-   
-   Backported r16926 from the trunk to the 5.4 branch because Mario
-   Gartner posted
-   patch 2945202 in which he reported that gcc printed several
-   warnings like the
-   following for the code on the 5.4 branch:
-   include/net-snmp/agent/agent_handler.h:241: warning: inline
-   function 'void*
-   netsnmp_request_get_list_data(netsnmp_request_info*, const
-   char*)' used but
-   never defined
+   CHANGES: snmpd: fixed filedescriptior leak in Etherlike-MIB and
+   RMON-MIB
 
 2010-02-05 09:48  jsafranek
 
@@ -2958,14 +8426,6 @@
 
    CHANGES: building: 'make test TESTOPTS="-P tcp"' works fine now
 
-2010-01-31 01:42  tanders
-
-   * man/Makefile.in:
-
-   Follow-up for r17710 / backport of r17712: remove an obsolete
-   manual
-   page from the set of files that should be installed
-
 2010-01-29 20:07  jsafranek
 
    * testing/tests/T059trapdtraphandle:
@@ -3017,92 +8477,41 @@
 
    Fix minor typo in man page, it's snmpnetstat -Cp, not -CP.
 
+2010-01-14 12:34  jsafranek
+
+   * 
+      agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_access.c,
+        
+      agent/mibgroup/rmon-mib/etherStatsTable/etherStatsTable_data_access.c:
+
+   CHANGES: fixed memory leak in RMON-MIB and ETHERLIKE-MIB when
+   there are multiple aliases of an network interface
+   Rationale: the aliased interfaces have the same ifIndex ->
+   CONTAINER_INSERT fails, but the rejected entry was not freed.
+
+2010-01-13 11:21  jsafranek
+
+   * agent/mibgroup/if-mib/data_access/interface_linux.c:
+
+   CHANGES: snmpd: fix memory leak in ipAddressPrefixTable
+   - net_snmp_search_update_prefix_info returns different code, when
+   the entry was not inserted to list and can be freed.
+
+2010-01-12 00:52  tanders
+
+   * configure, configure.d/config_os_libs:
+
+   CHANGES: build: run rpm configure checks for hr_swinst rewrite
+   (rpm
+   version only)
+
 2010-01-07 19:42  hardaker
 
-   *  agent/mibgroup/hardware/cpu/cpu_sysctl.c,   
-      agent/mibgroup/host/hr_swinst.c:
+   * agent/mibgroup/hardware/cpu/cpu_sysctl.c:
 
    Patch from Stephen Hemminger to fix a minor memleak in cpu
    sysctrl fetching
 
-2010-01-06 17:56  dts12
-
-   * CHANGES:
-
-   version update
-
-2010-01-06 17:25  dts12
-
-   * ChangeLog:
-
-   version update
-
-2010-01-06 17:06  dts12
-
-   *  agent/Makefile.depend, agent/helpers/Makefile.depend,   
-      agent/mibgroup/Makefile.depend, apps/Makefile.depend,   
-      apps/snmpnetstat/Makefile.depend, snmplib/Makefile.depend:
-
-   make depend
-
-2010-01-06 17:06  dts12
-
-   *  agent/Makefile.depend, agent/helpers/Makefile.depend,   
-      agent/mibgroup/Makefile.depend, apps/Makefile.depend,   
-      apps/snmpnetstat/Makefile.depend, snmplib/Makefile.depend:
-
-   make depend
-
-2010-01-06 16:55  dts12
-
-   *  man/netsnmp_agent.3, man/netsnmp_agent_registry.3,   
-      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
-      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
-      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
-      man/netsnmp_container.3, man/netsnmp_data_list.3,   
-      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
-      man/netsnmp_handler.3, man/netsnmp_instance.3,   
-      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
-      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
-      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
-      man/netsnmp_multiplexer.3,   
-      man/netsnmp_netsnmp_agent_request_info_s.3,   
-      man/netsnmp_netsnmp_column_info_t.3,   
-      man/netsnmp_netsnmp_data_list_s.3,   
-      man/netsnmp_netsnmp_handler_registration_s.3,   
-      man/netsnmp_netsnmp_iterator_info_s.3,   
-      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_s.3,   
-      man/netsnmp_netsnmp_request_info_s.3,   
-      man/netsnmp_netsnmp_table_registration_info_s.3,   
-      man/netsnmp_netsnmp_table_request_info_s.3,   
-      man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,   
-      man/netsnmp_read_config.3, man/netsnmp_read_only.3,   
-      man/netsnmp_row_merge.3, man/netsnmp_scalar.3,   
-      man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,   
-      man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,   
-      man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,   
-      man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,   
-      man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,   
-      man/netsnmp_table.3, man/netsnmp_table_array.3,   
-      man/netsnmp_table_container.3, man/netsnmp_table_data.3,   
-      man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,   
-      man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,   
-      man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,  
-       man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
-      man/netsnmp_util.3, man/netsnmp_utilities.3,   
-      man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
-
-   documentation update
-
-2010-01-06 16:43  dts12
-
-   *  FAQ, README, configure, configure.in, dist/net-snmp.spec,   
-      snmplib/snmp_version.c:
-
-   Version number update
-
 2010-01-06 13:33  jsafranek
 
    * agent/mibgroup/mibII/at.c, agent/mibgroup/mibII/at.h:
@@ -3121,7 +8530,8 @@
 
    * snmplib/snmpUnixDomain.c:
 
-   CHANGES: snmplib: BUGS: 2922390: Fix test for missing contextName parameter
+   CHANGES: snmplib: BUGS: 2922390: Fix test for missing contextName
+   parameter
 
 2010-01-05 22:33  dts12
 
@@ -3147,9 +8557,39 @@
 
    * agent/mibgroup/agentx/protocol.c:
 
-   CHANGES: snmpd: PATCH: 2912584: Fix null OID handling in Agentx on 64bit
+   CHANGES: snmpd: PATCH: 2912584: Fix null OID handling in Agentx
+   on 64bit
    Patch supplied by Lutz Jaenicke
 
+2010-01-05 10:11  tanders
+
+   * include/net-snmp/system/hpux.h:
+
+   CHANGES: hpux: fix build error on HP-UX 10.20
+
+2010-01-05 08:42  jsafranek
+
+   * man, man/pdu_api.3, man/session_api.3, man/varbind_api.3:
+
+   Remove generated man pages from repository.
+
+2009-12-23 09:49  jsafranek
+
+   *  agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c,   
+      agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.h,   
+      agent/mibgroup/ip-mib/data_access/ipaddress_linux.c:
+
+   Fix invalid read reported by valgrind:
+   Invalid read of size 1
+   memcpy (mc_replace_strmem.c:402)
+   _netsnmp_ioctl_ipaddress_container_load_v4
+   (ipaddress_ioctl.c:240)
+   netsnmp_arch_ipaddress_container_load (ipaddress_linux.c:158)
+   netsnmp_access_ipaddress_container_load (ipaddress_common.c:112)
+   
+   Returning structure with pointers inside is not the best thing to
+   do.
+
 2009-12-22 07:59  bvassche
 
    * snmplib/read_config.c:
@@ -3163,6 +8603,25 @@
    string
    read by this function.
 
+2009-12-21 14:29  jsafranek
+
+   * agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c:
+
+   CHANGES: snmpd: fix crash in IF-MIB and IP-MIB when there are
+   some interfaces with broadcast IP address and some without.
+   
+   Reset the bcastentry in the loop, so it cannot be inserted to the
+   container
+   twice.
+   
+   Without this patch, when an interface without broadcast address
+   is processed,
+   the bcastaddress from previous loop is inserted into the
+   container. This
+   obviously fails and the bcastentry is freed, but the container
+   still contains
+   reference to it -> SIGSEGV.
+
 2009-12-21 13:52  bvassche
 
    * snmplib/read_config.c:
@@ -3217,7 +8676,8 @@
    * agent/mibgroup/notification-log-mib/notification_log.c:
 
    Applied patch #2912068, which fixes a memory leak during startup.
-   The function log_notification() adds a row to the table
+   The
+   function log_notification() adds a row to the table
    nlmLogVarTable, but
    this function can be called before that table has been
    initialized. If
@@ -3246,7 +8706,8 @@
 
    * README.win32:
 
-   Backported r17901 (spelling fixes and hrSystemUptime documentation).
+   Backported r17901 (spelling fixes and hrSystemUptime
+   documentation).
 
 2009-12-17 10:03  dts12
 
@@ -3267,12 +8728,28 @@
    traps is now
    correct.
 
+2009-12-10 15:52  dts12
+
+   * agent/mibgroup/smux/smux.c:
+
+   CHANGES: agent: PATCHES: 2911970: Properly terminate linked list
+   of registrations.
+   Patch provided by Mirko Deckert.
+
 2009-12-10 15:43  dts12
 
    *  agent/mibgroup/disman/mteTriggerTable.c,   
       agent/mibgroup/utilities/iquery.c:
 
-   CHANGES: snmpd: PATCHES: 2911323: Fix agent lockup when monitoring AgentX-delegated information
+   CHANGES: snmpd: PATCHES: 2911323: Fix agent lockup when
+   monitoring AgentX-delegated information
+
+2009-12-10 14:53  dts12
+
+   * agent/mibgroup/agentx/subagent.c:
+
+   Backport of SVN revisions 17870/17894,
+   to handle const warnings.
 
 2009-12-10 12:54  bvassche
 
@@ -3292,7 +8769,9 @@
    *  agent/mibgroup/ip-mib/data_access/arp_linux.c,   
       include/net-snmp/data_access/arp.h:
 
-   CHANGES: snmpd: Add support of network interfaces with HW address bigger than 6 bytes to ipNetToMediaTable and ipNetToPhysicalTable.
+   CHANGES: snmpd: Add support of network interfaces with HW address
+   bigger than 6 bytes to ipNetToMediaTable and
+   ipNetToPhysicalTable.
    Some HW, like InfiniBand, uses HW addresses with 9 and more
    bytes. Snmpd on Linux was not able to parse /proc/net/arp then
    and produced ugly 'ioctl 35123 returned -1' to log.
@@ -3301,7 +8780,8 @@
 
    * agent/mibgroup/util_funcs.c, snmplib/system.c:
 
-   CHANGES: snmplib, snmpd: Make sure that a mask is given to open when O_CREAT is specified
+   CHANGES: snmplib, snmpd: Make sure that a mask is given to open
+   when O_CREAT is specified
 
 2009-12-07 10:46  dts12
 
@@ -3310,12 +8790,19 @@
    Tweak missing subidentifier processing to be more type-aware.
    (An issue with AIX, at least)
 
+2009-12-05 20:19  tanders
+
+   * include/net-snmp/library/system.h:
+
+   fix declaration of strtoull
+
 2009-12-05 17:42  tanders
 
    * perl/SNMP/SNMP.xs:
 
    call netsnmp_read_module instead of read_module to make it
-   compile with NETSNMP_CLEAN_NAMESPACE
+   compile with
+   NETSNMP_CLEAN_NAMESPACE
 
 2009-12-05 17:19  tanders
 
@@ -3344,7 +8831,7 @@
 
 2009-12-01 12:36  dts12
 
-   * include/net-snmp/library/snmp_api.h:
+   * include/net-snmp/types.h:
 
    Update a redundant (and probably inaccurate) comment.
 
@@ -3352,19 +8839,22 @@
 
    * agent/helpers/table.c:
 
-   CHANGES: agent: BUGS: 2822360: Fix memory leak when building table OIDs
+   CHANGES: agent: BUGS: 2822360: Fix memory leak when building
+   table OIDs
 
 2009-12-01 12:08  dts12
 
    * apps/snmptable.c:
 
-   CHANGES: snmptable: BUGS: 2837998: Handle missing instance subidentifiers in results
+   CHANGES: snmptable: BUGS: 2837998: Handle missing instance
+   subidentifiers in results
 
 2009-12-01 11:56  dts12
 
    * agent/mibgroup/agentx/client.c:
 
-   CHANGES: agent: BUGS: 2841008: Protect against crash following failed AgentX response
+   CHANGES: agent: BUGS: 2841008: Protect against crash following
+   failed AgentX response
 
 2009-11-30 16:55  dts12
 
@@ -3377,52 +8867,82 @@
 
    * local/mib2c.old-api.conf:
 
-   CHANGES: mib2c: BUGS: 2888569: Fix generation of table columns array
+   CHANGES: mib2c: BUGS: 2888569: Fix generation of table columns
+   array
 
 2009-11-30 16:30  dts12
 
    * agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c:
 
-   CHANGES: agent: BUGS: 2894059: Handle errors when counting interfaces
+   CHANGES: agent: BUGS: 2894059: Handle errors when counting
+   interfaces
 
 2009-11-30 16:07  dts12
 
    * agent/mibgroup/ucd-snmp/vmstat.c:
 
-   CHANGES: agent: BUG: 2897000: Suppress 32-bit counter truncation warnings.
+   CHANGES: agent: BUG: 2897000: Suppress 32-bit counter truncation
+   warnings.
+
+2009-11-30 15:34  dts12
+
+   * agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c:
+
+   CHANGES: agent: PATCH: 2903092: Fix broken handling of broadcast
+   entries.
 
 2009-11-30 15:19  dts12
 
    * agent/mibgroup/ucd-snmp/pass_persist.c:
 
-   CHANGES: agent: PATCH: 2901029: Fix compiler warning on CloseHandle()
+   CHANGES: agent: PATCH: 2901029: Fix compiler warning on
+   CloseHandle()
    Endian problems already addressed by patch #2835576
 
 2009-11-30 15:13  dts12
 
    * perl/agent/agent.xs:
 
-   CHANGES: perl: PATCH: 2890931: Better handling of Counter64 values.
+   CHANGES: perl: PATCH: 2890931: Better handling of Counter64
+   values.
    Patch provided by Max Romanov.
 
 2009-11-30 15:07  dts12
 
    * agent/mibgroup/ucd-snmp/vmstat_solaris2.c:
 
-   CHANGES: agent: PATCH: 2887816: Protect against division-by-zero crash
+   CHANGES: agent: PATCH: 2887816: Protect against division-by-zero
+   crash
+
+2009-11-30 15:03  dts12
+
+   * agent/mibgroup/if-mib/ifTable/ifTable_data_access.c:
+
+   CHANGES: agent: PATCH: 2883220: Fix compilation problems when
+   ifXTable is not included.
 
 2009-11-30 14:49  dts12
 
    * agent/mibgroup/ucd-snmp/proxy.c:
 
-   CHANGES: agent: PATCH: 2883155: Fix memory leak in proxy handling.
+   CHANGES: agent: PATCH: 2883155: Fix memory leak in proxy
+   handling.
    Patch supplied by Gowtham Thommandra.
 
 2009-11-30 14:12  dts12
 
    * agent/mibgroup/agentx/subagent.c:
 
-   CHANGES: agent: PATCH: 2877518: Fix handling of scoped AgentX variables
+   CHANGES: agent: PATCH: 2877518: Fix handling of scoped AgentX
+   variables
+
+2009-11-30 14:01  dts12
+
+   *  agent/mibgroup/ucd-snmp/pass.c,   
+      agent/mibgroup/ucd-snmp/pass_persist.c:
+
+   CHANGES: agent: PATCH: 2835576: Fix endianness issues in
+   pass/pass_persist
 
 2009-11-27 08:54  jsafranek
 
@@ -3430,11 +8950,21 @@
 
    Remove executable attribute from source files.
 
+2009-11-19 22:52  magfr
+
+   *  agent/helpers/watcher.c, agent/mibgroup/mibII/system_mib.c,   
+      include/net-snmp/agent/watcher.h:
+
+   CHANGES: snmpd: BUG: 2900078: Add support for OID variables with
+   size in elements instead of bytes, correct sysObjectID to use
+   this.
+
 2009-11-13 12:59  jsafranek
 
    * agent/mibgroup/mibII/ip.c, agent/mibgroup/mibII/tcp.c:
 
-   CHANGES: snmpd: Fixed logging of 'truncating integer value > 32 bits' in IP-MIB and TCP-MIB
+   CHANGES: snmpd: Fixed logging of 'truncating integer value > 32
+   bits' in IP-MIB and TCP-MIB
    The counters, which grow fast are now cut to 32bits.
 
 2009-11-11 09:00  dts12
@@ -3445,90 +8975,22 @@
    Return success/failure values from cache load routine.
    Problem identified by Xuan.
 
-2009-10-29 16:05  dts12
+2009-10-27 06:44  magfr
 
-   *  FAQ, README, configure, configure.in, dist/net-snmp.spec,   
-      perl/ASN/ASN.pm, perl/AnyData_SNMP/Storage.pm, perl/OID/OID.pm,   
-      perl/SNMP/SNMP.pm, perl/TrapReceiver/TrapReceiver.pm,   
-      perl/agent/Support/Support.pm, perl/agent/agent.pm,   
-      perl/agent/default_store/default_store.pm,   
-      perl/default_store/default_store.pm, sedscript.in,   
-      snmplib/snmp_version.c:
+   *  local/mib2c-conf.d/generic-table-indexes-to-oid.m2i,   
+      local/mib2c.access_functions.conf, local/mib2c.container.conf,   
+      local/mib2c.iterate.conf, local/mib2c.iterate_access.conf,   
+      local/mib2c.row.conf, local/mib2c.scalar.conf,   
+      local/mib2c.table_data.conf:
 
-   - version tag ( 5.4.3.pre1 )
-
-2009-10-29 14:24  dts12
-
-   * CHANGES, NEWS:
-
-   version update
-
-2009-10-29 11:46  dts12
-
-   * ChangeLog:
-
-   version update
-
-2009-10-29 10:30  dts12
-
-   *  man/netsnmp_agent.3, man/netsnmp_agent_registry.3,   
-      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
-      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
-      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
-      man/netsnmp_container.3, man/netsnmp_data_list.3,   
-      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
-      man/netsnmp_handler.3, man/netsnmp_instance.3,   
-      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
-      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
-      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
-      man/netsnmp_multiplexer.3,   
-      man/netsnmp_netsnmp_agent_request_info_s.3,   
-      man/netsnmp_netsnmp_column_info_t.3,   
-      man/netsnmp_netsnmp_data_list_s.3,   
-      man/netsnmp_netsnmp_handler_registration_s.3,   
-      man/netsnmp_netsnmp_iterator_info_s.3,   
-      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_s.3,   
-      man/netsnmp_netsnmp_request_info_s.3,   
-      man/netsnmp_netsnmp_table_registration_info_s.3,   
-      man/netsnmp_netsnmp_table_request_info_s.3,   
-      man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,   
-      man/netsnmp_read_config.3, man/netsnmp_read_only.3,   
-      man/netsnmp_row_merge.3, man/netsnmp_scalar.3,   
-      man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,   
-      man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,   
-      man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,   
-      man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,   
-      man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,   
-      man/netsnmp_table.3, man/netsnmp_table_array.3,   
-      man/netsnmp_table_container.3, man/netsnmp_table_data.3,   
-      man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,   
-      man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,   
-      man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,  
-       man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
-      man/netsnmp_util.3, man/netsnmp_utilities.3,   
-      man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
-
-   documentation update
-
-2009-10-29 10:28  dts12
-
-   * doxygen.conf:
-
-   - version tag ( 5.4.3.pre1 )
-
-2009-10-29 09:55  dts12
-
-   * Makefile.top:
-
-   version update
+   CHANGES: mib2c: Remove unnecessary casts to u_char*
 
 2009-10-09 12:38  jsafranek
 
    * snmplib/snmp_client.c:
 
-   CHANGES: snmplib: PATCH: 2871747: plug memory leak in OID processing.
+   CHANGES: snmplib: PATCH:2871747: plug memory leak in OID
+   processing.
    The memory leaked when small OID, which could fit pre-allocated
    vp->name_loc, was placed in different (allocated) one.
 
@@ -3546,6 +9008,18 @@
    CHANGES: snmplib: Change the parsing of ranges to accept all
    valid values.
 
+2009-10-07 22:24  magfr
+
+   *  agent/mibgroup/examples/example.c, agent/mibgroup/smux/smux.c,   
+      agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable_interface.c,
+         configure, configure.d/config_os_functions,   
+      include/net-snmp/net-snmp-config.h.in,   
+      win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: misc: PATCH: 2836112: Use the right modifier when
+   printing size_t and ssize_t variables.
+
 2009-10-07 12:50  jsafranek
 
    * agent/mibgroup/mibII/vacm_vars.c:
@@ -3556,12 +9030,20 @@
 
 2009-10-05 19:19  magfr
 
-   *  include/net-snmp/library/file_utils.h,   
+   *  include/net-snmp/library/dir_utils.h,   
+      include/net-snmp/library/file_utils.h,   
       include/net-snmp/library/text_utils.h:
 
    CHANGES: snmplib: Correct the spelling of __cplusplus when
    checking if the file should be wrapped in extern "C".
 
+2009-10-05 06:13  magfr
+
+   * apps/snmpwalk.c:
+
+   CHANGES: snmpwalk: Handle the case when the end oid is longer
+   than the current oid correctly
+
 2009-09-30 10:12  dts12
 
    * agent/mibgroup/host/hr_swinst.c:
@@ -3570,18 +9052,386 @@
    information crashing the agent.
    Problem reported by Inyaven Sakarai.
 
+2009-09-24 03:49  hardaker
+
+   * .:
+
+   5.5 branched
+
+
+----------------------------------------------------------------------
+
+Changes: V5.4 -> V5.5
+
+2009-09-23 23:42  hardaker
+
+   *  man/netsnmp_access_multiplexer.3, man/netsnmp_agent.3,   
+      man/netsnmp_agent_handler.h.3, man/netsnmp_agent_registry.3,   
+      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
+      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
+      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
+      man/netsnmp_container.3, man/netsnmp_container_iterator.3,   
+      man/netsnmp_container_iterator.h.3, man/netsnmp_data_list.3,   
+      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
+      man/netsnmp_handler.3, man/netsnmp_instance.3,   
+      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
+      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
+      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
+      man/netsnmp_multiplexer.3,   
+      man/netsnmp_netsnmp_agent_request_info_s.3,   
+      man/netsnmp_netsnmp_column_info_t.3,   
+      man/netsnmp_netsnmp_data_list_s.3,   
+      man/netsnmp_netsnmp_handler_registration_s.3,   
+      man/netsnmp_netsnmp_iterator_info_s.3,   
+      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_s.3,   
+      man/netsnmp_netsnmp_monitor_callback_header_s.3,   
+      man/netsnmp_netsnmp_request_info_s.3,   
+      man/netsnmp_netsnmp_table_registration_info_s.3,   
+      man/netsnmp_netsnmp_table_request_info_s.3,   
+      man/netsnmp_null_container.3, man/netsnmp_oid_stash.3,   
+      man/netsnmp_old_api.3, man/netsnmp_read_config.3,   
+      man/netsnmp_read_only.3, man/netsnmp_row_merge.3,   
+      man/netsnmp_scalar.3, man/netsnmp_scalar_group_group.3,   
+      man/netsnmp_serialize.3, man/netsnmp_snmp_agent.3,   
+      man/netsnmp_snmp_alarm.3, man/netsnmp_snmp_client.3,   
+      man/netsnmp_snmp_logging.3, man/netsnmp_snmp_pdu.3,   
+      man/netsnmp_snmp_session.3, man/netsnmp_stash_cache.3,   
+      man/netsnmp_stash_to_next.3, man/netsnmp_table.3,   
+      man/netsnmp_table_array.3, man/netsnmp_table_container.3,   
+      man/netsnmp_table_data.3, man/netsnmp_table_dataset.3,   
+      man/netsnmp_table_generic.3, man/netsnmp_table_indexes.3,   
+      man/netsnmp_table_iterator.3, man/netsnmp_table_iterator.h.3,   
+      man/netsnmp_table_maintenance.3, man/netsnmp_table_row.3,   
+      man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
+      man/netsnmp_tools.h.3, man/netsnmp_util.3,   
+      man/netsnmp_utilities.3, man/netsnmp_variable_list.3,   
+      man/netsnmp_watcher.3:
+
+   documentation update
+
 2009-09-23 23:40  hardaker
 
    * FAQ:
 
+   remove SVN branch wording
+
+2009-09-23 23:36  hardaker
+
+   * FAQ:
+
    proper project capitalization
 
+2009-09-23 23:35  hardaker
+
+   *  FAQ, README, configure, configure.ac, dist/Makefile,   
+      dist/net-snmp.spec:
+
+   Version number update
+
+2009-09-23 23:30  hardaker
+
+   * man/pdu_api.3, man/session_api.3, man/varbind_api.3:
+
+   version update
+
 2009-09-22 21:51  tanders
 
    * README.solaris:
 
    fix typos
 
+2009-09-14 22:39  hardaker
+
+   *  man/netsnmp_access_multiplexer.3, man/netsnmp_agent.3,   
+      man/netsnmp_agent_handler.h.3, man/netsnmp_agent_registry.3,   
+      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
+      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
+      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
+      man/netsnmp_container.3, man/netsnmp_container_iterator.3,   
+      man/netsnmp_container_iterator.h.3, man/netsnmp_data_list.3,   
+      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
+      man/netsnmp_handler.3, man/netsnmp_instance.3,   
+      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
+      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
+      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
+      man/netsnmp_multiplexer.3,   
+      man/netsnmp_netsnmp_agent_request_info_s.3,   
+      man/netsnmp_netsnmp_column_info_t.3,   
+      man/netsnmp_netsnmp_data_list_s.3,   
+      man/netsnmp_netsnmp_handler_registration_s.3,   
+      man/netsnmp_netsnmp_iterator_info_s.3,   
+      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_s.3,   
+      man/netsnmp_netsnmp_monitor_callback_header_s.3,   
+      man/netsnmp_netsnmp_request_info_s.3,   
+      man/netsnmp_netsnmp_table_registration_info_s.3,   
+      man/netsnmp_netsnmp_table_request_info_s.3,   
+      man/netsnmp_null_container.3, man/netsnmp_oid_stash.3,   
+      man/netsnmp_old_api.3, man/netsnmp_read_config.3,   
+      man/netsnmp_read_only.3, man/netsnmp_row_merge.3,   
+      man/netsnmp_scalar.3, man/netsnmp_scalar_group_group.3,   
+      man/netsnmp_serialize.3, man/netsnmp_snmp_agent.3,   
+      man/netsnmp_snmp_alarm.3, man/netsnmp_snmp_client.3,   
+      man/netsnmp_snmp_logging.3, man/netsnmp_snmp_pdu.3,   
+      man/netsnmp_snmp_session.3, man/netsnmp_stash_cache.3,   
+      man/netsnmp_stash_to_next.3, man/netsnmp_table.3,   
+      man/netsnmp_table_array.3, man/netsnmp_table_container.3,   
+      man/netsnmp_table_data.3, man/netsnmp_table_dataset.3,   
+      man/netsnmp_table_generic.3, man/netsnmp_table_indexes.3,   
+      man/netsnmp_table_iterator.3, man/netsnmp_table_iterator.h.3,   
+      man/netsnmp_table_maintenance.3, man/netsnmp_table_row.3,   
+      man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
+      man/netsnmp_tools.h.3, man/netsnmp_util.3,   
+      man/netsnmp_utilities.3, man/netsnmp_variable_list.3,   
+      man/netsnmp_watcher.3:
+
+   documentation update
+
+2009-09-14 22:36  hardaker
+
+   *  FAQ, README, configure, configure.ac, dist/Makefile,   
+      dist/net-snmp.spec, man/pdu_api.3, man/session_api.3,   
+      man/varbind_api.3:
+
+   Version number update
+
+2009-09-14 22:18  hardaker
+
+   * README.aix, apps/snmpnetstat/if.c, include/net-snmp/system/aix.h:
+
+   Patch from magfr for 5.5 specific aix build fixes
+
+2009-09-02 07:12  jsafranek
+
+   *  agent/mibgroup/smux/snmp_bgp.c, agent/mibgroup/smux/snmp_ospf.c,  
+       agent/mibgroup/smux/snmp_rip2.c, include/net-snmp/library/mib.h:
+
+   CHANGES: snmplib: rename MIB macro to NETSNMP_MIB2_OID, MIB is
+   too generic and may conflict with applications.
+   
+   The old MIB macro is kept for backward compatibility, unless
+   NETSNMP_NO_LEGACY_DEFINITIONS is defined.
+
+2009-08-31 19:38  nba
+
+   * mibs/rfclist:
+
+   Additional RFC mibs
+
+2009-08-31 19:37  nba
+
+   * mibs/IANAifType-MIB.txt:
+
+   IANA fixed a bug
+
+2009-08-29 07:29  magfr
+
+   * local/mib2c.raw-table.conf:
+
+   mib2c: Remove unneeded casts.
+
+2009-08-29 07:28  magfr
+
+   * local/mib2c.raw-table.conf:
+
+   mib2c: ret is only used in settable tables so only declare it
+   then.
+
+2009-08-29 07:24  magfr
+
+   * local/mib2c.raw-table.conf:
+
+   mib2c: Replace the _oid_len variable with an explicit call of
+   OID_LENGTH.
+
+2009-08-29 07:21  magfr
+
+   * local/mib2c.raw-table.conf:
+
+   mib2c: Make every function that can be static static. Remove the
+   declarations of the static functions and the private defines from
+   the header.
+
+2009-08-29 07:19  magfr
+
+   * local/mib2c.raw-table.conf:
+
+   mib2c: Reorder the functions in order to avoid the need for
+   forward declarations.
+
+2009-08-29 07:16  magfr
+
+   * local/mib2c.raw-table.conf:
+
+   mib2c: netsnmp_table_register should be netsnmp_register_table
+   and take only two argments.
+
+2009-08-29 07:14  magfr
+
+   * local/mib2c.raw-table.conf:
+
+   mib2c: build_oid expects a pointer to allocated oid. Change to
+   use build_oid_noalloc and remove one copy of the indices.
+
+2009-08-29 07:10  magfr
+
+   * local/mib2c.raw-table.conf:
+
+   mib2c: There is no index_oid_len member in struct entry. Use the
+   intended local variable index_oid_len.
+
+2009-08-29 07:06  magfr
+
+   * local/mib2c.raw-table.conf:
+
+   mib2c: Correct the return type of ${i}_get*entry to match the
+   returned type.
+
+2009-08-26 22:37  hardaker
+
+   * ChangeLog:
+
+   whwoops; blew the changelog for rc2
+
+2009-08-26 17:38  hardaker
+
+   *  man/netsnmp_access_multiplexer.3, man/netsnmp_agent.3,   
+      man/netsnmp_agent_handler.h.3, man/netsnmp_agent_registry.3,   
+      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
+      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
+      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
+      man/netsnmp_container.3, man/netsnmp_container_iterator.3,   
+      man/netsnmp_container_iterator.h.3, man/netsnmp_data_list.3,   
+      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
+      man/netsnmp_handler.3, man/netsnmp_instance.3,   
+      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
+      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
+      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
+      man/netsnmp_multiplexer.3,   
+      man/netsnmp_netsnmp_agent_request_info_s.3,   
+      man/netsnmp_netsnmp_column_info_t.3,   
+      man/netsnmp_netsnmp_data_list_s.3,   
+      man/netsnmp_netsnmp_handler_registration_s.3,   
+      man/netsnmp_netsnmp_iterator_info_s.3,   
+      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_s.3,   
+      man/netsnmp_netsnmp_monitor_callback_header_s.3,   
+      man/netsnmp_netsnmp_request_info_s.3,   
+      man/netsnmp_netsnmp_table_registration_info_s.3,   
+      man/netsnmp_netsnmp_table_request_info_s.3,   
+      man/netsnmp_null_container.3, man/netsnmp_oid_stash.3,   
+      man/netsnmp_old_api.3, man/netsnmp_read_config.3,   
+      man/netsnmp_read_only.3, man/netsnmp_row_merge.3,   
+      man/netsnmp_scalar.3, man/netsnmp_scalar_group_group.3,   
+      man/netsnmp_serialize.3, man/netsnmp_snmp_agent.3,   
+      man/netsnmp_snmp_alarm.3, man/netsnmp_snmp_client.3,   
+      man/netsnmp_snmp_logging.3, man/netsnmp_snmp_pdu.3,   
+      man/netsnmp_snmp_session.3, man/netsnmp_stash_cache.3,   
+      man/netsnmp_stash_to_next.3, man/netsnmp_table.3,   
+      man/netsnmp_table_array.3, man/netsnmp_table_container.3,   
+      man/netsnmp_table_data.3, man/netsnmp_table_dataset.3,   
+      man/netsnmp_table_generic.3, man/netsnmp_table_indexes.3,   
+      man/netsnmp_table_iterator.3, man/netsnmp_table_iterator.h.3,   
+      man/netsnmp_table_maintenance.3, man/netsnmp_table_row.3,   
+      man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
+      man/netsnmp_tools.h.3, man/netsnmp_util.3,   
+      man/netsnmp_utilities.3, man/netsnmp_variable_list.3,   
+      man/netsnmp_watcher.3:
+
+   documentation update
+
+2009-08-26 17:29  hardaker
+
+   *  FAQ, README, configure, configure.ac, dist/Makefile,   
+      dist/net-snmp.spec:
+
+   Version number update
+
+2009-08-26 17:38  hardaker
+
+   *  man/netsnmp_access_multiplexer.3, man/netsnmp_agent.3,   
+      man/netsnmp_agent_handler.h.3, man/netsnmp_agent_registry.3,   
+      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
+      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
+      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
+      man/netsnmp_container.3, man/netsnmp_container_iterator.3,   
+      man/netsnmp_container_iterator.h.3, man/netsnmp_data_list.3,   
+      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
+      man/netsnmp_handler.3, man/netsnmp_instance.3,   
+      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
+      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
+      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
+      man/netsnmp_multiplexer.3,   
+      man/netsnmp_netsnmp_agent_request_info_s.3,   
+      man/netsnmp_netsnmp_column_info_t.3,   
+      man/netsnmp_netsnmp_data_list_s.3,   
+      man/netsnmp_netsnmp_handler_registration_s.3,   
+      man/netsnmp_netsnmp_iterator_info_s.3,   
+      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_s.3,   
+      man/netsnmp_netsnmp_monitor_callback_header_s.3,   
+      man/netsnmp_netsnmp_request_info_s.3,   
+      man/netsnmp_netsnmp_table_registration_info_s.3,   
+      man/netsnmp_netsnmp_table_request_info_s.3,   
+      man/netsnmp_null_container.3, man/netsnmp_oid_stash.3,   
+      man/netsnmp_old_api.3, man/netsnmp_read_config.3,   
+      man/netsnmp_read_only.3, man/netsnmp_row_merge.3,   
+      man/netsnmp_scalar.3, man/netsnmp_scalar_group_group.3,   
+      man/netsnmp_serialize.3, man/netsnmp_snmp_agent.3,   
+      man/netsnmp_snmp_alarm.3, man/netsnmp_snmp_client.3,   
+      man/netsnmp_snmp_logging.3, man/netsnmp_snmp_pdu.3,   
+      man/netsnmp_snmp_session.3, man/netsnmp_stash_cache.3,   
+      man/netsnmp_stash_to_next.3, man/netsnmp_table.3,   
+      man/netsnmp_table_array.3, man/netsnmp_table_container.3,   
+      man/netsnmp_table_data.3, man/netsnmp_table_dataset.3,   
+      man/netsnmp_table_generic.3, man/netsnmp_table_indexes.3,   
+      man/netsnmp_table_iterator.3, man/netsnmp_table_iterator.h.3,   
+      man/netsnmp_table_maintenance.3, man/netsnmp_table_row.3,   
+      man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
+      man/netsnmp_tools.h.3, man/netsnmp_util.3,   
+      man/netsnmp_utilities.3, man/netsnmp_variable_list.3,   
+      man/netsnmp_watcher.3:
+
+   documentation update
+
+2009-08-26 17:29  hardaker
+
+   *  FAQ, README, configure, configure.ac, dist/Makefile,   
+      dist/net-snmp.spec:
+
+   Version number update
+
+2009-08-26 17:28  hardaker
+
+   * dist/makerelease.xml:
+
+   updated based on new SF upload methods; no longer as automatable
+
+2009-08-26 17:26  hardaker
+
+   * agent/mibgroup/ip-mib/data_access/defaultrouter_linux.c:
+
+   CHANGES: snmpd: patch from Jan to endless loop in default routes
+   on linux
+
+2009-08-26 17:25  hardaker
+
+   * include/net-snmp/library/types.h:
+
+   apply patch from Jan to fix C++ wrapper
+
+2009-08-26 14:53  dts12
+
+   * local/Makefile.in, local/mib2c.raw-table.conf:
+
+   Initial stab at a minimal-helper (raw) table template,
+   leaving most of the work to the user-provided MIB handler.
+
 2009-08-26 14:50  dts12
 
    * snmplib/snmp_api.c:
@@ -3591,6 +9441,173 @@
    due to 15-/31-bit masking when selecting request IDs. Identified
    by kromesky.
 
+2009-08-20 13:30  jsafranek
+
+   *  agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable.c,
+         agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable.c,   
+      agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c,   
+      agent/mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable.c:
+
+   CHANGES: snmpd: plug leaks in ipIfStatsTable,
+   ipv6ScopeZoneIndexTable, ipSystemStatsTable and
+   ipDefaultRouterTable.
+   
+   It seems to me the tables were wrongly generated with
+   m2c_data_allocate or
+   someone forgot to release the user provided data.
+
+2009-08-12 15:00  tanders
+
+   * NEWS:
+
+   fix libtool version in NEWS
+
+2009-08-11 00:42  hardaker
+
+   * CHANGES, ChangeLog:
+
+   whoops; add real changelog enteries for .rc1
+
+2009-08-10 23:10  hardaker
+
+   * dist/makerelease.xml:
+
+   fix typo in svn2cl line
+
+2009-08-10 23:05  hardaker
+
+   * snmplib/Makefile.depend:
+
+   make depend
+
+2009-08-10 21:32  hardaker
+
+   *  man/netsnmp_access_multiplexer.3, man/netsnmp_agent.3,   
+      man/netsnmp_agent_handler.h.3, man/netsnmp_agent_registry.3,   
+      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
+      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
+      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
+      man/netsnmp_container.3, man/netsnmp_container_iterator.3,   
+      man/netsnmp_container_iterator.h.3, man/netsnmp_data_list.3,   
+      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
+      man/netsnmp_handler.3, man/netsnmp_instance.3,   
+      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
+      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
+      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
+      man/netsnmp_multiplexer.3,   
+      man/netsnmp_netsnmp_agent_request_info_s.3,   
+      man/netsnmp_netsnmp_column_info_t.3,   
+      man/netsnmp_netsnmp_data_list_s.3,   
+      man/netsnmp_netsnmp_handler_registration_s.3,   
+      man/netsnmp_netsnmp_iterator_info_s.3,   
+      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_s.3,   
+      man/netsnmp_netsnmp_monitor_callback_header_s.3,   
+      man/netsnmp_netsnmp_request_info_s.3,   
+      man/netsnmp_netsnmp_table_registration_info_s.3,   
+      man/netsnmp_netsnmp_table_request_info_s.3,   
+      man/netsnmp_null_container.3, man/netsnmp_oid_stash.3,   
+      man/netsnmp_old_api.3, man/netsnmp_read_config.3,   
+      man/netsnmp_read_only.3, man/netsnmp_row_merge.3,   
+      man/netsnmp_scalar.3, man/netsnmp_scalar_group_group.3,   
+      man/netsnmp_serialize.3, man/netsnmp_snmp_agent.3,   
+      man/netsnmp_snmp_alarm.3, man/netsnmp_snmp_client.3,   
+      man/netsnmp_snmp_logging.3, man/netsnmp_snmp_pdu.3,   
+      man/netsnmp_snmp_session.3, man/netsnmp_stash_cache.3,   
+      man/netsnmp_stash_to_next.3, man/netsnmp_table.3,   
+      man/netsnmp_table_array.3, man/netsnmp_table_container.3,   
+      man/netsnmp_table_data.3, man/netsnmp_table_dataset.3,   
+      man/netsnmp_table_generic.3, man/netsnmp_table_indexes.3,   
+      man/netsnmp_table_iterator.3, man/netsnmp_table_iterator.h.3,   
+      man/netsnmp_table_maintenance.3, man/netsnmp_table_row.3,   
+      man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
+      man/netsnmp_tools.h.3, man/netsnmp_util.3,   
+      man/netsnmp_utilities.3, man/netsnmp_variable_list.3,   
+      man/netsnmp_watcher.3:
+
+   documentation update
+
+2009-08-10 23:10  hardaker
+
+   * dist/makerelease.xml:
+
+   fix typo in svn2cl line
+
+2009-08-10 23:05  hardaker
+
+   * snmplib/Makefile.depend:
+
+   make depend
+
+2009-08-10 21:32  hardaker
+
+   *  man/netsnmp_access_multiplexer.3, man/netsnmp_agent.3,   
+      man/netsnmp_agent_handler.h.3, man/netsnmp_agent_registry.3,   
+      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
+      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
+      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
+      man/netsnmp_container.3, man/netsnmp_container_iterator.3,   
+      man/netsnmp_container_iterator.h.3, man/netsnmp_data_list.3,   
+      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
+      man/netsnmp_handler.3, man/netsnmp_instance.3,   
+      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
+      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
+      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
+      man/netsnmp_multiplexer.3,   
+      man/netsnmp_netsnmp_agent_request_info_s.3,   
+      man/netsnmp_netsnmp_column_info_t.3,   
+      man/netsnmp_netsnmp_data_list_s.3,   
+      man/netsnmp_netsnmp_handler_registration_s.3,   
+      man/netsnmp_netsnmp_iterator_info_s.3,   
+      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_s.3,   
+      man/netsnmp_netsnmp_monitor_callback_header_s.3,   
+      man/netsnmp_netsnmp_request_info_s.3,   
+      man/netsnmp_netsnmp_table_registration_info_s.3,   
+      man/netsnmp_netsnmp_table_request_info_s.3,   
+      man/netsnmp_null_container.3, man/netsnmp_oid_stash.3,   
+      man/netsnmp_old_api.3, man/netsnmp_read_config.3,   
+      man/netsnmp_read_only.3, man/netsnmp_row_merge.3,   
+      man/netsnmp_scalar.3, man/netsnmp_scalar_group_group.3,   
+      man/netsnmp_serialize.3, man/netsnmp_snmp_agent.3,   
+      man/netsnmp_snmp_alarm.3, man/netsnmp_snmp_client.3,   
+      man/netsnmp_snmp_logging.3, man/netsnmp_snmp_pdu.3,   
+      man/netsnmp_snmp_session.3, man/netsnmp_stash_cache.3,   
+      man/netsnmp_stash_to_next.3, man/netsnmp_table.3,   
+      man/netsnmp_table_array.3, man/netsnmp_table_container.3,   
+      man/netsnmp_table_data.3, man/netsnmp_table_dataset.3,   
+      man/netsnmp_table_generic.3, man/netsnmp_table_indexes.3,   
+      man/netsnmp_table_iterator.3, man/netsnmp_table_iterator.h.3,   
+      man/netsnmp_table_maintenance.3, man/netsnmp_table_row.3,   
+      man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
+      man/netsnmp_tools.h.3, man/netsnmp_util.3,   
+      man/netsnmp_utilities.3, man/netsnmp_variable_list.3,   
+      man/netsnmp_watcher.3:
+
+   documentation update
+
+2009-08-10 21:21  hardaker
+
+   *  dist/makerelease.xml, man/pdu_api.3, man/session_api.3,   
+      man/varbind_api.3:
+
+   Version number update
+
+2009-08-07 10:32  dts12
+
+   * CHANGES, NEWS:
+
+   Correct, consolidate, clarify and cleanup the catalog of current
+   changes.
+
+2009-08-06 07:57  dts12
+
+   * FAQ:
+
+   Expand on exec vs extend.
+
 2009-08-05 20:07  dts12
 
    *  agent/mibgroup/udp-mib/data_access/udp_endpoint_linux.c,   
@@ -3608,6 +9625,22 @@
    CHANGES: snmpd: PATCHES: 2822337: Fix memory leak in
    ipAddressPrefixTable
 
+2009-08-05 15:16  jsafranek
+
+   * agent/mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable.c:
+
+   Fix memory leak in NetToMediaTable.
+   When deleting row context, delete also associated data.
+
+2009-08-05 15:15  jsafranek
+
+   * 
+      agent/mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable_data_access.c:
+
+   Fix memory leak in NetToMediaTable.
+   The container used to track entries to delete from cache should
+   be released when it's not needed.
+
 2009-08-05 15:12  jsafranek
 
    * 
@@ -3642,32 +9675,192 @@
    as well as a larger group.
    Also addresses bug 2150285
 
+2009-08-04 21:16  magfr
+
+   * snmplib/strtoull.c:
+
+   snmplib: from "Bart van Assche & Magnus Fromreide": More updates
+   to strtoull.c
+
 2009-08-04 10:57  jsafranek
 
    * agent/mibgroup/ip-mib/data_access/systemstats_common.c:
 
-   CHANGES: snmpd: from "Marcus Rückert": fix possible crash when
+   CHANGES: snmpd: from "Marcus Rückert": fix possible crash when
    64-bit counters in ipSystemStatsTable get bigger than 2^32
 
-2009-07-27 12:13  hardaker
+2009-08-03 19:27  magfr
+
+   *  configure, configure.d/config_os_headers,   
+      include/net-snmp/net-snmp-config.h.in, snmplib/strtoull.c:
+
+   CHANGES: snmplib: PATCH: 2827722: from "Bart Van Assche": Improve
+   strtoull to be less MSVC-specific
+
+2009-08-03 18:38  magfr
+
+   * man/Makefile.in:
+
+   remove an obsolete manual page from the set of files that should
+   be installed
+
+2009-07-27 12:41  hardaker
+
+   *  agent/Makefile.depend, agent/helpers/Makefile.depend,   
+      agent/mibgroup/Makefile.depend, apps/Makefile.depend,   
+      apps/snmpnetstat/Makefile.depend, snmplib/Makefile.depend:
+
+   make depend
+
+2009-07-27 12:11  hardaker
 
    * man/netsnmp_Container_iterator.3:
 
-   remove outdate case-conflicting manual page
+   remove an obsolete manual page
 
-2009-07-27 12:06  hardaker
+2009-07-27 12:03  hardaker
 
    * perl/SNMP/t/bulkwalk.t:
 
    CHANGES: freebsd: patch from Cezary Morga to fix a make test on
    freebsd
 
+2009-07-27 12:02  hardaker
+
+   *  man/netsnmp_access_multiplexer.3, man/netsnmp_agent.3,   
+      man/netsnmp_agent_handler.h.3, man/netsnmp_agent_registry.3,   
+      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
+      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
+      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
+      man/netsnmp_container.3, man/netsnmp_container_iterator.3,   
+      man/netsnmp_container_iterator.h.3, man/netsnmp_data_list.3,   
+      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
+      man/netsnmp_handler.3, man/netsnmp_instance.3,   
+      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
+      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
+      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
+      man/netsnmp_multiplexer.3,   
+      man/netsnmp_netsnmp_agent_request_info_s.3,   
+      man/netsnmp_netsnmp_column_info_t.3,   
+      man/netsnmp_netsnmp_data_list_s.3,   
+      man/netsnmp_netsnmp_handler_registration_s.3,   
+      man/netsnmp_netsnmp_iterator_info_s.3,   
+      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_s.3,   
+      man/netsnmp_netsnmp_monitor_callback_header_s.3,   
+      man/netsnmp_netsnmp_request_info_s.3,   
+      man/netsnmp_netsnmp_table_registration_info_s.3,   
+      man/netsnmp_netsnmp_table_request_info_s.3,   
+      man/netsnmp_null_container.3, man/netsnmp_oid_stash.3,   
+      man/netsnmp_old_api.3, man/netsnmp_read_config.3,   
+      man/netsnmp_read_only.3, man/netsnmp_row_merge.3,   
+      man/netsnmp_scalar.3, man/netsnmp_scalar_group_group.3,   
+      man/netsnmp_serialize.3, man/netsnmp_snmp_agent.3,   
+      man/netsnmp_snmp_alarm.3, man/netsnmp_snmp_client.3,   
+      man/netsnmp_snmp_logging.3, man/netsnmp_snmp_pdu.3,   
+      man/netsnmp_snmp_session.3, man/netsnmp_stash_cache.3,   
+      man/netsnmp_stash_to_next.3, man/netsnmp_table.3,   
+      man/netsnmp_table_array.3, man/netsnmp_table_container.3,   
+      man/netsnmp_table_data.3, man/netsnmp_table_dataset.3,   
+      man/netsnmp_table_generic.3, man/netsnmp_table_indexes.3,   
+      man/netsnmp_table_iterator.3, man/netsnmp_table_iterator.h.3,   
+      man/netsnmp_table_maintenance.3, man/netsnmp_table_row.3,   
+      man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
+      man/netsnmp_tools.h.3, man/netsnmp_util.3,   
+      man/netsnmp_utilities.3, man/netsnmp_variable_list.3,   
+      man/netsnmp_watcher.3:
+
+   documentation update
+
+2009-07-27 11:52  hardaker
+
+   *  FAQ, NEWS, README, configure, configure.ac, dist/Makefile,   
+      dist/net-snmp.spec:
+
+   Version number update
+
+2009-07-27 08:39  hardaker
+
+   * testing/tests/T350unix:
+
+   revert accidentially applied patch
+
+2009-07-27 08:37  hardaker
+
+   *  testing/tests/T350unix, testing/tests/T360dtlsudp,   
+      testing/tests/test-localhost.cert,   
+      testing/tests/test-localhost.priv, testing/tests/test-user.cert,  
+       testing/tests/test-user.priv:
+
+   added a test case for udp/dtls
+
+2009-07-27 08:36  hardaker
+
+   * snmplib/snmp_api.c:
+
+   don't require a session to carry a secName
+
+2009-07-26 21:34  alex_b
+
+   * win32/libsnmp_dll/libsnmp.def:
+
+   Win32: MSVC 6 compile fixes for Workspace build.
+
+2009-07-26 18:20  alex_b
+
+   *  README.win32, configure, configure.d/config_os_functions,   
+      include/net-snmp/library/system.h,   
+      include/net-snmp/net-snmp-config.h.in, snmplib/strtoull.c,   
+      win32/dist/build-binary.bat, win32/dist/build-binary.pl,   
+      win32/dist/installer/net-snmp.nsi, win32/libsnmp/Makefile.in,   
+      win32/libsnmp/libsnmp.dsp, win32/libsnmp_dll/Makefile.in,   
+      win32/libsnmp_dll/libsnmp.def.in,   
+      win32/libsnmp_dll/libsnmp_dll.dsp,   
+      win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   -Added strtoull function and configure check for systems without
+   it such as Win32 MSVC 6
+   -Win32: MSVC 6 compile fixes - requires new strtoull.c file
+   -Win32: New build-binary script to simplify building the Windows
+   binary package.
+
+2009-07-25 05:31  magfr
+
+   * testing/tests/T160snmpnetstat:
+
+   Make sure a message is written if the relevant table is missing.
+
 2009-07-23 21:29  alex_b
 
    * README:
 
    Update email address in README.
 
+2009-07-23 01:07  alex_b
+
+   *  win32/netsnmpmibs/netsnmpmibs.dsp,   
+      win32/netsnmpmibssdk/netsnmpmibssdk.dsp:
+
+   Win32 MSVC 2008+ fixes.
+
+2009-07-23 00:55  alex_b
+
+   *  include/net-snmp/library/snmp_logging.h,   
+      win32/netsnmpmibssdk/Makefile.in,   
+      win32/netsnmpmibssdk/netsnmpmibssdk.dsp:
+
+   Win32 MSVC 2005+ build fixes. Thanks to Bart Van Assche.
+
+2009-07-21 12:22  dts12
+
+   *  local/mib2c.container.conf, local/mib2c.iterate.conf,   
+      local/mib2c.iterate_access.conf, local/mib2c.row.conf,   
+      local/mib2c.table_data.conf:
+
+   Add simple debug output to mib2c templates.
+
 2009-07-21 12:13  dts12
 
    * local/mib2c.table_data.conf:
@@ -3686,12 +9879,52 @@
 
    Updates to CODING section.
 
+2009-07-20 11:09  jsafranek
+
+   * agent/mibgroup/etherlike-mib.h:
+
+   Add missing header file from patch #2053273.
+
 2009-07-19 15:09  dts12
 
    * FAQ:
 
    Updates to COMPILING section.
 
+2009-07-16 12:38  jsafranek
+
+   * agent/mibgroup/ip-mib/data_access/systemstats_linux.c:
+
+   Add IPv6 octet counters.
+   New Linux kernels (e.g. 2.6.31-rc2, maybe some earlier) provide
+   counters for
+   incoming/outgoing IPv6 traffic for ipSystemStatsTable and
+   ipIfStatsTable.
+
+2009-07-15 22:46  tanders
+
+   * testing/tests/T350unix:
+
+   put temporary data to where they belong
+
+2009-07-11 21:50  tanders
+
+   * configure:
+
+   regenerate configure
+
+2009-07-11 21:04  tanders
+
+   * configure.d/config_os_libs:
+
+   build fix (e.g. for FreeBSD): adjust kvm configure tests
+
+2009-07-10 12:35  jsafranek
+
+   * snmplib/snmpUDPIPv6Domain.c:
+
+   Check IPv6 port ranges in the same way as IPv4 ports are checked.
+
 2009-07-10 07:46  jsafranek
 
    * 
@@ -3702,6 +9935,43 @@
    Also fix the default type fo^CASN_IPADDRESS in mib2c, so the
    ipCidrRouteTable_interface.c can be safely regenerated.
 
+2009-07-09 23:42  hardaker
+
+   *  testing/tests/T300udp, testing/tests/T310tcp,   
+      testing/tests/T320udpv6, testing/tests/T330tcpv6,   
+      testing/tests/T350unix:
+
+   cleanup of testing cases to remove double include and double
+   exports
+
+2009-07-09 23:07  tanders
+
+   * testing/tests/T300udp:
+
+   be consistent with the TCP/IPv4 test
+
+2009-07-09 22:18  hardaker
+
+   *  testing/tests/Stransport, testing/tests/T300udp,   
+      testing/tests/T310tcp, testing/tests/T320udpv6,   
+      testing/tests/T330tcpv6, testing/tests/T350unix,   
+      testing/tests/T399alias:
+
+   new tests for testing defined transports
+
+2009-07-09 22:17  hardaker
+
+   * testing/TESTCONF.sh, testing/eval_tools.sh:
+
+   a CONFIGAPP macro for adding stuff to snmp.conf
+
+2009-07-08 15:12  jsafranek
+
+   * snmplib/snmpUDPDomain.c:
+
+   Fix gethostbyaddr parameter, netsnmp_udp_fmtaddr never returned a
+   hostname.
+
 2009-07-07 15:46  jsafranek
 
    *  agent/mibgroup/mibII/ipCidrRouteTable_access.c,   
@@ -3719,23 +9989,85 @@
    processing - u_long can make problems on bin endian 64 bit
    systems
 
-2009-06-16 15:19  rstory
+2009-06-29 13:52  hardaker
+
+   * CHANGES:
+
+   remove entry for a patch that got reverted
+
+2009-06-25 15:24  dts12
+
+   *  include/net-snmp/library/large_fd_set.h,   
+      include/net-snmp/library/types.h, include/net-snmp/types.h,   
+      snmplib/Makefile.in:
+
+   Move non-core data types into a separate (library internals)
+   header file.
+   Move the large_fd_set data structure into this header file.
+
+2009-06-18 22:29  tanders
+
+   * agent/snmp_perl.c:
+
+   CHANGES: build: allow building with Perl versions that lack
+   PERL_EXIT_DESTRUCT_END
+
+2009-06-18 22:13  tanders
+
+   * apps/snmpnetstat/if.c:
+
+   CHANGES: build: build fix for Tru64 Unix and IRIX: move _XOPEN*
+   definitions to where they are in 5.4.x and earlier
+
+2009-06-18 06:02  magfr
+
+   *  configure, configure.d/config_os_libs,   
+      configure.d/config_project_with_enable,   
+      include/net-snmp/net-snmp-config.h.in:
+
+   Clean up --with-nl configuration
+   *  Move the _ARG_WITH to config_project_with_enable  2009-06-16 15:17
+       rstory
+
 
    * snmplib/container.c:
 
    check for null pointer before deref
 
+2009-06-15 23:52  rstory
+
+   * snmplib/snmp_client.c:
+
+   add comment explaining not quite obvious lack of memmove
+
+2009-06-15 19:32  magfr
+
+   * include/net-snmp/types.h:
+
+   Remove #if 0 commented code
+
 2009-06-15 15:25  dts12
 
    * FAQ:
 
    Updates to AGENT section.
 
-2009-06-14 22:01  tanders
+2009-06-13 01:12  hardaker
 
-   * agent/mibgroup/host/hr_swrun.c:
+   *  agent/mibgroup/mibII/tcpTable.c, configure,   
+      configure.d/config_os_libs,   
+      include/net-snmp/net-snmp-config.h.in:
 
-   portability fix (sync with 5.5)
+   CHANGES: snmpd: PATCH: 2564552: from ahmake: provide libnetlink
+   support for loading the tcp table
+
+2009-06-12 19:02  rstory
+
+   *  agent/mibgroup/if-mib/ifTable/ifTable_data_access.c,   
+      agent/mibgroup/if-mib/ifTable/ifTable_data_access.h:
+
+   CHANGES: snmpd: BUG: 1400101: remove deleted interfaces from
+   ifTable
 
 2009-06-11 23:09  hardaker
 
@@ -3744,19 +10076,36 @@
       win32/net-snmp/agent/mib_module_config.h,   
       win32/netsnmpmibssdk/netsnmpmibssdk.dsp:
 
-   CHANGES: win32: PATCH: 2693746: from bvassche: improved socket startup support
+   CHANGES: win32: PATCH: 2693746: from bvassche: improved socket
+   startup support
 
 2009-06-11 22:57  hardaker
 
    * agent/mibgroup/kernel_sunos5.c:
 
-   CHANGES: snmpd: PATCH: 2012402: don't fail on failure to look up interface error counters.
+   CHANGES: snmpd: PATCH: 2012402: don't fail on failure to look up
+   interface error counters.
+
+2009-06-11 22:03  hardaker
+
+   * include/net-snmp/types.h:
+
+   revert previous commit to make circular dependencies back to
+   their regular insane ordering; I don't like this situation at all
+
+2009-06-11 21:42  hardaker
+
+   * include/net-snmp/types.h:
+
+   include large_fd_set.h before typedefing something based on the
+   structure
 
 2009-06-03 12:35  dts12
 
    * perl/SNMP/SNMP.xs:
 
-   CHANGES: perl: PATCHES: 2793857: Report failed asynchronous requests.
+   CHANGES: perl: PATCHES: 2793857: Report failed asynchronous
+   requests.
 
 2009-06-03 11:46  dts12
 
@@ -3769,7 +10118,8 @@
 
    * agent/mibgroup/agentx/master_admin.c:
 
-   PATCH: 2182592: Clean up vacmContextTable after unregistrations
+   CHANGES: snmpd: PATCH: 2182592: Clean up vacmContextTable after
+   unregistrations
    Patch supplied by John Forsyth
 
 2009-06-03 10:12  dts12
@@ -3780,18 +10130,21 @@
       include/net-snmp/agent/snmp_agent.h, snmplib/snmpUDPDomain.c,   
       snmplib/snmp_api.c, snmplib/snmpv3.c:
 
-   CHANGES: PATCH: 2797251: Support multiple initialisation and shutdown, fix memory leaks
+   CHANGES: PATCH: 2797251: Support multiple initialisation and
+   shutdown, fix memory leaks
    Patch supplied by Ivosh
 
 2009-06-01 15:53  dts12
 
    * man/snmpd.conf.5.def:
 
-   CHANGES: docs: PATCHES: 2788072: Document 'logmatch' functionality.
+   CHANEGS: docs: PATCHES: 2788072: Document 'logmatch'
+   functionality.
 
 2009-06-01 15:50  dts12
 
    *  agent/mibgroup/utilities/iquery.c, snmplib/mib.c,   
+      snmplib/parse.c, snmplib/snmp_api.c, snmplib/snmp_parse_args.c,   
       snmplib/system.c, win32/net-snmp/net-snmp-config.h,   
       win32/net-snmp/net-snmp-config.h.in:
 
@@ -3799,17 +10152,32 @@
 
 2009-06-01 15:37  dts12
 
-   *  aclocal.m4, configure, local/snmpconf.dir/snmpd-data/monitor,   
+   *  agent/mibgroup/host/data_access/swrun_kinfo.c,   
+      agent/mibgroup/host/data_access/swrun_kvm_proc.c,   
+      agent/mibgroup/host/data_access/swrun_procfs_psinfo.c,   
+      agent/mibgroup/host/data_access/swrun_procfs_status.c,   
+      agent/mibgroup/host/data_access/swrun_procinfo.c,   
+      agent/mibgroup/host/data_access/swrun_prpsinfo.c,   
+      agent/mibgroup/host/data_access/swrun_pstat.c, configure,   
+      local/snmpconf.dir/snmpd-data/monitor, m4/libtool.m4,   
       man/snmpd.conf.5.def, man/snmpd.examples.5.def:
 
-   CHANGES: docs: PATCH: 2795739: Fix incorrect disk/file size descriptions & unit specifiers
+   CHANGES: docs: PATCH: 2795739: Fix incorrect disk/file size
+   descriptions & unit specifiers
 
 2009-06-01 13:11  dts12
 
    * EXAMPLE.conf.def:
 
    Rework example configuration file to match current snmpd.conf(5)
-   structure, and more clearly illustrate current best practise.
+   structure,
+   and more clearly illustrate current best practise.
+
+2009-05-30 06:58  magfr
+
+   * agent/mib_modules.c:
+
+   Remove unused include.
 
 2009-05-29 09:14  dts12
 
@@ -3819,18 +10187,42 @@
 
 2009-05-29 09:08  dts12
 
-   * local/passtest.pl, mibs/Makefile.in, mibs/NET-SNMP-PASS-MIB.txt:
+   *  local/passtest, local/passtest.pl, mibs/Makefile.in,   
+      mibs/NET-SNMP-PASS-MIB.txt:
 
    Rework "passtest" examples to fully validate GETNEXT requests,
    and use a legitimate MIB structure for output.
    Add an example MIB to define that structure.
 
-2009-05-28 12:55  dts12
+2009-05-28 12:41  dts12
 
    * FAQ:
 
-   Synchronise with latest FAQ
-   (including 5.5 revisions up to MIBs section)
+   Updates to MIBs section
+
+2009-05-28 11:56  dts12
+
+   * FAQ:
+
+   Tweak phrasing of an (overlong) question in the Perl section
+
+2009-05-28 11:31  dts12
+
+   * FAQ:
+
+   New entry in the Applications section
+
+2009-05-28 10:41  dts12
+
+   * FAQ:
+
+   Updates to Applications section
+
+2009-05-27 15:26  dts12
+
+   * FAQ:
+
+   Updates to GENERAL section.
 
 2009-05-19 17:50  alex_b
 
@@ -3849,7 +10241,9 @@
 
    * snmplib/scapi.c:
 
-   CHANGES: build: BUG: 2782700: build failure when using --with-pkcs on Solaris
+   CHANGES: build: BUG: 2782700: build failure when using
+   --with-pkcs on
+   Solaris
 
 2009-05-15 14:59  jsafranek
 
@@ -3871,29 +10265,50 @@
 
    * agent/mibgroup/disman/event/mteTriggerConf.c:
 
-   CHANGES: snmpd: Allow "monitor" to handle negative threshold values.
+   CHANGES: snmpd: Allow "monitor" to handle negative threshold
+   values.
    Reported by Richard Gipps.
 
 2009-05-13 22:32  tanders
 
    * snmplib/vacm.c:
 
-   CHANGES: snmpd: PATCH: 2791417: fix snmpd segfault when run with -DALL
+   CHANGES: snmpd: PATCH: 2791417: fix snmpd segfault when run with
+   -DALL
    Patch supplied by Ron Roskens.
 
 2009-05-13 08:02  dts12
 
    * man/snmpd.conf.5.def:
 
-   Bring documentation of notificationEvent syntax into line with reality.
-   (Uses "-m" rather than "-n" to register standard MIB payload objects)
+   Bring documentation of notificationEvent syntax into line with
+   reality.
+   (Uses "-m" rather than "-n" to register standard MIB payload
+   objects)
    Inconsistency reported by Richard Gipps.
 
-2009-05-12 23:26  alex_b
+2009-05-10 21:12  alex_b
 
-   * include/net-snmp/data_access/interface.h, perl/agent/agent.xs:
+   *  win32/Makefile-apps.in, win32/Makefile.in,   
+      win32/libsnmp_dll/Makefile.in, win32/snmpd/Makefile.in,   
+      win32/snmpdsdk/Makefile.in, win32/snmpnetstat/Makefile.in,   
+      win32/snmptrapd/Makefile.in:
 
-   Win32: Build fixes - change unsigned long long to uint64_t.
+   Win32: Added automatic manifest merging with mt.exe for MSVC 2008
+   etc.
+
+2009-05-08 13:12  alex_b
+
+   * agent/mibgroup/winExtDLL.c:
+
+   Changes: Win32: Add support for Windows 7, Vista and 2008 for
+   winExtDLL.
+
+2009-05-08 02:07  alex_b
+
+   * win32/libsnmp_dll/libsnmp.def, win32/libsnmp_dll/libsnmp.def.in:
+
+   Win32: Build fixes for DLL.
 
 2009-05-07 23:00  tanders
 
@@ -3901,17 +10316,315 @@
 
    build fix for HP-UX: include <sys/param.h> for DEV_BSIZE
 
+2009-05-07 05:11  nba
+
+   * agent/snmp_perl.h:
+
+   Ups, missed a new prototype header
+
+2009-05-06 22:26  nba
+
+   * man/snmpd.conf.5.def:
+
+   A man line cannot start with a '
+
+2009-05-06 22:07  nba
+
+   * snmplib/snmpUDPIPv6Domain.c:
+
+   IPv6 adresses are a bit more complicated then 32bits
+
+2009-05-06 22:06  nba
+
+   *  agent/agent_sysORTable.c, agent/helpers/instance.c,   
+      agent/mibgroup/agentx/client.c, agent/mibgroup/agentx/client.h,   
+      agent/mibgroup/disman/event/mteObjects.c,   
+      agent/mibgroup/disman/event/mteObjects.h,   
+      agent/mibgroup/disman/event/mteTrigger.c,   
+      agent/mibgroup/disman/event/mteTrigger.h,   
+      agent/mibgroup/disman/event/mteTriggerConf.c,   
+      agent/mibgroup/mibII/vacm_conf.c,   
+      include/net-snmp/agent/instance.h,   
+      include/net-snmp/agent/sysORTable.h,   
+      include/net-snmp/library/oid_stash.h, snmplib/oid_stash.c:
+
+   Sprinkle some const-ness where relevant
+
+2009-05-06 22:02  nba
+
+   * snmplib/scapi.c, snmplib/snmpUDPDomain.c:
+
+   Trivial warning fixes
+
+2009-05-06 22:00  nba
+
+   * mibs/rfcmibs.diff:
+
+   Hmmm, IANA fixed their bug too
+
+2009-05-06 21:59  nba
+
+   * README:
+
+   Update email to current
+
+2009-05-06 21:59  nba
+
+   *  agent/agent_trap.c, agent/mibgroup/hardware/cpu/cpu_linux.c,   
+      agent/mibgroup/host/hr_swrun.c,   
+      agent/mibgroup/if-mib/data_access/interface_linux.c,   
+      agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c,   
+      agent/mibgroup/ip-mib/data_access/systemstats_linux.c,   
+      agent/mibgroup/mibII/sysORTable.c,   
+      agent/mibgroup/mibII/system_mib.c,   
+      agent/mibgroup/notification/snmpNotifyFilterProfileTable.c,   
+      agent/mibgroup/ucd-snmp/logmatch.c,   
+      agent/mibgroup/ucd-snmp/pass.c,   
+      agent/mibgroup/ucd-snmp/pass_persist.c,   
+      agent/mibgroup/util_funcs/get_pid_from_inode.c,   
+      agent/snmp_agent.c, agent/snmp_perl.c, agent/snmp_vars.c,   
+      agent/snmpd.c, perl/SNMP/SNMP.xs,   
+      perl/TrapReceiver/TrapReceiver.xs, snmplib/container_list_ssll.c, 
+        snmplib/snmp_service.c:
+
+   Trivial warning fixes
+
+2009-05-06 21:49  nba
+
+   * apps/snmptrapd_log.c:
+
+   contextEngineID is a hexstring, not an object identifier
+
+2009-05-06 21:45  nba
+
+   *  agent/agent_registry.c, agent/helpers/cache_handler.c,   
+      agent/helpers/table.c, agent/helpers/table_dataset.c,   
+      agent/mibgroup/agent/extend.c, agent/mibgroup/agentx/master.c,   
+      agent/mibgroup/agentx/master_admin.c,   
+      agent/mibgroup/agentx/protocol.c,   
+      agent/mibgroup/agentx/subagent.c,   
+      agent/mibgroup/disman/event/mteObjectsConf.c,   
+      agent/mibgroup/disman/schedule/schedCore.c,   
+      agent/mibgroup/header_complex.c,   
+      agent/mibgroup/if-mib/data_access/interface.c,   
+      agent/mibgroup/if-mib/data_access/interface_solaris2.c,   
+      agent/mibgroup/if-mib/ifTable/ifTable_data_access.c,   
+      agent/mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable_data_access.c,
+        
+      agent/mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable_data_access.c,
+         agent/mibgroup/ip-mib/data_access/ipaddress_common.c,   
+      agent/mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable_data_access.c,
+         agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c,   
+      agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_data_access.c,
+        
+      agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_access.c,
+        
+      agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access.c,
+        
+      agent/mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable_data_access.c,
+         agent/mibgroup/notification-log-mib/notification_log.c,   
+      agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable_data_access.c,
+        
+      agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable_interface.c,
+         agent/mibgroup/snmpv3/usmUser.c,   
+      agent/mibgroup/target/snmpTargetAddrEntry.c,   
+      agent/mibgroup/target/snmpTargetParamsEntry.c,   
+      agent/mibgroup/target/target.c,   
+      agent/mibgroup/tcp-mib/tcpConnectionTable/tcpConnectionTable_data_access.c,
+        
+      agent/mibgroup/tcp-mib/tcpListenerTable/tcpListenerTable_data_access.c,
+         agent/mibgroup/ucd-snmp/proxy.c,   
+      agent/mibgroup/udp-mib/data_access/udp_endpoint_linux.c,   
+      agent/mibgroup/udp-mib/udpEndpointTable/udpEndpointTable_data_access.c,
+         agent/mibgroup/utilities/execute.c, apps/encode_keychange.c,   
+      snmplib/asn1.c, snmplib/dir_utils.c, snmplib/int64.c,   
+      snmplib/mib.c, snmplib/read_config.c,   
+      snmplib/snmpCallbackDomain.c, snmplib/snmp_alarm.c,   
+      snmplib/snmp_api.c, snmplib/snmp_client.c, snmplib/snmpusm.c,   
+      snmplib/snmpv3.c:
+
+   Fix format warnings from debug output
+
+2009-05-06 20:45  nba
+
+   * mibs/smistrip:
+
+   Properly recognize message syntax modules (to be able to ignore
+   them)
+
+2009-05-06 20:36  nba
+
+   * mibs/rfclist:
+
+   RFC updates
+
+2009-05-06 20:35  nba
+
+   * mibs/rfcmibs.diff:
+
+   Syntax fix for current IANA-PRINTER-MIB
+
+2009-05-06 20:34  nba
+
+   * mibs/IANAifType-MIB.txt:
+
+   Update to current IANA version
+
+2009-05-04 13:47  alex_b
+
+   * win32/libsnmp_dll/libsnmp.def, win32/libsnmp_dll/libsnmp.def.in:
+
+   Win32: Build fixes for DLL.
+
+2009-05-01 15:43  magfr
+
+   * include/net-snmp/library/snmp_debug.h, snmplib/snmp_debug.c:
+
+   NEWS: snmplib: Stop using a fixed string for indentation. Remove
+   the DEBUGINDENT() macro (that did nothing). Change the meaning of
+   the internal __DBGINDENT() macro to return the number of spaces
+   to indent instead of a string that represent the indentation
+   level. Deprecate the debug_indent function.
+
+2009-04-30 06:57  magfr
+
+   *  agent/mibgroup/examples/watched.c,   
+      agent/mibgroup/mibII/snmp_mib.c,   
+      agent/mibgroup/mibII/snmp_mib_5_5.c,   
+      agent/mibgroup/mibII/sysORTable.c,   
+      agent/mibgroup/mibII/system_mib.c, local/mib2c.int_watch.conf:
+
+   CHANGES: snmpd: Use static watcher_info for all watched variables
+   and in int_watch.
+
+2009-04-30 06:41  magfr
+
+   * agent/helpers/watcher.c, include/net-snmp/agent/watcher.h:
+
+   CHANGES: snmplib: Separate initialization from allocation for
+   netsnmp_watcher_info structures to make it possible to use
+   statically allocated data.
+
+2009-04-30 06:34  magfr
+
+   * snmplib/snmpDTLSUDPDomain.c:
+
+   Add missing return value.
+
+2009-04-30 00:18  hardaker
+
+   * man/snmpd.conf.5.def:
+
+   document the DTLS support; semi document the SSH support and
+   document the -s switch to many VACM settings
+
+2009-04-29 23:54  hardaker
+
+   * snmplib/snmpDTLSUDPDomain.c:
+
+   protect against connection opening errors and free memory on
+   failures
+
+2009-04-29 12:19  alex_b
+
+   *  win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   Win32: Update defines for _WIN32_WINNT and NTDDI_VERSION to
+   support Windows 2000 and higher and add IPV6 define to allow IPV6
+   code to compile.
+
+2009-04-28 06:34  magfr
+
+   * agent/mibgroup/ip-mib/data_access/systemstats_linux.c:
+
+   snmpd, Linux: Remove some unused variables.
+
+2009-04-28 06:07  magfr
+
+   * agent/mibgroup/ip-mib/data_access/scalars_linux.c:
+
+   snmpd: Add missing argument to printf-like call.
+
+2009-04-28 05:53  magfr
+
+   * agent/mibgroup/mibII/system_mib.c:
+
+   snmpd: Mark more oids as const.
+
+2009-04-28 05:51  magfr
+
+   * snmplib/mib.c:
+
+   Return a value from sprint_realloc_value even if no subtree is
+   located.
+
+2009-04-28 01:12  alex_b
+
+   *  agent/mibgroup/winExtDLL.c, win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   Win32: MSVC: Only use Windows API functions available on WinXP or
+   before (IPV6) or 2000 or before (no IPV6).
+
+2009-04-26 23:30  alex_b
+
+   *  win32/Makefile-apps.in, win32/libsnmp_dll/Makefile.in,   
+      win32/snmpd/Makefile.in, win32/snmpdsdk/Makefile.in,   
+      win32/snmpnetstat/Makefile.in, win32/snmptrapd/Makefile.in:
+
+   Win32: Remove machine type of I386 from LINK32_FLAGS to allow
+   compiling with MSVC 2008 as either 32 or 64-bit.
+
+2009-04-26 17:38  alex_b
+
+   *  win32/Makefile-apps.in, win32/Makefile.in,   
+      win32/libsnmp_dll/Makefile.in, win32/snmpd/Makefile.in,   
+      win32/snmpdsdk/Makefile.in, win32/snmpnetstat/Makefile.in,   
+      win32/snmptrapd/Makefile.in:
+
+   CHANGES: Win32: Build fixes for MSVC 2008. Copy and cleanup
+   manifest files.
+
+2009-04-26 15:21  alex_b
+
+   *  agent/mibgroup/ucd-snmp/pass.c,   
+      agent/mibgroup/ucd-snmp/pass_persist.c,   
+      win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   Win32: Re-enable pass and pass_persist Counter64 for MSVC.
+
+2009-04-26 14:34  alex_b
+
+   *  agent/mibgroup/mibII/interfaces.c,   
+      agent/mibgroup/mibII/interfaces.h, snmplib/snmpTCPIPv6Domain.c,   
+      snmplib/snmpUDPIPv6Domain.c, win32/build.pl,   
+      win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: Win32: Build fixes for MSVC 2008. IFTYPE is defined by
+   MSVC 2008, so interfaces.c variables were changed to NETSNMP_.
+
 2009-04-26 13:06  alex_b
 
    * agent/mibgroup/winExtDLL.c:
 
    Win32: Update build instructions in comments.
 
+2009-04-24 13:28  hardaker
+
+   * perl/agent/agent.xs:
+
+   fix the ASN_OPAQUE patch that was commited without proper diff
+   context
+
 2009-04-24 07:31  tanders
 
-   * configure, configure.in:
+   * configure, configure.d/config_os_misc4:
 
-   CHANGES: HP-UX: BUG: 2779472: Filesystems missing in hrStorage table on HP-UX 11.31
+   CHANGES: HP-UX: BUG: 2779472: Filesystems missing in hrStorage
+   table on HP-UX 11.31
    (allow for mnttab that is a character special device)
 
 2009-04-24 01:36  alex_b
@@ -3921,18 +10634,74 @@
 
    CHANGES: Win32: BUG: 2779541 Fixed handle leak in pass_persist.
 
-2009-04-23 23:14  tanders
-
-   * agent/mibgroup/host/hr_storage.c:
-
-   CHANGES: AIX: BUG: 2712670: Agent crashes on AIX with hrStorage
-
 2009-04-23 22:53  hardaker
 
-   * snmplib/snmp_alarm.c:
+   * agent/mibgroup/hardware/sensors.h, snmplib/snmp_alarm.c:
 
    fix C++ style comments
 
+2009-04-23 22:25  hardaker
+
+   *  man/netsnmp_access_multiplexer.3, man/netsnmp_agent.3,   
+      man/netsnmp_agent_handler.h.3, man/netsnmp_agent_registry.3,   
+      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
+      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
+      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
+      man/netsnmp_container.3, man/netsnmp_container_iterator.3,   
+      man/netsnmp_container_iterator.h.3, man/netsnmp_data_list.3,   
+      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
+      man/netsnmp_handler.3, man/netsnmp_instance.3,   
+      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
+      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
+      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
+      man/netsnmp_multiplexer.3,   
+      man/netsnmp_netsnmp_agent_request_info_s.3,   
+      man/netsnmp_netsnmp_column_info_t.3,   
+      man/netsnmp_netsnmp_data_list_s.3,   
+      man/netsnmp_netsnmp_handler_registration_s.3,   
+      man/netsnmp_netsnmp_iterator_info_s.3,   
+      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_s.3,   
+      man/netsnmp_netsnmp_monitor_callback_header_s.3,   
+      man/netsnmp_netsnmp_request_info_s.3,   
+      man/netsnmp_netsnmp_table_registration_info_s.3,   
+      man/netsnmp_netsnmp_table_request_info_s.3,   
+      man/netsnmp_null_container.3, man/netsnmp_oid_stash.3,   
+      man/netsnmp_old_api.3, man/netsnmp_read_config.3,   
+      man/netsnmp_read_only.3, man/netsnmp_row_merge.3,   
+      man/netsnmp_scalar.3, man/netsnmp_scalar_group_group.3,   
+      man/netsnmp_serialize.3, man/netsnmp_snmp_agent.3,   
+      man/netsnmp_snmp_alarm.3, man/netsnmp_snmp_client.3,   
+      man/netsnmp_snmp_logging.3, man/netsnmp_snmp_pdu.3,   
+      man/netsnmp_snmp_session.3, man/netsnmp_stash_cache.3,   
+      man/netsnmp_stash_to_next.3, man/netsnmp_table.3,   
+      man/netsnmp_table_array.3, man/netsnmp_table_container.3,   
+      man/netsnmp_table_data.3, man/netsnmp_table_dataset.3,   
+      man/netsnmp_table_generic.3, man/netsnmp_table_indexes.3,   
+      man/netsnmp_table_iterator.3, man/netsnmp_table_iterator.h.3,   
+      man/netsnmp_table_maintenance.3, man/netsnmp_table_row.3,   
+      man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
+      man/netsnmp_tools.h.3, man/netsnmp_util.3,   
+      man/netsnmp_utilities.3, man/netsnmp_variable_list.3,   
+      man/netsnmp_watcher.3:
+
+   documentation update
+
+2009-04-23 22:23  hardaker
+
+   *  man/config_api.3, man/pdu_api.3, man/session_api.3,   
+      man/varbind_api.3:
+
+   initial doxygen extracts for the new headers
+
+2009-04-23 22:19  hardaker
+
+   *  FAQ, README, configure, configure.ac, dist/Makefile,   
+      dist/net-snmp.spec:
+
+   Version number update
+
 2009-04-23 22:16  tanders
 
    * agent/mibgroup/host/hr_filesys.c:
@@ -3941,28 +10710,91 @@
 
 2009-04-23 22:10  tanders
 
-   * configure, configure.in:
+   * configure, configure.d/config_os_misc4:
 
-   CHANGES: HP-UX: BUG: 2779472: Filesystems missing in hrStorage table on HP-UX 11.31
+   CHANGES: HP-UX: BUG: 2779472: Filesystems missing in hrStorage
+   table on
+   HP-UX 11.31
 
 2009-04-23 21:48  tanders
 
    * agent/mibgroup/kernel_sunos5.c:
 
-   CHANGES: Solaris: PATCH: 2751588: Inconsistent data (e.g. UDP/TCP MIB scalar values of zero) can be reported on Solaris 10U4+
+   CHANGES: Solaris: PATCH: 2751588: Inconsistent data (e.g. UDP/TCP
+   MIB
+   scalar values of zero) can be reported on Solaris 10U4+
    Patch provided by Anders Persson
 
+2009-04-23 17:30  hardaker
+
+   *  agent/mibgroup/ucd-snmp/logmatch.c,   
+      agent/mibgroup/ucd-snmp/logmatch.h:
+
+   NEWS: snmpd: PATCH: 1901764: from krisztoforo for supporting
+   logwatch files that are date based
+
+2009-04-23 17:22  hardaker
+
+   * perl/SNMP/SNMP.pm, perl/SNMP/SNMP.xs:
+
+   NEWS: perl: PATCH 1956193: from cacoyle: beta threadable perl
+   module code for SNMPv1/SNMPv2c usage.
+
 2009-04-23 16:57  hardaker
 
    * agent/mibgroup/kernel_sunos5.c:
 
-   CHANGES: solaris: PATCH: 2012404: deal with more than 10 interfaces. New hardcoded limit is 50. A better scaling patch would be appreciated :-)
+   CHANGES: solaris: PATCH: 2012404: deal with more than 10
+   interfaces. New hardcoded limit is 50. A better scaling patch
+   would be appreciated :-)
+
+2009-04-23 16:47  hardaker
+
+   *  README.agent-mibs, configure,   
+      configure.d/config_project_with_enable:
+
+   document that the etherlike-mib has an implementation
+
+2009-04-23 16:40  hardaker
+
+   *  agent/mibgroup/etherlike-mib,   
+      agent/mibgroup/etherlike-mib/data_access,   
+      agent/mibgroup/etherlike-mib/data_access/dot3stats.h,   
+      agent/mibgroup/etherlike-mib/data_access/dot3stats_linux.c,   
+      agent/mibgroup/etherlike-mib/dot3StatsTable,   
+      agent/mibgroup/etherlike-mib/dot3StatsTable.h,   
+      agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable.c,   
+      agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable.h,   
+      agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_access.c,
+        
+      agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_access.h,
+        
+      agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_get.c,
+        
+      agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_get.h,
+        
+      agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_set.c,
+        
+      agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_set.h,
+        
+      agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_enums.h,
+        
+      agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_interface.c,
+        
+      agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_interface.h,
+        
+      agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_oids.h,
+         agent/mibgroup/etherlike-mib/dot3StatsTable/ioctl_imp_common.h:
+
+   NEWS: snmpd: PATCH: 2053273: from narendra_k_dell to imlpement
+   the etherlike mib (at least on linux)
 
 2009-04-23 16:35  hardaker
 
    * local/mib2c-conf.d/generic-table-oids.m2c:
 
-   CHANGES: mib2c: PATCH: 2136437: make FLAG defines more 64bit friendly when huge tables are encountered
+   CHANGES: mib2c: PATCH: 2136437: make FLAG defines more 64bit
+   friendly when huge tables are encountered
 
 2009-04-23 16:27  hardaker
 
@@ -3975,13 +10807,15 @@
 
    * python/netsnmp/client.py:
 
-   CHANGES: python: PATCH: 2074817: from fenner to fix regexp engine CPU performance issues
+   CHANGES: python: PATCH: 2074817: from fenner to fix regexp engine
+   CPU performance issues
 
 2009-04-23 16:14  hardaker
 
    * agent/mibgroup/host/hr_storage.c:
 
-   CHANGES: snmpd: PATCH: 2162652: patch to fix simple hrfs checks when NFS is in use.
+   CHANGES: snmpd: PATCH: 2162652: patch to fix simple hrfs checks
+   when NFS is in use.
 
 2009-04-23 16:11  hardaker
 
@@ -4033,6 +10867,58 @@
 
    Fix memory leak in SCTP containers.
 
+2009-04-23 08:29  dts12
+
+   *  include/net-snmp/library/large_fd_set.h,   
+      include/net-snmp/types.h:
+
+   netsnmp_large_fd_set is probably best regarded as an "opaque"
+   data
+   structure, and isn't really intended for direct manipulation.
+   Move it back into the <library/large_fd_set.h> header file.
+   (Like it was before Dave stuck his oar in....)
+
+2009-04-23 08:19  dts12
+
+   *  include/net-snmp/library/large_fd_set.h,   
+      include/net-snmp/session_api.h, include/net-snmp/types.h,   
+      snmplib/fd_event_manager.c, snmplib/large_fd_set.c,   
+      snmplib/snmp_api.c:
+
+   Fuerther improvements to the large FD set support
+   (See patch #2772787)
+
+2009-04-23 06:45  magfr
+
+   * agent/mibgroup/sctp-mib/sctpTables.h:
+
+   building: Use config_error(...) instead of
+   config_require(non-existing) to get better error messages.
+
+2009-04-23 06:41  magfr
+
+   *  agent/mibgroup/sctp-mib/sctpTables.h,   
+      agent/mibgroup/sctp-mib/sctpTables_linux.c,   
+      agent/mibgroup/tcp-mib/data_access/tcpConn.h,   
+      agent/mibgroup/tcp-mib/data_access/tcpConn_linux.c,   
+      agent/mibgroup/udp-mib/data_access/udp_endpoint.h,   
+      agent/mibgroup/udp-mib/data_access/udp_endpoint_linux.c,   
+      agent/mibgroup/util_funcs.c, agent/mibgroup/util_funcs.h,   
+      agent/mibgroup/util_funcs/get_pid_from_inode.c,   
+      agent/mibgroup/util_funcs/get_pid_from_inode.h:
+
+   snmplib, Linux: Move get_pid_from_inode to it's own file and only
+   compile it if needed, also rename it to
+   netsnmp_get_pid_from_inode.
+
+2009-04-23 04:33  hardaker
+
+   *  agent/mibgroup/mibII/sysORTable.h,   
+      agent/mibgroup/mibII/system_mib.h, agent/snmpd.h:
+
+   CHANGES: snmpd: PATCH: 2431353 from hnrose to make some C++
+   compilers happier
+
 2009-04-23 03:27  hardaker
 
    * snmplib/snmp_alarm.c:
@@ -4040,27 +10926,264 @@
    CHANGES: snmplib: PATCH: 2505488: from dabokey to fix alarms not
    being triggered at the right times due to large clock skews.
 
+2009-04-23 00:01  hardaker
+
+   *  apps/snmpnetstat/inet.c, apps/snmpnetstat/main.c,   
+      apps/snmpnetstat/netstat.h, man/snmpnetstat.1.def:
+
+   NEWS: snmpnetstat: PATCH: 2564538: from ahmake to support GETBULK
+   in v2c+ snmp versions
+
 2009-04-22 23:49  hardaker
 
    *  agent/mibgroup/agent/extend.c, apps/snmpnetstat/inet.c,   
-      apps/snmpnetstat/route.c, apps/snmptrapd_handlers.c,   
-      apps/snmptrapd_handlers.h, snmplib/system.c:
+      apps/snmpnetstat/route.c, snmplib/system.c:
 
    CHANGES: ports: PATCH: 2688342: from ahmake to fix various
    compiler warning
 
+2009-04-22 23:23  hardaker
+
+   * perl/agent/agent.xs:
+
+   CHANGES: perl: PATCH: 276371: from fhew to allow perl to use
+   OPAQUEs
+
+2009-04-22 23:17  hardaker
+
+   * python/netsnmp/client_intf.c:
+
+   CHANGES: python: PATCH: 2775800: from Adam Romanek to allow
+   python threading to continue when a request is sent
+
 2009-04-22 22:11  alex_b
 
    * README, README.win32:
 
    Update THANKS section.
 
+2009-04-22 21:21  magfr
+
+   * agent/mibgroup/util_funcs.c:
+
+   Fold the function extract_inode. with only one user, into it's
+   user.
+   Remove the #define FILE_DISP, with only one user, with the actual
+   value.
+
+2009-04-22 21:03  magfr
+
+   * agent/snmpd.c:
+
+   Make it possible to build with SMUX enabled.
+
+2009-04-22 13:43  jsafranek
+
+   * README.agent-mibs:
+
+   Add a note how the new RMON-MIB implementaion works
+
+2009-04-22 13:41  dts12
+
+   * man/varbind_api.3.def:
+
+   Fill out the documentation of the Varbind-related API calls.
+
+2009-04-22 13:37  jsafranek
+
+   *  README.agent-mibs, agent/mibgroup/rmon-mib,   
+      agent/mibgroup/rmon-mib.h, agent/mibgroup/rmon-mib/data_access,   
+      agent/mibgroup/rmon-mib/data_access/etherstats.h,   
+      agent/mibgroup/rmon-mib/data_access/etherstats_linux.c,   
+      agent/mibgroup/rmon-mib/etherStatsTable,   
+      agent/mibgroup/rmon-mib/etherStatsTable.h,   
+      agent/mibgroup/rmon-mib/etherStatsTable/etherStatsTable.c,   
+      agent/mibgroup/rmon-mib/etherStatsTable/etherStatsTable.h,   
+      agent/mibgroup/rmon-mib/etherStatsTable/etherStatsTable_data_access.c,
+        
+      agent/mibgroup/rmon-mib/etherStatsTable/etherStatsTable_data_access.h,
+        
+      agent/mibgroup/rmon-mib/etherStatsTable/etherStatsTable_data_get.c,
+        
+      agent/mibgroup/rmon-mib/etherStatsTable/etherStatsTable_data_get.h,
+        
+      agent/mibgroup/rmon-mib/etherStatsTable/etherStatsTable_data_set.c,
+        
+      agent/mibgroup/rmon-mib/etherStatsTable/etherStatsTable_data_set.h,
+        
+      agent/mibgroup/rmon-mib/etherStatsTable/etherStatsTable_enums.h,  
+      
+      agent/mibgroup/rmon-mib/etherStatsTable/etherStatsTable_interface.c,
+        
+      agent/mibgroup/rmon-mib/etherStatsTable/etherStatsTable_interface.h,
+         agent/mibgroup/rmon-mib/etherStatsTable/etherStatsTable_oids.h,
+         agent/mibgroup/rmon-mib/etherStatsTable/ioctl_imp_common.h:
+
+   NEWS: snmpd: PATCH: 2103492: implement
+   RMON-MIB::etherStatsJabbers
+   Patch from Narendra K., Sandeep K. Shandilya and Shyam Iyer
+
 2009-04-22 10:08  dts12
 
    * man/mib_api.3.def:
 
    Correct a seriously misleading (i.e. wrong) description of the
-   purpose and behaviour of the print_description family of calls.
+   purpose
+   and behaviour of the print_description family of calls.
+
+2009-04-22 09:32  dts12
+
+   * man/mib_api.3.def:
+
+   Further polishing of the descriptions of MIB-related API calls.
+
+2009-04-22 07:39  dts12
+
+   * snmplib/snmp_api.c:
+
+   Remove unnecessary range checks.
+   (These are handled within the large_fd_set routines themselves).
+
+2009-04-21 23:27  alex_b
+
+   *  win32/libsnmp/Makefile.in, win32/libsnmp/libsnmp.dsp,   
+      win32/libsnmp_dll/Makefile.in, win32/libsnmp_dll/libsnmp.def,   
+      win32/libsnmp_dll/libsnmp.def.in,   
+      win32/libsnmp_dll/libsnmp_dll.dsp:
+
+   win32: Fix Windows build environment to support patch 2772787.
+
+2009-04-21 15:33  dts12
+
+   *  agent/snmpd.c, include/net-snmp/library/fd_event_manager.h,   
+      include/net-snmp/library/large_fd_set.h,   
+      include/net-snmp/session_api.h, include/net-snmp/types.h,   
+      snmplib/Makefile.in, snmplib/fd_event_manager.c,   
+      snmplib/large_fd_set.c, snmplib/snmp_api.c:
+
+   Revised version of patch #2772787
+
+2009-04-21 15:15  dts12
+
+   *  include/net-snmp/library/large_fd_set.h,   
+      include/net-snmp/session_api.h, include/net-snmp/types.h,   
+      snmplib/Makefile.in, snmplib/large_fd_set.c, snmplib/snmp_api.c,  
+       win32/libsnmp/libsnmp.dsp:
+
+   Undo revision 17515
+   (broken/incomplete patch)
+
+2009-04-21 14:37  dts12
+
+   *  include/net-snmp/library/large_fd_set.h,   
+      include/net-snmp/session_api.h, include/net-snmp/types.h,   
+      snmplib/Makefile.in, snmplib/large_fd_set.c, snmplib/snmp_api.c,  
+       win32/libsnmp/libsnmp.dsp:
+
+   CHANGES: snmplib: PATCH: 2772787: Cleaner approach to handling
+   large fd_sets.
+   Based on patch supplied by Bart Van Assche.
+
+2009-04-21 14:34  dts12
+
+   * man/Makefile.in:
+
+   Properly generate new core API man pages.
+
+2009-04-21 09:38  dts12
+
+   *  include/net-snmp/config_api.h, include/net-snmp/library/mib.h,   
+      include/net-snmp/library/parse.h,   
+      include/net-snmp/library/read_config.h,   
+      include/net-snmp/library/snmp_api.h,   
+      include/net-snmp/library/snmp_client.h,   
+      include/net-snmp/mib_api.h, include/net-snmp/pdu_api.h,   
+      include/net-snmp/session_api.h, include/net-snmp/types.h,   
+      include/net-snmp/varbind_api.h:
+
+   First-cut at identifying the core Net-SNMP API calls.
+   Move these into the appropriate top-level header files.
+
+2009-04-21 09:36  dts12
+
+   *  man/Makefile.in, man/config_api.3.def, man/read_config.3.def,   
+      man/session_api.3.def, man/snmp_api.3.def:
+
+   Rename config/session API man pages, in line with other core API
+   structure.
+
+2009-04-21 09:32  dts12
+
+   *  man/Makefile.in, man/mib_api.3.def, man/pdu_api.3.def,   
+      man/read_config.3.def, man/snmp_api.3.def, man/varbind_api.3.def:
+
+   Document (or restructure) the core API elements.
+   Align this organisation with the first-cut restructuring
+   of the main header files.
+
+2009-04-20 10:23  dts12
+
+   * snmplib/snmp_api.c:
+
+   Skip file handles that are too large for fd_set to cope with.
+   A simple fix for the immediate problem addressed by patch
+   #1627049.
+
+2009-04-20 10:19  dts12
+
+   * include/net-snmp/library/snmp_api.h, snmplib/snmp_api.c:
+
+   Revert patch #1627049 (extension to deal with large file
+   handlers).
+   See the discussion on that tracker entry for background as to
+   why.
+
+2009-04-20 00:59  alex_b
+
+   *  README.win32, agent/mibgroup/ucd-snmp/pass.c,   
+      agent/mibgroup/ucd-snmp/pass_persist.c,   
+      agent/mibgroup/util_funcs.h,   
+      include/net-snmp/data_access/interface.h,   
+      include/net-snmp/library/snmpUDPDomain.h, perl/agent/agent.xs,   
+      win32/Configure, win32/libagent/Makefile.in,   
+      win32/libagent/libagent.dsp, win32/libsnmp_dll/libsnmp.def.in,   
+      win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in,   
+      win32/netsnmpmibs/Makefile.in, win32/netsnmpmibs/netsnmpmibs.dsp, 
+        win32/netsnmpmibssdk/Makefile.in,   
+      win32/netsnmpmibssdk/netsnmpmibssdk.dsp:
+
+   win32: Build fixes for Windows. pass and pass_persist still need
+   to be fixed to support Counter64 on Windows.
+
+2009-04-20 00:48  alex_b
+
+   *  win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   win32: Sync net-snmp-config.h.in and net-snmp-config.h
+
+2009-04-17 21:21  magfr
+
+   *  configure, configure.d/config_os_progs, ltmain.sh, m4/libtool.m4, 
+        m4/ltoptions.m4, m4/ltsugar.m4, m4/ltversion.m4:
+
+   CHANGES: build: Upgrade libtool version to 2.2.6 in order to work
+   around a buglet that made autoreconf -vif erase config.sub and
+   config.guess.
+
+2009-04-14 21:59  magfr
+
+   * snmplib/parse.c:
+
+   CHANGES: snmplib: BUG: 1976772: Changed the mib parser to handle
+   long binary and hex strings.
+
+2009-04-11 12:52  rstory
+
+   * dist/makerelease.xml:
+
+   suggest truncation of ChangeLog.reallyadd
 
 2009-04-10 23:18  alex_b
 
@@ -4095,7 +11218,8 @@
 
 2009-04-10 21:45  alex_b
 
-   * win32/Configure:
+   *  win32/Configure, win32/dist/README.build.win32.txt,   
+      win32/dist/README.txt:
 
    Win32: Minor build and readme updates.
 
@@ -4107,24 +11231,27 @@
    NEWS: Win32: PATCH 2686248: Applied patch by Bart Van Assche
    which fixes several winExtDLL bugs.
 
-2009-04-10 20:14  rstory
+2009-04-10 20:17  rstory
 
    * agent/mibgroup/ucd-snmp/diskio.c:
 
-   restore annoying log message, but fix cause of it on !freebsd systems
+   restore annoying log message, but fix cause of it on !freebsd
+   systems
 
 2009-04-09 12:28  dts12
 
    * agent/helpers/table_iterator.c:
 
-   CHANGES: snmpd: PATCH: 1550730: Report errors from iterator-based handlers.
+   CHANGES: snmpd: PATCH: 1550730: Report errors from iterator-based
+   handlers.
    Based on a patch provided by Wayne Glantz
 
 2009-04-09 11:41  dts12
 
    * agent/mibgroup/snmpv3/usmUser.c:
 
-   CHANGES: snmpd: PATCH: 2124288: Fix setting of usmUserPrivProtocol at creation.
+   CHANGES: snmpd: PATCH: 2124288: Fix setting of
+   usmUserPrivProtocol at creation.
    Logic bug, reported by Ramesh Kotabagi
 
 2009-04-09 09:12  dts12
@@ -4141,47 +11268,98 @@
    CHANGES: python: PATCH: 2260828: Fix python snmpwalk memory leak
    Patch provided by Gabriele Messineo
 
+2009-04-09 08:58  dts12
+
+   * perl/SNMP/SNMP.pm, perl/SNMP/SNMP.xs:
+
+   CHANGES: perl: PATCH: 2272347: Implement "implied" in MIB hash
+   Patch provided by Bill Fenner
+
 2009-04-09 08:54  dts12
 
    * local/mib2c.iterate_access.conf:
 
-   CHANGES: mib2c: PATCH: 2316127: Fix bug in iterate_access generated code.
+   CHANGES: mib2c: PATCH: 2316127: Fix bug in iterate_access
+   generated code.
+
+2009-04-09 08:48  dts12
+
+   * include/net-snmp/system/netbsd.h:
+
+   CHANGES: snmpd: PATCH: 2435681: Enable if-mib rewrite (with
+   sysctl backend) on NetBSD
 
 2009-04-09 08:44  dts12
 
    * agent/mibgroup/if-mib/data_access/interface_sysctl.c:
 
-   CHANGES: snmpd: PATCH: 2435793: Support 64-bit IF-MIB counters on sysctl (*BSD) systems.
+   CHANGES: snmpd: PATCH: 2435793: Support 64-bit IF-MIB counters on
+   sysctl (*BSD) systems.
    Patch provided by Jan Andres
 
+2009-04-09 08:00  tanders
+
+   * perl/agent/agent.xs:
+
+   fix compilation warnings
+
+2009-04-08 23:17  tanders
+
+   * perl/agent/agent.xs:
+
+   move comments to a place where they are legal
+
+2009-04-08 23:03  tanders
+
+   * perl/agent/agent.pm, perl/agent/agent.xs:
+
+   - rename new getRequestorIp to getSourceIP and getTargetIp to
+   getDestIp
+   - remind that this is fully transport-specific, i.e. UDP/IPv4
+   only!
+
 2009-04-08 16:00  dts12
 
    * agent/snmp_agent.c:
 
-   CHANGES: snmpd: PATCH: 2384779: Fix handling of GetBulk with N>0,M==0
+   CHANGES: snmpd: PATCH: 2384779: Fix handling of GetBulk with
+   N>0,M==0
    Patch provided by Angus Salkeld
 
 2009-04-08 15:52  dts12
 
    * agent/mibgroup/host/hr_swrun.c:
 
-   CHANGES: snmpd: PATCH: 2406378: Fix hrSWRunPerfMem on 64-bit Solaris systems
+   CHANGES: snmpd: PATCH: 2406378: Fix hrSWRunPerfMem on 64-bit
+   Solaris systems
    Patch provided by NTwoO
 
 2009-04-08 15:48  dts12
 
    * snmplib/mib.c:
 
-   CHANGES: snmplib: PATCH: 2479700: Fix zoned IP address used as table indices
+   CHANGES: snmplib: PATCH: 2479700: Fix zoned IP address used as
+   table indices
    Patch provided by Brian Retford.
 
 2009-04-08 15:33  dts12
 
    * snmplib/snmp_logging.c:
 
-   CHANGES: snmplib: PATCH: 2492377: Fix typo/bug in snmp_enable_callback()
+   CHANGES: snmplib: PATCH: 2492377: Fix typo/bug in
+   snmp_enable_callback()
    Reported by joyceanmachine
 
+2009-04-08 15:29  dts12
+
+   *  agent/mibgroup/sctp-mib/sctpScalars.h,   
+      agent/mibgroup/sctp-mib/sctpScalars_freebsd.c,   
+      agent/mibgroup/sctp-mib/sctpTables.h,   
+      agent/mibgroup/sctp-mib/sctpTables_common.h,   
+      agent/mibgroup/sctp-mib/sctpTables_freebsd.c:
+
+   CHANGES: snmpd: PATCH: 2507249: sctp-mib support for FreeBSD.
+
 2009-04-08 15:16  dts12
 
    * snmplib/snmp_client.c:
@@ -4194,7 +11372,8 @@
 
    * python/netsnmp/client_intf.c:
 
-   CHANGES: python: PATCH: 2580979: Fix python session pointers on 64-bit systems.
+   CHANGES: python: PATCH: 2580979: Fix python session pointers on
+   64-bit systems.
    Patch provided by John Khvatov.
 
 2009-04-08 14:49  dts12
@@ -4208,8 +11387,7 @@
 2009-04-08 14:34  dts12
 
    *  perl/TrapReceiver/TrapReceiver.pm,   
-      perl/TrapReceiver/TrapReceiver.xs, perl/TrapReceiver/const-c.inc, 
-        perl/TrapReceiver/const-xs.inc:
+      perl/TrapReceiver/TrapReceiver.xs:
 
    CHANGES: snmptrapd: PATCH: 2726302: Pass results of Perl trap
    handlers to trap daemon
@@ -4223,6 +11401,14 @@
    high-ASCII chars
    Patch provided by Bart Van Assche
 
+2009-04-08 14:24  dts12
+
+   * perl/agent/agent.pm, perl/agent/agent.xs:
+
+   CHANGES: perl: PATCH: 2709705: Retrieve src/target IP address in
+   Perl-based agents
+   Patch provided by fhew
+
 2009-04-08 14:16  dts12
 
    * snmplib/snmpUDPIPv6Domain.c:
@@ -4249,6 +11435,28 @@
    Qn: Does this even qualify as an error? Wouldn't a warning be
    sufficient?
 
+2009-04-06 19:33  magfr
+
+   * include/net-snmp/library/parse.h, snmplib/parse.c:
+
+   snmplib: Make the node struct private. Hide the orhan_nodes
+   variable.
+
+2009-04-06 18:45  magfr
+
+   * agent/snmp_perl.c:
+
+   snmpd,perl: If my_perl is NULL when passed to perl_destruct then
+   that function crashes for some perl versions so check that it is
+   non-null before destroying it.
+
+2009-04-06 18:42  magfr
+
+   * perl/agent/agent.xs:
+
+   perl: Avoid surprises if the perl string contains printf escape
+   characters.
+
 2009-04-06 18:22  dts12
 
    * agent/mibgroup/host/hr_swrun.c:
@@ -4257,7 +11465,7 @@
    (Avoids truncated walk of hrSWRunPath on SuSE systems)
    Reported by Kamil Kisiel.
 
-2009-04-06 12:05  tanders
+2009-04-06 11:58  tanders
 
    * perl/agent/agent.xs, perl/agent/typemap:
 
@@ -4266,11 +11474,109 @@
    getRootOID works properly. Now passes "make test" and "make
    perltest".
 
-2009-04-06 12:02  dts12
+2009-04-05 10:05  magfr
 
-   * agent/mibgroup/hardware/memory/memory_linux.c:
+   *  agent/mibgroup/host/hr_storage.c,   
+      agent/mibgroup/ip-mib/data_access/systemstats_common.c,   
+      agent/mibgroup/ip-mib/data_access/systemstats_linux.c,   
+      agent/mibgroup/smux/smux.c:
 
-   Fix typo
+   Remove unused variables.
+
+2009-04-05 09:53  magfr
+
+   *  agent/helpers/table_dataset.c,   
+      agent/mibgroup/examples/netSnmpHostsTable.c,   
+      agent/mibgroup/mibII/ipCidrRouteTable.c,   
+      local/mib2c.iterate_access.conf, local/mib2c.notify.conf:
+
+   Make even more variables and templates const.
+
+2009-04-04 22:13  magfr
+
+   *  agent/mibgroup/agent/nsCache.c, agent/mibgroup/agent/nsDebug.c,   
+      agent/mibgroup/agent/nsLogging.c,   
+      agent/mibgroup/agent/nsModuleTable.c,   
+      agent/mibgroup/agent/nsTransactionTable.c,   
+      agent/mibgroup/agent/nsVacmAccessTable.c,   
+      agent/mibgroup/if-mib/ifTable/ifTable.c,   
+      agent/mibgroup/if-mib/ifTable/ifTable.h,   
+      agent/mibgroup/if-mib/ifXTable/ifXTable.c,   
+      agent/mibgroup/if-mib/ifXTable/ifXTable.h,   
+      agent/mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable.c,
+        
+      agent/mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable.h,
+        
+      agent/mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable.c,
+        
+      agent/mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable.h,
+        
+      agent/mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable.c,  
+       agent/mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable.h, 
+       
+      agent/mibgroup/ip-mib/ipAddressPrefixTable/ipAddressPrefixTable.c,
+        
+      agent/mibgroup/ip-mib/ipAddressPrefixTable/ipAddressPrefixTable.h,
+         agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c,   
+      agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.h,   
+      agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable.c,
+        
+      agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable.h,
+         agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable.c,   
+      agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable.h,   
+      agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c,   
+      agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h,   
+      agent/mibgroup/ip-mib/ipv4InterfaceTable/ipv4InterfaceTable.c,   
+      agent/mibgroup/ip-mib/ipv4InterfaceTable/ipv4InterfaceTable.h,   
+      agent/mibgroup/ip-mib/ipv6InterfaceTable/ipv6InterfaceTable.c,   
+      agent/mibgroup/ip-mib/ipv6InterfaceTable/ipv6InterfaceTable.h,   
+      agent/mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable.c,
+        
+      agent/mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable.h,
+         agent/mibgroup/mibII/icmp.c, agent/mibgroup/mibII/snmp_mib.c,  
+       agent/mibgroup/mibII/sysORTable.c,   
+      agent/mibgroup/mibII/tcpTable.c, agent/mibgroup/mibII/updates.c,  
+       agent/mibgroup/mibII/updates.h,   
+      agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable.c,
+        
+      agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable.h,
+        
+      agent/mibgroup/snmp-usm-dh-objects-mib/usmDHUserKeyTable/usmDHUserKeyTable.c,
+        
+      agent/mibgroup/snmp-usm-dh-objects-mib/usmDHUserKeyTable/usmDHUserKeyTable.h,
+         agent/mibgroup/target/target_counters.c,   
+      agent/mibgroup/tcp-mib/tcpConnectionTable/tcpConnectionTable.c,   
+      agent/mibgroup/tcp-mib/tcpConnectionTable/tcpConnectionTable.h,   
+      agent/mibgroup/tcp-mib/tcpListenerTable/tcpListenerTable.c,   
+      agent/mibgroup/tcp-mib/tcpListenerTable/tcpListenerTable.h,   
+      agent/mibgroup/udp-mib/udpEndpointTable/udpEndpointTable.c,   
+      agent/mibgroup/udp-mib/udpEndpointTable/udpEndpointTable.h:
+
+   snmpd: Make more local variables const and local.
+
+2009-04-04 10:07  magfr
+
+   * agent/snmpd.c, apps/snmptrapd.c, net-snmp-config.in:
+
+   Mark the reconfig variable as static since it is private to the
+   module.
+
+2009-04-04 10:03  magfr
+
+   * agent/mibgroup/ucd-snmp/memory.c:
+
+   Mark the file scope private variable minimum_swap as static.
+
+2009-04-04 09:58  magfr
+
+   *  agent/mibgroup/if-mib/ifTable/ifTable.c,   
+      agent/mibgroup/if-mib/ifTable/ifTable_interface.c,   
+      agent/mibgroup/ucd-snmp/lmsensorsMib.c,   
+      agent/mibgroup/ucd-snmp/memory.c,   
+      agent/mibgroup/ucd-snmp/vmstat.c:
+
+   snmplib: Make more symbols const in order to move them to
+   readonly memory.
 
 2009-04-02 21:24  hardaker
 
@@ -4279,6 +11585,127 @@
    CHANGES: BUG 112694: Patch from Bill Fenner: don't open (and
    clobber) an agentx socket if the other transports fail to open
 
+2009-04-01 23:41  hardaker
+
+   * CHANGES, NEWS:
+
+   version update
+
+2009-04-01 23:19  hardaker
+
+   * ChangeLog:
+
+   version update
+
+2009-04-01 23:04  hardaker
+
+   *  agent/Makefile.depend, agent/helpers/Makefile.depend,   
+      agent/mibgroup/Makefile.depend, apps/Makefile.depend,   
+      apps/snmpnetstat/Makefile.depend, snmplib/Makefile.depend:
+
+   make depend
+
+2009-04-01 23:03  hardaker
+
+   * snmplib/parse.c, snmplib/snmpDTLSUDPDomain.c, snmplib/snmptsm.c:
+
+   convert comments to ANSI comments
+
+2009-04-01 22:21  hardaker
+
+   *  man/Makefile.in, man/netsnmp_access_multiplexer.3,   
+      man/netsnmp_agent.3, man/netsnmp_agent_handler.h.3,   
+      man/netsnmp_agent_registry.3, man/netsnmp_agent_trap.3,   
+      man/netsnmp_asn1_packet_parse.3, man/netsnmp_baby_steps.3,   
+      man/netsnmp_bulk_to_next.3, man/netsnmp_cache_handler.3,   
+      man/netsnmp_callback.3, man/netsnmp_container.3,   
+      man/netsnmp_container_iterator.3,   
+      man/netsnmp_container_iterator.h.3, man/netsnmp_data_list.3,   
+      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
+      man/netsnmp_handler.3, man/netsnmp_instance.3,   
+      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
+      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
+      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
+      man/netsnmp_multiplexer.3,   
+      man/netsnmp_netsnmp_agent_request_info_s.3,   
+      man/netsnmp_netsnmp_column_info_t.3,   
+      man/netsnmp_netsnmp_data_list_s.3,   
+      man/netsnmp_netsnmp_handler_registration_s.3,   
+      man/netsnmp_netsnmp_iterator_info_s.3,   
+      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_methods.3,   
+      man/netsnmp_netsnmp_mib_handler_s.3,   
+      man/netsnmp_netsnmp_monitor_callback_header_s.3,   
+      man/netsnmp_netsnmp_request_info_s.3,   
+      man/netsnmp_netsnmp_table_registration_info_s.3,   
+      man/netsnmp_netsnmp_table_request_info_s.3,   
+      man/netsnmp_null_container.3, man/netsnmp_oid_stash.3,   
+      man/netsnmp_old_api.3, man/netsnmp_read_config.3,   
+      man/netsnmp_read_only.3, man/netsnmp_row_merge.3,   
+      man/netsnmp_scalar.3, man/netsnmp_scalar_group_group.3,   
+      man/netsnmp_serialize.3, man/netsnmp_snmp_agent.3,   
+      man/netsnmp_snmp_alarm.3, man/netsnmp_snmp_client.3,   
+      man/netsnmp_snmp_logging.3, man/netsnmp_snmp_pdu.3,   
+      man/netsnmp_snmp_session.3, man/netsnmp_stash_cache.3,   
+      man/netsnmp_stash_to_next.3, man/netsnmp_table.3,   
+      man/netsnmp_table_array.3, man/netsnmp_table_container.3,   
+      man/netsnmp_table_data.3, man/netsnmp_table_dataset.3,   
+      man/netsnmp_table_generic.3, man/netsnmp_table_indexes.3,   
+      man/netsnmp_table_iterator.3, man/netsnmp_table_iterator.h.3,   
+      man/netsnmp_table_maintenance.3, man/netsnmp_table_row.3,   
+      man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
+      man/netsnmp_tools.h.3, man/netsnmp_util.3,   
+      man/netsnmp_utilities.3, man/netsnmp_variable_list.3,   
+      man/netsnmp_watcher.3:
+
+   documentation update
+
+2009-04-01 22:03  hardaker
+
+   *  FAQ, README, configure, configure.ac, dist/Makefile,   
+      dist/makerelease.xml, dist/net-snmp.spec:
+
+   Version number update
+
+2009-04-01 21:58  hardaker
+
+   * man/snmp.conf.5.def, man/snmpd.8.def:
+
+   updates for SSH
+
+2009-04-01 19:39  magfr
+
+   * include/net-snmp/library/snmp_client.h, snmplib/snmp_client.c:
+
+   Make the src pointer of snmp_clone_mem a pointer to constant.
+
+2009-04-01 18:23  hardaker
+
+   * apps:
+
+   ignore 'sshtosnmp'
+
+2009-04-01 17:31  hardaker
+
+   *  apps/sshtosnmp.c, include/net-snmp/library/default_store.h,   
+      man/snmpd.8.def, snmplib/snmpSSHDomain.c:
+
+   Make ssh transport support use a unix socket with proper
+   credential passing
+
+2009-04-01 17:29  hardaker
+
+   * agent/mibgroup/util_funcs.c:
+
+   make the exec cache readable only by the user
+
+2009-04-01 17:28  hardaker
+
+   *  agent/mibgroup/agentx/agentx_config.c,   
+      include/net-snmp/library/system.h, snmplib/system.c:
+
+   move string to uid/gid functionality to snmplib for reuse
+
 2009-03-31 15:12  dts12
 
    * local/mib2c.table_data.conf:
@@ -4300,6 +11727,93 @@
 
    C comments use /* ... */, not #
 
+2009-03-31 08:05  jsafranek
+
+   * agent/mibgroup/mibII/icmp.c:
+
+   Fix compilation with glibc < 2.4, ICMPv6 message types starting
+   with MLD_* have different name there.
+
+2009-03-24 06:04  magfr
+
+   * snmplib/snmp_openssl.c:
+
+   Do not compile the parts that depend on libssl if libssl is
+   missing.
+
+2009-03-23 09:21  jsafranek
+
+   *  agent/mibgroup/ip-mib/data_access/arp_common.c,   
+      agent/mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable.c,  
+       agent/mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable.h, 
+       
+      agent/mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable_data_access.c,
+         include/net-snmp/data_access/arp.h:
+
+   NEWS: snmpd: ipNetToPhysicalLastUpdated OID implemented
+   
+   The value is estimated with every cache reload, which is once in
+   60 seconds by default.
+   That means the value reported by snmpd may differ from reality by
+   one minute.
+   If anybody needs better precision, the cache timeout can be
+   configured by setting
+   NET-SNMP-AGENT-MIB::nsCacheTimeout.1.3.6.1.2.1.4.35 to
+   appropriate value by snmpset.
+
+2009-03-20 19:38  hardaker
+
+   * dist/extractnews:
+
+   fix lack of wrapping lines problem
+
+2009-03-20 18:31  hardaker
+
+   * NEWS, configure, configure.d/config_project_with_enable:
+
+   config options, etc, for SSH and DTLS
+
+2009-03-20 18:24  hardaker
+
+   * man/snmpcmd.1.def, man/snmpd.8.def:
+
+   currently minimal documentation on dtls and ssh
+
+2009-03-20 16:50  hardaker
+
+   *  apps/Makefile.in, apps/sshtosnmp.c, configure,   
+      configure.d/config_os_libs,   
+      include/net-snmp/library/snmpSSHDomain.h,   
+      include/net-snmp/net-snmp-config.h.in, snmplib/snmpSSHDomain.c,   
+      snmplib/snmp_transport.c:
+
+   Added alpha snmp over ssh support
+
+2009-03-20 16:16  hardaker
+
+   * snmplib/snmpDTLSUDPDomain.c:
+
+   check the sec name length, not just the contents
+
+2009-03-20 16:01  hardaker
+
+   * snmplib/snmptsm.c:
+
+   sequence parsing fix
+
+2009-03-20 15:53  hardaker
+
+   * include/net-snmp/library/snmp_transport.h, snmplib/snmp_api.c:
+
+   added a new flag to allow for signalling of legal empty packets
+   from a transport
+
+2009-03-18 19:42  magfr
+
+   * agent/mibgroup/hardware/memory/memory_linux.c:
+
+   Make it possible to compile again.
+
 2009-03-18 10:52  dts12
 
    * agent/mibgroup/hardware/cpu/cpu_linux.c:
@@ -4329,6 +11843,20 @@
    Fix valgrind warning.
    Patch provided by Stephen Hemminger
 
+2009-03-17 22:57  magfr
+
+   * apps/snmptrapd_handlers.c, apps/snmptrapd_handlers.h:
+
+   PATCH: 2688342: from "Bart Van Assche": Use proper function
+   pointers
+
+2009-03-13 21:26  dts12
+
+   * agent/mibgroup/host/hr_storage.c:
+
+   Process hrMemorySize (scalar) separately from hrStorageTable.
+   This simplifies the handler code structure.
+
 2009-03-13 21:23  dts12
 
    *  agent/mibgroup/hardware/cpu/cpu.c,   
@@ -4353,6 +11881,27 @@
    (An alternative might be to create a new entry instead).
    Problem reported by Nick Hindley
 
+2009-03-10 15:25  jsafranek
+
+   * README.agent-mibs, agent/mibgroup/ip-mib/ip_scalars.c:
+
+   NEWS: snmpd: ipAddressSpinLock implemented
+
+2009-03-02 11:23  dts12
+
+   * COPYING:
+
+   Fix attribution of latest copyright notice.
+
+2009-02-28 18:21  magfr
+
+   *  acconfig.h, configure, configure.d/config_modules_agent,   
+      include/net-snmp/net-snmp-config.h.in:
+
+   Move the #define config_*(...) from acconfig.h to the configure
+   script so that they are next to the code that handle the
+   corresponding config_* token.
+
 2009-02-27 13:20  jsafranek
 
    * agent/mibgroup/ucd-snmp/diskio.c:
@@ -4362,6 +11911,20 @@
    It's being written to log everytime someone queries
    UCD-SNMP-DISKIO MIB.
 
+2009-02-25 06:41  magfr
+
+   * apps/snmpnetstat/if.c:
+
+   Use the feature test macros to set what is needed.
+   Do not use the internal GNU libc macros that are set by setting
+   the feature test macros.
+
+2009-02-25 06:38  magfr
+
+   * snmplib/snmpUnixDomain.c:
+
+   Add missing include.
+
 2009-02-24 07:26  magfr
 
    * snmplib/snmp_logging.c:
@@ -4369,27 +11932,94 @@
    CHANGES: Make -LN stop dumping core. Make bad debug levels report
    the offending symbol.
 
-2009-02-18 15:27  jsafranek
+2009-02-24 06:50  magfr
 
-   *  agent/mibgroup/sctp-mib/sctpAssocLocalAddrTable.c,   
-      agent/mibgroup/sctp-mib/sctpAssocRemAddrTable.c,   
-      agent/mibgroup/sctp-mib/sctpAssocTable.c,   
-      agent/mibgroup/sctp-mib/sctpLookupLocalPortTable.c,   
-      agent/mibgroup/sctp-mib/sctpLookupRemHostNameTable.c,   
-      agent/mibgroup/sctp-mib/sctpLookupRemIPAddrTable.c,   
-      agent/mibgroup/sctp-mib/sctpLookupRemPortTable.c,   
-      agent/mibgroup/sctp-mib/sctpLookupRemPrimIPAddrTable.c,   
-      agent/mibgroup/sctp-mib/sctpTables_common.c,   
+   *  agent/mibgroup/agentx/master.c,   
+      include/net-snmp/library/snmpUnixDomain.h,   
+      snmplib/snmpUnixDomain.c:
+
+   Move the directory creation code to happen after the domain
+   selection code so that the directory creation code knows what
+   directory to create.
+
+2009-02-24 06:47  magfr
+
+   * configure, configure.d/config_project_with_enable:
+
+   Change the error checking option --enable-mysql to suggest that
+   that --with-mysql is used rather that --with-openssl.
+
+2009-02-24 06:44  magfr
+
+   * configure, include/net-snmp/net-snmp-config.h.in:
+
+   Regenerate autoconf artifacts.
+
+2009-02-23 18:43  rstory
+
+   * apps/snmptrapd_sql.c:
+
+   add forgotten file
+
+2009-02-20 04:41  hardaker
+
+   *  configure.d/config_modules_agent, configure.d/config_modules_lib, 
+        configure.d/config_os_functions, configure.d/config_os_libs,   
+      configure.d/config_os_misc1, configure.d/config_os_misc2,   
+      configure.d/config_os_misc3, configure.d/config_os_misc4,   
+      configure.d/config_os_progs,   
+      configure.d/config_os_struct_members,   
+      configure.d/config_project_ipv6_types,   
+      configure.d/config_project_manual,   
+      configure.d/config_project_paths,   
+      configure.d/config_project_perl_python,   
+      configure.d/config_project_types,   
+      configure.d/config_project_with_enable:
+
+   added emacs autoconf mode specifier
+
+2009-02-19 18:32  rstory
+
+   * README.sql, man/snmptrapd.conf.5.def:
+
+   document new sql trap logging
+
+2009-02-19 18:20  rstory
+
+   *  COPYING, NEWS, apps/Makefile.in, apps/snmptrapd.c,   
+      apps/snmptrapd_handlers.c, apps/snmptrapd_handlers.h, configure,  
+       configure.d/config_os_libs,   
+      configure.d/config_project_with_enable,   
+      dist/schema-snmptrapd.sql, include/net-snmp/net-snmp-config.h.in:
+
+   NEWS: snmptrapd: add trap handler for logging traps to a mysql
+   database
+
+2009-02-19 17:58  rstory
+
+   *  include/net-snmp/library/container.h, snmplib/container.c,   
+      snmplib/container_list_ssll.c:
+
+   NEWS: snmplib: added iterator for singly linked lists; add
+   container name in more error msgs
+
+2009-02-18 18:52  rstory
+
+   * apps/snmpusm.c, include/net-snmp/library/snmpv3.h:
+
+   CHANGES: snmplib: change MAX_ENGINEID_LENGTH to 32, per
+   SNMP-FRAMEWORK-MIB SnmpEngineID TC
+
+2009-02-18 14:41  jsafranek
+
+   *  agent/mibgroup/sctp-mib/sctpTables_common.c,   
       agent/mibgroup/sctp-mib/sctpTables_common.h,   
       agent/mibgroup/sctp-mib/sctpTables_linux.c:
 
-   Fix sctp-mib compilation problems
-
-2009-02-18 15:27  jsafranek
-
-   * agent/mibgroup/util_funcs.c, agent/mibgroup/util_funcs.h:
-
-   Backport get_pid_from_inode from trunk, it's needed by sctp-mib
+   Configure script does not like net-snmp-config.h being included
+   from header
+   files, which are added by --with-mib-modules=, let's remove it
+   from there.
 
 2009-02-16 21:24  hardaker
 
@@ -4398,6 +12028,101 @@
    CHANGES: perl: BUG 1554817: Patch from xanco: fix the class
    assigment so getRootOID works properly.
 
+2009-02-15 07:20  magfr
+
+   * acconfig.h:
+
+   Correct copy/paste mistake
+
+2009-02-12 00:25  hardaker
+
+   *  acconfig.h, include/net-snmp/library/default_store.h,   
+      include/net-snmp/library/snmpDTLSUDPDomain.h,   
+      include/net-snmp/library/snmp_transport.h,   
+      include/net-snmp/net-snmp-config.h.in, mibs/NET-SNMP-TC.txt,   
+      snmplib/snmpDTLSUDPDomain.c, snmplib/snmp_transport.c,   
+      snmplib/snmptsm.c:
+
+   An early experimental implementation of the DTLS over UDP
+   transport from the IETF ISMS working group
+
+2009-02-11 23:30  hardaker
+
+   * dist/RELEASE-INSTRUCTIONS:
+
+   updated release instructions
+
+2009-02-06 21:36  magfr
+
+   * snmplib/read_config.c:
+
+   Make it possible to build as C++ again.
+
+2009-02-05 22:56  magfr
+
+   *  acconfig.h, agent/mibgroup/disman/nslookup/lookupCtlTable.c,   
+      agent/mibgroup/disman/ping/pingCtlTable.c,   
+      agent/mibgroup/disman/traceroute/traceRouteCtlTable.c,   
+      agent/mibgroup/disman/traceroute/traceRouteCtlTable.h,   
+      agent/mibgroup/if-mib/data_access/interface_solaris2.c,   
+      agent/mibgroup/ip-mib/data_access/ipaddress_solaris2.c,   
+      agent/mibgroup/ip-mib/data_access/systemstats_solaris2.c,   
+      agent/mibgroup/ucd-snmp/diskio.c, configure,   
+      configure.d/config_os_functions,   
+      include/net-snmp/net-snmp-config.h.in,   
+      include/net-snmp/system/svr5.h:
+
+   CHANGES: build: Assume that the target platform supports memcpy,
+   memmove, memset, strchr and strrchr.
+
+2009-02-04 06:57  magfr
+
+   *  agent/helpers/table.c, agent/helpers/table_dataset.c,   
+      agent/mibgroup/mibII/mta_sendmail.c, configure,   
+      configure.d/config_os_headers, include/net-snmp/agent/table.h,   
+      include/net-snmp/agent/table_dataset.h,   
+      include/net-snmp/library/read_config.h,   
+      include/net-snmp/library/snmp_debug.h,   
+      include/net-snmp/library/snmp_logging.h,   
+      include/net-snmp/net-snmp-config.h.in, snmplib/snmp_debug.c,   
+      snmplib/snmp_logging.c, snmplib/snprintf.c,   
+      win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   NEWS: Remove support for use of varargs.h. Now assumes that
+   stdarg.h is available.
+
+2009-02-04 06:49  magfr
+
+   *  agent/agent_handler.c, agent/agent_trap.c,   
+      agent/mibgroup/agentx/agentx_config.c,   
+      agent/mibgroup/disman/mteTriggerTable.c,   
+      agent/mibgroup/host/hr_filesys.c,   
+      agent/mibgroup/mibII/mta_sendmail.c,   
+      agent/mibgroup/mibII/system_mib.c,   
+      agent/mibgroup/ucd-snmp/disk.c,   
+      agent/mibgroup/utilities/iquery.c, apps/snmptrapd_handlers.c,   
+      include/net-snmp/library/read_config.h, snmplib/read_config.c,   
+      snmplib/snmpv3.c:
+
+   NEWS: snmplib: Introduce printf-like versions of config_perror
+   and config_pwarn (netsnmp_config_error and netsnmp_config_warn).
+   Replace many instances of { tmpbuf[...]; sprintf(tmpbuf, ...);
+   config_p*(tmpbuf); } with netsnmp_config_*(...);
+
+2009-02-03 16:14  hardaker
+
+   * agent/agent_registry.c, include/net-snmp/agent/agent_registry.h:
+
+   add the reginfo and and session pointer to the REGISTER_OID
+   callback
+
+2009-02-03 00:18  hardaker
+
+   * configure, configure.d/config_os_libs:
+
+   fixed -lssl check
+
 2009-01-29 08:38  dts12
 
    * snmplib/snmp_api.c:
@@ -4409,14 +12134,14 @@
    * snmplib/snmpUDPDomain.c:
 
    Fix src/dst confusion
-   Patch provided by Krzysztof Ol¿dzki
+   Patch provided by Krzysztof Olędzki
 
 2009-01-28 09:29  dts12
 
    * agent/mibgroup/smux/smux.c:
 
    CHANGES: Fix two bugs with smux password support.
-   Patch supplied by Krzysztof Ol¿dzki
+   Patch supplied by Krzysztof Olędzki
 
 2009-01-23 14:53  jsafranek
 
@@ -4424,6 +12149,51 @@
 
    Fix parsing of level ranges in '-L<capital>'.
 
+2009-01-20 14:51  dts12
+
+   *  agent/mibgroup/host/hr_swinst.c, configure,   
+      configure.d/config_os_headers:
+
+   Check for the existence of <rpm/rpmfileutil.h> before including
+   it.
+
+2009-01-19 20:50  magfr
+
+   * agent/mibgroup/mibII/icmp.c:
+
+   Make it possible to build without IPv6 again.
+
+2009-01-19 15:01  jsafranek
+
+   *  agent/mibgroup/mibII/icmp.c, agent/mibgroup/mibII/icmp.h,   
+      agent/mibgroup/mibII/kernel_linux.c,   
+      agent/mibgroup/mibII/kernel_linux.h, configure,   
+      configure.d/config_os_headers,   
+      include/net-snmp/net-snmp-config.h.in,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   NEWS: snmpd: PATCH: 1927751: from Mitsuru Chinen: implement
+   icmpMsgStatsTable on Linux
+
+2009-01-19 09:41  jsafranek
+
+   *  agent/mibgroup/ucd-snmp/disk.c, agent/mibgroup/ucd-snmp/disk.h,   
+      mibs/UCD-SNMP-MIB.txt:
+
+   NEWS: snmpd: PATCH: 2449210: add 64-bit disk usage statistics to
+   UCD-SNMP-MIB::dskTable
+
+2009-01-18 07:40  magfr
+
+   * configure, configure.d/config_project_with_enable:
+
+   CHANGES: BUG: 2168180: Changed --disable-reentrant to not
+   activate the reentrant code and made --enable-reentrant accept no
+   values other than yes and no. Did the same for
+   --enable-mib-config-checks, --enable-mib-config-debug,
+   --with-defaults, --enable-developer and --enable-testing-code as
+   well.
+
 2009-01-13 09:17  jsafranek
 
    * snmplib/asn1.c:
@@ -4434,6 +12204,63 @@
    each subidentifier. This is now checked and parsing of OID fails,
    if this condition is not met.
 
+2009-01-11 21:54  magfr
+
+   * configure, configure.d/config_project_with_enable:
+
+   CHANGES: building: Check that the temp-file-pattern ends in 6 X's
+   as mkstemp and mktemp require that.
+
+2009-01-11 21:38  magfr
+
+   *  acconfig.h, configure, configure.d/config_project_with_enable,   
+      include/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: building: Be a lot more strict on the values that are
+   acceptable for --with-persistent-mask (only allow three octal
+   digits)
+
+2009-01-11 20:42  magfr
+
+   *  aclocal.m4, configure, configure.d/config_project_with_enable,   
+      m4/netsnmp_arg.m4:
+
+   CHANGES: building: We are currently using the practice of adding
+   a mirroring AC_ARG_WITH/ENABLE to each AC_ARG_ENABLE/WITH. This
+   patch adds NETSNMP_ARG_WITH/ENABLE macros that automatically adds
+   the mirror variable and then converts the configure machinery to
+   use them.
+
+2009-01-11 20:36  magfr
+
+   * configure, configure.d/config_project_with_enable:
+
+   Move AC_DEFINES in config_project_with_enable to be located next
+   to the AC_ARG_... they depend on.
+
+2009-01-11 20:34  magfr
+
+   *  configure, configure.d/config_project_manual,   
+      configure.d/config_project_with_enable:
+
+   Change the default version number checking to be easier to read
+
+2009-01-11 19:19  magfr
+
+   *  configure, configure.d/config_os_libs,   
+      configure.d/config_os_misc4,   
+      configure.d/config_project_with_enable:
+
+   Move the last AC_ARG_...'s to config_project_with_enable.
+
+2009-01-11 19:08  magfr
+
+   * configure, configure.d/config_project_with_enable:
+
+   CHANGES: building: Change the macro for --with-features-of from
+   AC_ARG_ENABLE to AC_ARG_WITH in order to make the option be
+   --with-features-of.
+
 2009-01-08 10:45  jsafranek
 
    * snmplib/snmp_logging.c:
@@ -4448,12 +12275,209 @@
    in stable
    branches. We now support both of them.
 
+2009-01-08 03:51  magfr
+
+   * Makefile.top:
+
+   Do not depend on the existance of /bin/sh. Also follow the advice
+   of the autoconf manual and finally allow for libtool that adopts
+   the generated script after the capabilities of SHELL.
+
+2009-01-07 16:02  jsafranek
+
+   * configure, configure.d/config_os_headers:
+
+   Reorder the netinet/icmp_var.h and netinet/ip_icmp.h, the later
+   one must be checked first on FreeBSD 7
+
 2009-01-06 22:23  hardaker
 
    * COPYING:
 
    update SPARTA for 2009
 
+2009-01-03 20:23  magfr
+
+   * configure, m4/ac_prompt_user.m4:
+
+   Upgrade the AC_PROMPT_USER macros to autoconf 2.63 where
+   AC_FD_MSG is deprecated and AS_MESSAGE_FD is recommended.
+
+2009-01-03 14:20  magfr
+
+   *  acinclude.m4, aclocal.m4, configure, m4/ac_add_search_path.m4,   
+      m4/ac_msg_cache.m4, m4/ac_msg_module_dbg.m4,   
+      m4/ac_prompt_user.m4, m4/netsnmp_search_libs.m4:
+
+   Split acinclude.m4 into smaller parts by function.
+
+2009-01-03 14:15  magfr
+
+   * Makefile.am:
+
+   Make autoreconf work again.
+
+2009-01-03 14:11  magfr
+
+   *  aclocal.m4, config.guess, configure, configure.ac,   
+      configure.d/config_os_progs,   
+      include/net-snmp/net-snmp-config.h.in, install-sh, ltmain.sh, m4, 
+        m4/libtool.m4, m4/ltoptions.m4, m4/ltsugar.m4, m4/ltversion.m4, 
+        m4/lt~obsolete.m4:
+
+   Update to libtool-2.2.4
+
+2009-01-03 13:28  magfr
+
+   * configure, configure.d/config_os_libs:
+
+   configure.d/config_os_libs: Check for a function, not a macro.
+   configure: Regenerate
+
+2009-01-03 01:03  hardaker
+
+   * configure.d/config_os_libs:
+
+   require -lssl; will be changed later to do 'if needed'
+
+2009-01-03 00:19  magfr
+
+   *  README.agent-mibs, agent/mibgroup/mibII.h,   
+      agent/mibgroup/mibII/snmp_mib.h,   
+      agent/mibgroup/mibII/snmp_mib_5_5.c,   
+      agent/mibgroup/mibII/snmp_mib_5_5.h,   
+      agent/mibgroup/snmpv3/snmpMPDStats_5_5.c,   
+      agent/mibgroup/snmpv3/snmpMPDStats_5_5.h,   
+      agent/mibgroup/snmpv3/usmStats_5_5.c,   
+      agent/mibgroup/snmpv3/usmStats_5_5.h, agent/mibgroup/target.h,   
+      agent/mibgroup/target/target_counters.h,   
+      agent/mibgroup/target/target_counters_5_5.c,   
+      agent/mibgroup/target/target_counters_5_5.h,   
+      agent/mibgroup/utilities/snmp_get_statistic.c,   
+      agent/mibgroup/utilities/snmp_get_statistic.h:
+
+   CHANGES: snmpd: Unify all snmpd statistic variables and make the
+   handlers instances of a common handler.
+
+2009-01-01 17:26  hardaker
+
+   * snmplib/snmptsm.c:
+
+   clean up a few comments and remove unused function
+
+2009-01-01 17:25  hardaker
+
+   * snmplib/snmptsm.c:
+
+   fix various minor memory leak issues
+
+2009-01-01 14:28  magfr
+
+   *  agent/agent_handler.c, agent/helpers/cache_handler.c,   
+      agent/helpers/instance.c, agent/helpers/watcher.c,   
+      include/net-snmp/agent/agent_handler.h,   
+      include/net-snmp/agent/cache_handler.h,   
+      include/net-snmp/agent/instance.h,   
+      include/net-snmp/agent/watcher.h, local/mib2c-conf.d/mfd-top.m2c, 
+        local/mib2c.array-user.conf, local/mib2c.container.conf,   
+      local/mib2c.create-dataset.conf, local/mib2c.int_watch.conf,   
+      local/mib2c.iterate.conf, local/mib2c.iterate_access.conf,   
+      local/mib2c.row.conf, local/mib2c.scalar.conf,   
+      local/mib2c.table_data.conf:
+
+   NEWS: snmplib: Change the type of the oid arguments from oid* to
+   const oid*. Update mib2c to take advantage of the change.
+
+2009-01-01 13:56  magfr
+
+   * agent/agent_handler.c:
+
+   Check return values and free allocated resources on error.
+
+2009-01-01 12:54  magfr
+
+   * agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c:
+
+   Do not leak alias_list on return from _next_alias.
+
+2009-01-01 11:26  magfr
+
+   * agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c:
+
+   Make variable const as it never is changed.
+
+2009-01-01 11:25  magfr
+
+   * agent/mibgroup/if-mib/ifXTable/ifXTable.c:
+
+   Remove an unused variable.
+
+2008-12-31 21:41  hardaker
+
+   * snmplib/snmp_openssl.c:
+
+   don't use the functions if we're not linked with openssl
+
+2008-12-31 20:56  hardaker
+
+   * perl/TrapReceiver/const-c.inc, perl/TrapReceiver/const-xs.inc:
+
+   newer perl generated updates
+
+2008-12-31 18:02  hardaker
+
+   * snmplib/snmp_api.c:
+
+   added a few more recv/send debugging statements
+
+2008-12-31 18:02  hardaker
+
+   * agent/mibgroup/mibII/vacm_conf.c:
+
+   Allow quoted security names for ones containing spaces
+
+2008-12-31 18:01  hardaker
+
+   *  include/net-snmp/library/snmp_openssl.h, snmplib/Makefile.in,   
+      snmplib/snmp_openssl.c:
+
+   an openssl initialization wrapper
+
+2008-12-30 00:03  magfr
+
+   * apps/snmptest.c, python/netsnmp/client_intf.c:
+
+   Use snmp_duplicate_objid instead of various malloc+memcpy
+   variants in order to make clearer code.
+
+2008-12-29 23:34  magfr
+
+   *  agent/mibgroup/examples/example.c,   
+      agent/mibgroup/host/hr_filesys.c,   
+      agent/mibgroup/host/hr_swinst.c,   
+      agent/mibgroup/target/snmpTargetAddrEntry.c,   
+      agent/mibgroup/target/snmpTargetParamsEntry.c,   
+      agent/mibgroup/ucd-snmp/versioninfo.c,   
+      include/net-snmp/library/snmp_debug.h, snmplib/asn1.c:
+
+   Use format strings for printf-like functions.
+   Prefer strcpy over sprintf(dest, "%s", src)
+   Prefer DEBUGMSGTL((format, args)) over sprintf(local, format,
+   args); DEBUGMSGTL(("%s", local))
+
+2008-12-18 17:04  hardaker
+
+   *  include/net-snmp/library/snmpUDPDomain.h,   
+      snmplib/snmpUDPDomain.c:
+
+   export out of the file some helpful generic udp functions
+
+2008-12-16 00:13  hardaker
+
+   * include/net-snmp/library/snmp_secmod.h:
+
+   change localsm security model to tsm (and add 1)
+
 2008-12-15 23:25  hardaker
 
    * agent/mibgroup/disman/expression/expValueTable.c:
@@ -4461,12 +12485,61 @@
    Patch to change a typedef name from link to nodelink to avoid
    naming conflict issues.
 
-2008-12-09 01:01  hardaker
+2008-12-09 01:41  hardaker
 
-   * include/net-snmp/library/snmplocalsm.h, snmplib/snmplocalsm.c:
+   * agent/mibgroup/host/hr_swinst.c:
 
-   As agreed in the admin meeting, remove the older snmplocalsm
-   security model
+   use int32_t instead of int_32 which doesn't work at all on F10
+
+2008-12-09 01:07  hardaker
+
+   * NEWS:
+
+   remove the note that we moved to svn... obsolete at this point,
+   to say the least
+
+2008-12-09 01:05  hardaker
+
+   * NEWS:
+
+   mention the TSM implementation
+
+2008-12-09 00:58  hardaker
+
+   * dist/makerelease.xml:
+
+   flag some steps and mandatory
+
+2008-12-09 00:57  hardaker
+
+   * include/net-snmp/library/default_store.h:
+
+   remove accidential new defines that aren't needed yet
+
+2008-12-09 00:56  hardaker
+
+   *  include/net-snmp/library/default_store.h,   
+      include/net-snmp/library/snmp_transport.h,   
+      include/net-snmp/library/snmplocalsm.h,   
+      include/net-snmp/library/snmptsm.h, snmplib/snmplocalsm.c,   
+      snmplib/snmptsm.c:
+
+   remove older localsm security model and replace with a newer TSM
+   based on the upcoming IETF spec
+
+2008-12-09 00:50  hardaker
+
+   * snmplib/snmp_api.c:
+
+   fix issue with context probing
+
+2008-12-04 12:33  jsafranek
+
+   * agent/snmpd.c, apps/snmptrapd.c:
+
+   Daemonize after transports are created and listening sockets are
+   bound to appropriate ports. This allows to exit with nozero exit
+   code when the binding fails.
 
 2008-12-04 11:44  jsafranek
 
@@ -4475,6 +12548,40 @@
 
    Print ports as unsigned numbers.
 
+2008-11-24 19:09  tanders
+
+   * include/net-snmp/system/solaris.h:
+
+   __EXTENSIONS__ is now handled by configure
+
+2008-11-22 18:36  magfr
+
+   * configure, configure.d/config_modules_agent:
+
+   Do not try to use the module list as a file that should be
+   included in the build, thus making it possible to build on
+   Solaris.
+
+2008-11-20 22:30  magfr
+
+   *  agent/agent_handler.c, agent/agent_trap.c,   
+      agent/helpers/table_data.c, agent/helpers/table_row.c,   
+      agent/helpers/table_tdata.c, agent/mibgroup/utilities/override.c, 
+        apps/snmptrapd_handlers.c:
+
+   Replace memdup((u_char**)&x, (u_char*)y, z * sizeof(oid)) with x
+   = snmp_duplicat
+   e_objid(y, z) since the later is easier to read and expresses the
+   intention of t
+   he code clearer.
+
+2008-11-20 22:01  magfr
+
+   * snmplib/snmp_api.c:
+
+   Use memcpy instead of memmove to copy oids as it is known that
+   the areas are nonoverlapping.
+
 2008-11-20 20:51  magfr
 
    * snmplib/snmpSTDDomain.c:
@@ -4488,6 +12595,35 @@
    CHANGES: Do not use %m in printf-formatted strings since %m in
    printf is a glibc extension.
 
+2008-11-16 22:01  magfr
+
+   * configure.ac:
+
+   Bump the required autoconf version to 2.63 as per 17301.
+
+2008-11-16 21:55  magfr
+
+   * configure, configure.d/config_os_functions:
+
+   Remove an unused function from the configure test for __func__.
+
+2008-11-16 21:51  magfr
+
+   *  configure, configure.d/config_os_functions,   
+      configure.d/config_os_headers, configure.d/config_os_misc4,   
+      include/net-snmp/net-snmp-config.h.in:
+
+   M4 uses dnl, not \ for line concatenation.
+   \ introduced a spurious define in net-snmp-config.h.in, thus this
+   change.
+   Reran autoconf and autoheader.
+
+2008-11-13 22:14  tanders
+
+   * configure:
+
+   NEWS: build: update to autoconf 2.63
+
 2008-11-13 00:30  tanders
 
    * python/netsnmp/client_intf.c:
@@ -4497,11 +12633,17 @@
 
 2008-11-13 00:26  tanders
 
-   * configure.in:
+   * configure.d/config_modules_agent:
 
    fix typo
 
-2008-11-13 00:24  tanders
+2008-11-13 00:26  tanders
+
+   * configure.d/config_modules_agent:
+
+   fix typo
+
+2008-11-13 00:19  tanders
 
    * dist/extractnews:
 
@@ -4527,12 +12669,117 @@
    NEWS: snmpd: Applying patch from Magnus Fromreide to fix the
    getbulk issue reported by Oscar Mira-Sanchez
 
+2008-10-30 22:34  hardaker
+
+   * dist/makerelease:
+
+   remove the older (obsolete) makerelease script
+
+2008-10-22 17:24  magfr
+
+   * snmplib/snmp_api.c, snmplib/snmp_client.c:
+
+   Make it possible to build the lib using a C++ compiler once more.
+
 2008-10-22 07:29  dts12
 
    * snmplib/snmp_client.c:
 
    Don't clear session flags when testing one bit.
 
+2008-10-21 21:10  magfr
+
+   *  AGENT.txt, agent/mibgroup/Rmon/alarm.c,   
+      agent/mibgroup/Rmon/event.c, agent/mibgroup/Rmon/history.c,   
+      agent/mibgroup/Rmon/statistics.c, agent/mibgroup/agent/extend.c,  
+       agent/mibgroup/disman/expression/expErrorTable.c,   
+      agent/mibgroup/disman/expression/expExpressionTable.c,   
+      agent/mibgroup/disman/expression/expObjectTable.c,   
+      agent/mibgroup/disman/expression/expValueTable.c,   
+      agent/mibgroup/disman/mteObjectsTable.c,   
+      agent/mibgroup/disman/mteTriggerBooleanTable.c,   
+      agent/mibgroup/disman/mteTriggerDeltaTable.c,   
+      agent/mibgroup/disman/mteTriggerExistenceTable.c,   
+      agent/mibgroup/disman/mteTriggerTable.c,   
+      agent/mibgroup/disman/mteTriggerThresholdTable.c,   
+      agent/mibgroup/disman/nslookup/lookupCtlTable.c,   
+      agent/mibgroup/disman/nslookup/lookupResultsTable.c,   
+      agent/mibgroup/disman/ping/pingCtlTable.c,   
+      agent/mibgroup/disman/ping/pingProbeHistoryTable.c,   
+      agent/mibgroup/disman/ping/pingResultsTable.c,   
+      agent/mibgroup/disman/traceroute/traceRouteCtlTable.c,   
+      agent/mibgroup/disman/traceroute/traceRouteHopsTable.c,   
+      agent/mibgroup/disman/traceroute/traceRouteProbeHistoryTable.c,   
+      agent/mibgroup/disman/traceroute/traceRouteResultsTable.c,   
+      agent/mibgroup/examples/example.c,   
+      agent/mibgroup/examples/ucdDemoPublic.c,   
+      agent/mibgroup/host/hr_device.c, agent/mibgroup/host/hr_disk.c,   
+      agent/mibgroup/host/hr_filesys.c,   
+      agent/mibgroup/host/hr_network.c,   
+      agent/mibgroup/host/hr_partition.c,   
+      agent/mibgroup/host/hr_print.c, agent/mibgroup/host/hr_proc.c,   
+      agent/mibgroup/host/hr_storage.c,   
+      agent/mibgroup/host/hr_swinst.c, agent/mibgroup/host/hr_swrun.c,  
+       agent/mibgroup/host/hr_system.c,   
+      agent/mibgroup/host/hrh_filesys.c, agent/mibgroup/mibII/at.c,   
+      agent/mibgroup/mibII/interfaces.c, agent/mibgroup/mibII/ip.c,   
+      agent/mibgroup/mibII/ipv6.c, agent/mibgroup/mibII/mta_sendmail.c, 
+        agent/mibgroup/mibII/vacm_vars.c, agent/mibgroup/misc/ipfwacc.c,
+         agent/mibgroup/notification/snmpNotifyFilterProfileTable.c,   
+      agent/mibgroup/notification/snmpNotifyTable.c,   
+      agent/mibgroup/smux/smux.c, agent/mibgroup/smux/snmp_bgp.c,   
+      agent/mibgroup/smux/snmp_ospf.c, agent/mibgroup/smux/snmp_rip2.c, 
+        agent/mibgroup/snmpv3/snmpEngine.c,   
+      agent/mibgroup/snmpv3/snmpMPDStats.c,   
+      agent/mibgroup/snmpv3/usmStats.c,   
+      agent/mibgroup/snmpv3/usmUser.c,   
+      agent/mibgroup/target/snmpTargetAddrEntry.c,   
+      agent/mibgroup/target/snmpTargetParamsEntry.c,   
+      agent/mibgroup/tunnel/tunnel.c, agent/mibgroup/ucd-snmp/disk.c,   
+      agent/mibgroup/ucd-snmp/diskio.c,   
+      agent/mibgroup/ucd-snmp/dlmod.c,   
+      agent/mibgroup/ucd-snmp/errormib.c,   
+      agent/mibgroup/ucd-snmp/extensible.c,   
+      agent/mibgroup/ucd-snmp/file.c, agent/mibgroup/ucd-snmp/hpux.c,   
+      agent/mibgroup/ucd-snmp/lmSensors.c,   
+      agent/mibgroup/ucd-snmp/loadave.c,   
+      agent/mibgroup/ucd-snmp/logmatch.c,   
+      agent/mibgroup/ucd-snmp/memory_aix4.c,   
+      agent/mibgroup/ucd-snmp/memory_darwin7.c,   
+      agent/mibgroup/ucd-snmp/memory_dynix.c,   
+      agent/mibgroup/ucd-snmp/memory_freebsd2.c,   
+      agent/mibgroup/ucd-snmp/memory_hpux.c,   
+      agent/mibgroup/ucd-snmp/memory_netbsd1.c,   
+      agent/mibgroup/ucd-snmp/memory_solaris2.c,   
+      agent/mibgroup/ucd-snmp/pass.c,   
+      agent/mibgroup/ucd-snmp/pass_persist.c,   
+      agent/mibgroup/ucd-snmp/proc.c,   
+      agent/mibgroup/ucd-snmp/versioninfo.c,   
+      agent/mibgroup/ucd-snmp/vmstat_aix4.c,   
+      agent/mibgroup/ucd-snmp/vmstat_bsdi4.c,   
+      agent/mibgroup/ucd-snmp/vmstat_darwin7.c,   
+      agent/mibgroup/ucd-snmp/vmstat_dynix.c,   
+      agent/mibgroup/ucd-snmp/vmstat_freebsd2.c,   
+      agent/mibgroup/ucd-snmp/vmstat_hpux.c,   
+      agent/mibgroup/ucd-snmp/vmstat_linux.c,   
+      agent/mibgroup/ucd-snmp/vmstat_netbsd1.c,   
+      agent/mibgroup/ucd-snmp/vmstat_solaris2.c,   
+      include/net-snmp/library/snmp_impl.h, local/mib2c.old-api.conf,   
+      win32/dist/htmlhelp/FAQ.html:
+
+   NEWS: misc: PATCH: 1737727: from joyceanmachine: Add a
+   NETSNMP_OLDAPI_ prefix to the access macros that are used in the
+   old-api helper.
+   I did add the prefix to all users in our code.
+
+2008-10-21 21:00  magfr
+
+   *  include/net-snmp/library/mib.h, include/net-snmp/library/parse.h, 
+        snmplib/mib.c, snmplib/parse.c:
+
+   NEWS: misc: PATCH: 1737727: from joyceanmachine: Replace all uses
+   of NETSNMP_CLEAN_NAMESPACE with NETSNMP_NO_LEGACY_DEFINITIONS
+
 2008-10-16 09:56  jsafranek
 
    *  agent/mibgroup/if-mib/data_access/interface.c,   
@@ -4542,6 +12789,51 @@
    CHANGES: snmpd: PATCH: 2082726: correctly report NIC speeds
    higher than 4Gbit/s
 
+2008-10-16 08:00  jsafranek
+
+   * man:
+
+   Scratch previous commit, net-snmp-create-v3-user.1 to be ignored.
+
+2008-10-16 07:37  jsafranek
+
+   * man:
+
+   Add compiled net-snmp-config.1 to svn:ignore list
+
+2008-10-15 12:57  jsafranek
+
+   *  README.agent-mibs, agent/mibgroup/ip-mib.h,   
+      agent/mibgroup/ip-mib/data_access/systemstats_common.c,   
+      agent/mibgroup/ip-mib/data_access/systemstats_linux.c,   
+      agent/mibgroup/ip-mib/data_access/systemstats_solaris2.c,   
+      agent/mibgroup/ip-mib/ipIfStatsTable,   
+      agent/mibgroup/ip-mib/ipIfStatsTable.h,   
+      agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable.c,   
+      agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable.h,   
+      agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_access.c,
+        
+      agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_access.h,
+         agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c,
+         agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h,
+         agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_enums.h,   
+      agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c,  
+       agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.h, 
+        agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_oids.h,   
+      agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c,   
+      agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access.c,
+         include/net-snmp/data_access/ipstats.h,   
+      include/net-snmp/data_access/systemstats.h:
+
+   CHANGES: snmpd: PATCH 1797111: implement IP-MIB::ipIfStatsTable
+
+2008-10-15 09:27  tanders
+
+   * snmplib/snmp_api.c:
+
+   portability fix: avoid variable declarations in the middle of
+   code
+
 2008-10-14 18:55  dts12
 
    * snmplib/snmpUDPDomain.c:
@@ -4570,6 +12862,23 @@
    CHANGES: snmpd: PATCH: 1977439: Fix pass/_persist bug with SET
    oid value
 
+2008-10-12 17:24  magfr
+
+   *  README.agent-mibs, agent/mibgroup/snmpv3/snmpMPDStats.h,   
+      agent/mibgroup/snmpv3/snmpMPDStats_5_5.c,   
+      agent/mibgroup/snmpv3/snmpMPDStats_5_5.h,   
+      agent/mibgroup/snmpv3mibs.h:
+
+   CHANGES: snmpd: Reimplementation of snmpMPDStats.
+
+2008-10-10 21:13  dts12
+
+   *  configure, configure.d/config_os_functions,   
+      configure.d/config_os_misc1, configure.d/config_os_misc2,   
+      configure.d/config_os_misc3, configure.d/config_os_misc4:
+
+   Consolidate checks on general O/S characteristics
+
 2008-10-07 08:50  jsafranek
 
    * dist/find-requires:
@@ -4577,18 +12886,78 @@
    CHANGES: building: BUG: 2095983: fix syntax error in
    find-requires helper script and make it executable
 
+2008-10-06 19:31  hardaker
+
+   * include/net-snmp/library/snmp_api.h:
+
+   ifdef sys/poll
+
+2008-10-03 14:16  hardaker
+
+   * configure, configure.ac:
+
+   patch from Shachar Schemesh to fix a quote escaping
+
+2008-09-30 22:19  hardaker
+
+   * apps/snmptrapd.c:
+
+   added a needed trailing newline
+
 2008-09-30 22:11  dts12
 
    * perl/agent/agent.xs:
 
    CHANGES: perl: PATCH: 2022948: Fix for Counter64 in perl subagent
 
+2008-09-30 21:40  hardaker
+
+   *  include/net-snmp/library/default_store.h,   
+      include/net-snmp/library/snmp_api.h, snmplib/snmp_api.c:
+
+   - NEWS: snmplib: Implemented RFC5343 contextEngineID probing.
+   This allows for probing of the contextEngineID without requiring
+   the USM security model.
+   - implemented entirely within the library for both clients and
+   servers.
+
+2008-09-30 21:33  hardaker
+
+   * include/net-snmp/library/snmp_secmod.h:
+
+   Add a local definition for having security models define their
+   own
+   contextEngineID probe
+
+2008-09-30 21:31  hardaker
+
+   * acconfig.h, include/net-snmp/net-snmp-config.h.in:
+
+   Add a definition for the SSH domain
+
 2008-09-30 21:08  dts12
 
    * agent/snmp_agent.c:
 
    CHANGES: agent: PATCH: 1257347: Non-fixed size connection buffer
 
+2008-09-30 07:32  jsafranek
+
+   * agent/Makefile.in:
+
+   NEWS: building: PATCH: 2091156: correctly declare dependencies in
+   Makefile.
+   'make -j <N>' should work now.
+
+2008-09-24 20:58  dts12
+
+   *  configure, configure.d/config_os_functions,   
+      configure.d/config_os_headers, configure.d/config_os_libs,   
+      configure.d/config_os_struct_members:
+
+   Identify where particular checks are actually used
+   (library, agent, applications or not at all)
+
 2008-09-24 12:53  jsafranek
 
    *  agent/mibgroup/sctp-mib/sctpScalars_linux.c,   
@@ -4597,77 +12966,132 @@
    Use the longest integer for inode numbers and (possibly 64 bit)
    counters.
 
-2008-09-05 09:27  dts12
+2008-09-20 09:01  magfr
 
-   *  FAQ, README, configure, configure.in, dist/net-snmp.spec,   
-      sedscript.in, snmplib/snmp_version.c:
+   * configure, configure.d/config_os_misc3:
 
-   - version tag ( 5.4.2 )
+   NEWS: build: Do not require use of --with-endianness when
+   cross-compiling.
 
-2008-09-05 09:27  dts12
+2008-09-19 15:19  dts12
 
-   * CHANGES:
+   * dist/RELEASE-INSTRUCTIONS:
 
-   version update
+   Correct location of documentation files.
 
-2008-09-05 09:25  dts12
+2008-09-19 05:28  magfr
 
-   * ChangeLog:
+   *  configure, configure.d/config_os_misc2,   
+      include/net-snmp/net-snmp-config.h.in:
 
-   version update
+   And add the chunk that I lost.
 
-2008-09-05 09:20  dts12
+2008-09-19 05:23  magfr
 
-   *  man/netsnmp_agent.3, man/netsnmp_agent_registry.3,   
-      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
-      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
-      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
-      man/netsnmp_container.3, man/netsnmp_data_list.3,   
-      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
-      man/netsnmp_handler.3, man/netsnmp_instance.3,   
-      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
-      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
-      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
-      man/netsnmp_multiplexer.3,   
-      man/netsnmp_netsnmp_agent_request_info_s.3,   
-      man/netsnmp_netsnmp_column_info_t.3,   
-      man/netsnmp_netsnmp_data_list_s.3,   
-      man/netsnmp_netsnmp_handler_registration_s.3,   
-      man/netsnmp_netsnmp_iterator_info_s.3,   
-      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_s.3,   
-      man/netsnmp_netsnmp_request_info_s.3,   
-      man/netsnmp_netsnmp_table_registration_info_s.3,   
-      man/netsnmp_netsnmp_table_request_info_s.3,   
-      man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,   
-      man/netsnmp_read_config.3, man/netsnmp_read_only.3,   
-      man/netsnmp_row_merge.3, man/netsnmp_scalar.3,   
-      man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,   
-      man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,   
-      man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,   
-      man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,   
-      man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,   
-      man/netsnmp_table.3, man/netsnmp_table_array.3,   
-      man/netsnmp_table_container.3, man/netsnmp_table_data.3,   
-      man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,   
-      man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,   
-      man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,  
-       man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
-      man/netsnmp_util.3, man/netsnmp_utilities.3,   
-      man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
+   *  acconfig.h, configure, configure.ac,   
+      configure.d/config_modules_lib, configure.d/config_os_libs,   
+      configure.d/config_os_misc1,   
+      configure.d/config_project_perl_python,   
+      configure.d/config_project_with_enable,   
+      include/net-snmp/net-snmp-config.h.in:
 
-   documentation update
+   Move more things from acconfig.h to the templates in the
+   configure input files.
 
-2008-09-05 09:16  dts12
+2008-09-17 13:31  jsafranek
 
-   * doxygen.conf:
+   * dist/find-requires:
 
-   - version tag ( 5.4.2 )
+   make find-requires executable so it's actually usable by the
+   net-snmp.spec
 
--------------------------------------------------------------------------------
+2008-09-17 12:08  jsafranek
 
-Changes: V5.4.1 -> V5.4.2
+   * man/Makefile.in, man/net-snmp-create-v3-user.1.def:
+
+   add man page for net-snmp-create-v3-user
+
+2008-09-16 18:02  magfr
+
+   *  acconfig.h, configure, configure.d/config_os_functions,   
+      configure.d/config_os_libs, configure.d/config_os_misc1,   
+      configure.d/config_os_misc2, configure.d/config_os_misc4,   
+      configure.d/config_project_with_enable,   
+      include/net-snmp/net-snmp-config.h.in:
+
+   Further minimization of acconfig.h
+
+2008-09-11 22:28  magfr
+
+   *  acconfig.h, configure, configure.d/config_os_misc3,   
+      configure.d/config_os_progs,   
+      include/net-snmp/net-snmp-config.h.in:
+
+   Move a few more variables out of acconfig.h
+
+2008-09-11 20:37  hardaker
+
+   * agent/mibgroup/if-mib/ifTable/ifTable_data_access.c:
+
+   NEWS: snmpd: PATCH: 1737439: from emiy: automatic link up/down
+   traps on a walk; still need a better interface for manually doing
+   things on an occasional basis
+
+2008-09-11 20:25  hardaker
+
+   *  include/net-snmp/library/snmp_api.h, snmplib/snmpUDPDomain.c,   
+      snmplib/snmp_api.c:
+
+   NEWS: snmplib: PATCH: 700681: limited support for UDPv4 broadcast
+   addresses
+
+2008-09-10 06:39  magfr
+
+   *  acconfig.h, configure, configure.d/config_project_types,   
+      include/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: building: Use AC_CHECK_TYPES instead of a homegrown
+   alternative to check for types
+
+2008-09-09 20:27  magfr
+
+   * Makefile.in:
+
+   Add all the parts of configure.ac to the dependency list
+
+2008-09-09 18:13  hardaker
+
+   * Makefile.in:
+
+   update to reflect configure.in -> configure.ac change
+
+2008-09-09 16:15  hardaker
+
+   * dist/patme:
+
+   default to -p0
+
+2008-09-08 23:41  hardaker
+
+   * snmplib/snmplocalsm.c:
+
+   check for a session tunneled flag before returning an
+   authentication failure
+
+2008-09-08 23:39  hardaker
+
+   * snmplib/snmp_api.c:
+
+   Set the tunneled flag when dealing with a tunnel-based transport;
+   don't require a securityEngineID if the security model doesn't
+   have one (just USM needs it)
+
+2008-09-08 20:24  magfr
+
+   * include/net-snmp/library/snmp-tc.h, snmplib/snmp-tc.c:
+
+   CHANGES: snmplib: BUG: 2099985: Added const qualifiers to time
+   conversion routins
 
 2008-09-05 07:51  dts12
 
@@ -4680,76 +13104,75 @@
 
    * python/netsnmp/client_intf.c:
 
-   CHANGES: python: BUG: 1868278: Python segfault (introduced by r16962)
+   CHANGES: python: BUG: 1868278: Python segfault (introduced by
+   r16962)
 
-2008-08-29 21:19  dts12
+2008-09-03 13:43  dts12
 
-   *  FAQ, README, configure, configure.in, dist/net-snmp.spec,   
-      sedscript.in, snmplib/snmp_version.c:
+   *  configure, configure.d/config_modules_lib,   
+      configure.d/config_project_with_enable:
 
-   - version tag ( 5.4.2.rc3 )
+   CHANGES: build: PATCH: 2000874: Cleanup transport selection.
 
-2008-08-29 21:18  dts12
+2008-09-03 13:29  dts12
 
-   * CHANGES, NEWS:
+   *  configure, configure.d/config_os_struct_members,   
+      configure.d/config_project_perl_python:
 
-   version update
+   Tidy up perl/python and O/S data structure tests.
 
-2008-08-29 21:15  dts12
+2008-08-31 18:14  dts12
 
-   * ChangeLog:
+   *  configure, configure.d/config_os_functions,   
+      configure.d/config_os_headers, configure.d/config_os_libs,   
+      configure.d/config_os_misc1, configure.d/config_os_misc2,   
+      configure.d/config_os_misc3, configure.d/config_os_misc4,   
+      configure.d/config_os_progs,   
+      configure.d/config_project_ipv6_types,   
+      configure.d/config_project_paths,   
+      configure.d/config_project_types,   
+      configure.d/config_project_with_enable:
 
-   version update
+   Tidy up (most of) the individual components of the configure
+   framework.
+   This is mostly re-indentation, re-commenting, and a certain
+   amount
+   of judicious re-ordering of the tests within individual
+   sub-script.
 
-2008-08-29 21:08  dts12
+2008-08-31 17:30  dts12
 
-   *  man/netsnmp_agent.3, man/netsnmp_agent_registry.3,   
-      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
-      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
-      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
-      man/netsnmp_container.3, man/netsnmp_data_list.3,   
-      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
-      man/netsnmp_handler.3, man/netsnmp_instance.3,   
-      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
-      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
-      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
-      man/netsnmp_multiplexer.3,   
-      man/netsnmp_netsnmp_agent_request_info_s.3,   
-      man/netsnmp_netsnmp_column_info_t.3,   
-      man/netsnmp_netsnmp_data_list_s.3,   
-      man/netsnmp_netsnmp_handler_registration_s.3,   
-      man/netsnmp_netsnmp_iterator_info_s.3,   
-      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_s.3,   
-      man/netsnmp_netsnmp_request_info_s.3,   
-      man/netsnmp_netsnmp_table_registration_info_s.3,   
-      man/netsnmp_netsnmp_table_request_info_s.3,   
-      man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,   
-      man/netsnmp_read_config.3, man/netsnmp_read_only.3,   
-      man/netsnmp_row_merge.3, man/netsnmp_scalar.3,   
-      man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,   
-      man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,   
-      man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,   
-      man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,   
-      man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,   
-      man/netsnmp_table.3, man/netsnmp_table_array.3,   
-      man/netsnmp_table_container.3, man/netsnmp_table_data.3,   
-      man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,   
-      man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,   
-      man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,  
-       man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
-      man/netsnmp_util.3, man/netsnmp_utilities.3,   
-      man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
+   * configure, configure.ac:
 
-   documentation update
+   Annotate configure template with suggested best practice
+   structure.
+   Note that none of these changes has altered the code within
+   'configure' itself (other than affecting line numbers)
 
-2008-08-29 21:04  dts12
+2008-08-31 17:26  dts12
 
-   * doxygen.conf:
+   *  configure, configure.ac, configure.d,   
+      configure.d/config_modules_agent, configure.d/config_modules_lib, 
+        configure.d/config_os_functions, configure.d/config_os_headers, 
+        configure.d/config_os_libs, configure.d/config_os_misc1,   
+      configure.d/config_os_misc2, configure.d/config_os_misc3,   
+      configure.d/config_os_misc4, configure.d/config_os_progs,   
+      configure.d/config_os_struct_members,   
+      configure.d/config_project_ipv6_types,   
+      configure.d/config_project_manual,   
+      configure.d/config_project_paths,   
+      configure.d/config_project_perl_python,   
+      configure.d/config_project_types,   
+      configure.d/config_project_with_enable:
 
-   - version tag ( 5.4.2.rc3 )
+   NEWS: build: split configure template into separate pieces.
+   (Mostly) self-contained, and significantly less confusing!
 
+2008-08-31 17:23  dts12
+
+   * configure.ac, configure.in:
+
+   Rename configure template in line with current best practice.
 
 2008-08-29 19:54  dts12
 
@@ -4757,12 +13180,20 @@
 
    Retain filenames which don't include the expected prefix.
 
+2008-08-27 21:55  tanders
+
+   *  agent/mibgroup/ip-mib/ipv6ScopeZoneIndexTable,   
+      agent/mibgroup/util_funcs:
+
+   ignore .libs directories
+
 2008-08-27 13:39  jsafranek
 
    * agent/mibgroup/hardware/cpu/cpu_linux.c:
 
    S/390 uses slightly different format of the /proc/cpuinfo file:
-   processor 0: version = FF, identification = 060AFE, machine = 2094
+   processor 0: version = FF, identification = 060AFE, machine =
+   2094
 
 2008-08-22 23:47  tanders
 
@@ -4776,14 +13207,18 @@
 
    NEWS: build: BUG: 2023803: Compilation problems on HP-UX 11.31
    CHANGES: build: Limit the use of _KERNEL definitions in configure
-   tests to match the use of _KERNEL in our codebase
+   tests to match the use
+   of _KERNEL in our codebase
 
 2008-08-22 00:18  tanders
 
-   * agent/mibgroup/host/hr_swrun.c:
+   *  agent/mibgroup/host/data_access/swrun_pstat.c,   
+      agent/mibgroup/host/hr_swrun.c:
 
-   Fix build failure on HP-UX 11.31: use getpagesize() instead of PGSHIFT.
-   Successfully tested on HP-UX 10.20, 11.00, 11.11, 11.23 and 11.31.
+   Fix build failure on HP-UX 11.31: use getpagesize() instead of
+   PGSHIFT.
+   Successfully tested on HP-UX 10.20, 11.00, 11.11, 11.23 and
+   11.31.
 
 2008-08-21 10:03  jsafranek
 
@@ -4791,3547 +13226,5328 @@
 
    add SCTP-MIB
 
+2008-08-20 17:37  magfr
+
+   * agent/mibgroup/smux/smux.c:
+
+   Have only one variable named passwd in smux_auth_peer.
+
 2008-08-19 23:22  tanders
 
    * README.tru64:
 
    update README for Tru64 after the sendto/recvfrom fixes
 
-2008-08-19 20:36  dts12
+2008-08-19 20:27  tanders
 
-   *  FAQ, README, configure, configure.in, dist/net-snmp.spec,   
-      sedscript.in, snmplib/snmp_version.c:
+   * agent/mibgroup/host/data_access/swrun.h:
 
-   - version tag ( 5.4.2.rc2 )
+   fix significant typo
 
-2008-08-19 20:36  dts12
+2008-08-19 13:25  dts12
 
-   * CHANGES, NEWS:
+   * agent/mibgroup/host/data_access/swrun.h:
 
-   version update
+   Force use of /proc/%d/psinfo interface on Solaris.
+   Temporary hack while we investigate the issues with
+   the kvm_proc() code.
+   
+   The 'config_require' processing doesn't currently
+   pick up the full #ifdef environment, so defaults
+   to using kvm_proc(). I'm not convinced this was
+   working before anyway,
 
-2008-08-19 20:26  dts12
+2008-08-19 13:17  dts12
 
-   * ChangeLog:
+   * agent/mibgroup/host/data_access/swrun_procfs_psinfo.c:
 
-   version update
+   Fix problems in /proc/%d/psinfo interface processing.
 
-2008-08-19 20:08  dts12
+2008-08-19 08:47  dts12
 
-   * agent/mibgroup/Makefile.depend:
+   * agent/mibgroup/hardware/sensors, agent/mibgroup/host/data_access:
 
-   make depend
+   Ignore library and object files
 
-2008-08-19 20:03  dts12
+2008-08-19 08:36  dts12
 
-   *  man/netsnmp_agent.3, man/netsnmp_agent_registry.3,   
-      man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,   
-      man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,   
-      man/netsnmp_cache_handler.3, man/netsnmp_callback.3,   
-      man/netsnmp_container.3, man/netsnmp_data_list.3,   
-      man/netsnmp_debug.3, man/netsnmp_default_store.3,   
-      man/netsnmp_handler.3, man/netsnmp_instance.3,   
-      man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,   
-      man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,   
-      man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,   
-      man/netsnmp_multiplexer.3,   
-      man/netsnmp_netsnmp_agent_request_info_s.3,   
-      man/netsnmp_netsnmp_column_info_t.3,   
-      man/netsnmp_netsnmp_data_list_s.3,   
-      man/netsnmp_netsnmp_handler_registration_s.3,   
-      man/netsnmp_netsnmp_iterator_info_s.3,   
-      man/netsnmp_netsnmp_mib_handler_access_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_methods.3,   
-      man/netsnmp_netsnmp_mib_handler_s.3,   
-      man/netsnmp_netsnmp_request_info_s.3,   
-      man/netsnmp_netsnmp_table_registration_info_s.3,   
-      man/netsnmp_netsnmp_table_request_info_s.3,   
-      man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,   
-      man/netsnmp_read_config.3, man/netsnmp_read_only.3,   
-      man/netsnmp_row_merge.3, man/netsnmp_scalar.3,   
-      man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,   
-      man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,   
-      man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,   
-      man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,   
-      man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,   
-      man/netsnmp_table.3, man/netsnmp_table_array.3,   
-      man/netsnmp_table_container.3, man/netsnmp_table_data.3,   
-      man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,   
-      man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,   
-      man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,  
-       man/netsnmp_table_rows.3, man/netsnmp_tdata.3,   
-      man/netsnmp_util.3, man/netsnmp_utilities.3,   
-      man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
+   * 
+      agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access.c:
 
-   documentation update
+   Activate statistics that are supported on Solaris and/or Linux
+   IPv6
 
-2008-08-19 19:55  dts12
+2008-08-19 08:11  dts12
 
-   * doxygen.conf:
+   * agent/mibgroup/smux/smux.c:
 
-   - version tag ( 5.4.2.rc2 )
-
+   Improved tracing of SMUX authentication problems.
 
 2008-08-19 08:08  dts12
 
    * agent/mibgroup/disman/event/mteObjects.c:
-     Better tracing of DisMan object processing.
+
+   Better tracing of DisMan object processing.
 
 2008-08-18 22:43  tanders
 
    * agent/mibgroup/sctp-mib/sctpScalars.h:
-     remove bogus white space
 
-2008-08-18 22:38  tanders
-
-   * README.agent-mibs:
-     document SCTP-MIB addition
+   remove bogus white space
 
 2008-08-18 22:01  dts12
 
    * perl/SNMP/SNMP.pm:
-     CHANGES: perl: PATCH: 2021444: Support SNMPv2c in gettable processing
+
+   CHANGES: perl: PATCH: 2021444: Support SNMPv2c in gettable
+   processing
 
 2008-08-18 21:44  dts12
 
    * snmplib/snmpksm.c:
-     CHANGES: snmplib: PATCH: 2003450: Fix a couple of 64-bit problems.
 
-2008-08-18 19:05  tanders
+   CHANGES: snmplib: PATCH: 2003450: Fix a couple of 64-bit
+   problems.
 
-   * mibs/Makefile.in:
-     fix SCTP-MIB install
+2008-08-18 14:30  hardaker
 
-2008-08-17 21:29  dts12
+   * apps/snmpusm.c:
 
-   * agent/mibgroup/sctp-mib, agent/mibgroup/sctp-mib.h,
-     agent/mibgroup/sctp-mib/sctpAssocLocalAddrTable.c,
-     agent/mibgroup/sctp-mib/sctpAssocLocalAddrTable.h,
-     agent/mibgroup/sctp-mib/sctpAssocRemAddrTable.c,
-     agent/mibgroup/sctp-mib/sctpAssocRemAddrTable.h,
-     agent/mibgroup/sctp-mib/sctpAssocTable.c,
-     agent/mibgroup/sctp-mib/sctpAssocTable.h,
-     agent/mibgroup/sctp-mib/sctpLookupLocalPortTable.c,
-     agent/mibgroup/sctp-mib/sctpLookupLocalPortTable.h,
-     agent/mibgroup/sctp-mib/sctpLookupRemHostNameTable.c,
-     agent/mibgroup/sctp-mib/sctpLookupRemHostNameTable.h,
-     agent/mibgroup/sctp-mib/sctpLookupRemIPAddrTable.c,
-     agent/mibgroup/sctp-mib/sctpLookupRemIPAddrTable.h,
-     agent/mibgroup/sctp-mib/sctpLookupRemPortTable.c,
-     agent/mibgroup/sctp-mib/sctpLookupRemPortTable.h,
-     agent/mibgroup/sctp-mib/sctpLookupRemPrimIPAddrTable.c,
-     agent/mibgroup/sctp-mib/sctpLookupRemPrimIPAddrTable.h,
-     agent/mibgroup/sctp-mib/sctpScalars.c,
-     agent/mibgroup/sctp-mib/sctpScalars.h,
-     agent/mibgroup/sctp-mib/sctpScalars_common.c,
-     agent/mibgroup/sctp-mib/sctpScalars_common.h,
-     agent/mibgroup/sctp-mib/sctpScalars_linux.c,
-     agent/mibgroup/sctp-mib/sctpTables.h,
-     agent/mibgroup/sctp-mib/sctpTables_common.c,
-     agent/mibgroup/sctp-mib/sctpTables_common.h,
-     agent/mibgroup/sctp-mib/sctpTables_linux.c, mibs/Makefile.in,
-     mibs/Makefile.mib, mibs/SCTP-MIB.txt:
-     NEWS: snmpd: PATCH: 2023633: add SCTP-MIB implementation (Linux only)
+   revert 17157 since it broke something
+
+2008-08-18 07:06  jsafranek
+
+   * README.agent-mibs:
+
+   add SCTP-MIB implementation (Linux only)
 
 2008-08-17 21:08  dts12
 
    * agent/mibgroup/agentx/protocol.c:
-     CHANGES: snmpd: PATCH: 2022936: Fix AgentX Counter64 decoding on
-     64-bit architectures
+
+   CHANGES: snmpd: PATCH: 2022936: Fix AgentX Counter64 decoding on
+   64-bit architectures
 
 2008-08-17 20:50  dts12
 
    * agent/snmpd.c:
-     CHANGES: snmpd: PATCH: 2014204: Support -g {groupname}
+
+   CHANGES: snmpd: PATCH: 2014204: Support -g {groupname}
+
+2008-08-15 13:45  hardaker
+
+   * apps/snmpusm.c:
+
+   NEWS: snmpusm: PATCH: 1591355: from ppassera: Allow cloning to
+   engineIDs that are different from the agent's engineID
+
+2008-08-14 15:54  dts12
+
+   * agent/mibgroup/host/data_access/swrun_kvm_proc.c:
+
+   SWRun processing needs access to the internals of 'struct user'
+   (Solaris)
 
 2008-08-13 13:02  jsafranek
 
-   * agent/mibgroup/ip-mib/data_access/ipaddress_linux.c:
-     Correctly parse interface indexes higher than 0xff.
+   *  agent/mibgroup/ip-mib/data_access/ipaddress_linux.c,   
+      agent/mibgroup/ip-mib/data_access/ipv6scopezone_linux.c:
+
+   Correctly parse interface indexes higher than 0xff.
 
 2008-08-12 08:27  jsafranek
 
    * agent/mibgroup/host/hr_swrun.c:
-     Close file when parsing of /proc/XXX/status fails.
+
+   Close file when parsing of /proc/XXX/status fails.
+
+2008-08-12 07:27  jsafranek
+
+   *  agent/mibgroup/sctp-mib, agent/mibgroup/sctp-mib.h,   
+      agent/mibgroup/sctp-mib/sctpAssocLocalAddrTable.c,   
+      agent/mibgroup/sctp-mib/sctpAssocLocalAddrTable.h,   
+      agent/mibgroup/sctp-mib/sctpAssocRemAddrTable.c,   
+      agent/mibgroup/sctp-mib/sctpAssocRemAddrTable.h,   
+      agent/mibgroup/sctp-mib/sctpAssocTable.c,   
+      agent/mibgroup/sctp-mib/sctpAssocTable.h,   
+      agent/mibgroup/sctp-mib/sctpLookupLocalPortTable.c,   
+      agent/mibgroup/sctp-mib/sctpLookupLocalPortTable.h,   
+      agent/mibgroup/sctp-mib/sctpLookupRemHostNameTable.c,   
+      agent/mibgroup/sctp-mib/sctpLookupRemHostNameTable.h,   
+      agent/mibgroup/sctp-mib/sctpLookupRemIPAddrTable.c,   
+      agent/mibgroup/sctp-mib/sctpLookupRemIPAddrTable.h,   
+      agent/mibgroup/sctp-mib/sctpLookupRemPortTable.c,   
+      agent/mibgroup/sctp-mib/sctpLookupRemPortTable.h,   
+      agent/mibgroup/sctp-mib/sctpLookupRemPrimIPAddrTable.c,   
+      agent/mibgroup/sctp-mib/sctpLookupRemPrimIPAddrTable.h,   
+      agent/mibgroup/sctp-mib/sctpScalars.c,   
+      agent/mibgroup/sctp-mib/sctpScalars.h,   
+      agent/mibgroup/sctp-mib/sctpScalars_common.c,   
+      agent/mibgroup/sctp-mib/sctpScalars_common.h,   
+      agent/mibgroup/sctp-mib/sctpScalars_linux.c,   
+      agent/mibgroup/sctp-mib/sctpTables.h,   
+      agent/mibgroup/sctp-mib/sctpTables_common.c,   
+      agent/mibgroup/sctp-mib/sctpTables_common.h,   
+      agent/mibgroup/sctp-mib/sctpTables_linux.c, mibs/Makefile.in,   
+      mibs/Makefile.mib, mibs/SCTP-MIB.txt:
+
+   NEWS: snmpd: PATCH: 2023633: add SCTP-MIB implementation (Linux
+   only)
+
+2008-08-07 10:03  jsafranek
+
+   * agent/mibgroup/ip-mib/data_access/arp_linux.c:
+
+   Fix inetNetToMediaTable table processing - continue with next
+   entry when fillup_entry_info() fails.
 
 2008-08-07 09:00  jsafranek
 
    * man/snmpd.conf.5.def:
-     Fix documentation of exec statament - it does not cache results anymore.
-     Related to bug 883134
 
-2008-07-31 16:48  dts12
+   Fix documentation of exec statament - it does not cache results
+   anymore. Related to bug 883134
 
-   * FAQ, README, configure, configure.in, dist/net-snmp.spec,
-     sedscript.in, snmplib/snmp_version.c:
-     - version tag ( 5.4.2.rc1 )
+2008-07-31 23:39  dts12
 
-2008-07-31 16:47  dts12
+   * agent/mibgroup/host/data_access/swrun_procinfo.c:
 
-   * CHANGES:
-     version update
+   Fix a typo, and a bogus field name in the AIX procinfo structure.
 
-2008-07-31 16:14  dts12
+2008-07-31 23:35  dts12
 
-   * ChangeLog:
-     version update
+   * agent/mibgroup/host/data_access/swrun_kvm_proc.c:
 
-2008-07-31 16:05  dts12
-
-   * agent/Makefile.depend, agent/helpers/Makefile.depend,
-     agent/mibgroup/Makefile.depend, apps/snmpnetstat/Makefile.depend,
-     snmplib/Makefile.depend:
-     make depend
-
-2008-07-31 16:03  dts12
-
-   * man/netsnmp_agent.3, man/netsnmp_agent_registry.3,
-     man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,
-     man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,
-     man/netsnmp_cache_handler.3, man/netsnmp_callback.3,
-     man/netsnmp_container.3, man/netsnmp_data_list.3,
-     man/netsnmp_debug.3, man/netsnmp_default_store.3,
-     man/netsnmp_handler.3, man/netsnmp_instance.3,
-     man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,
-     man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,
-     man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,
-     man/netsnmp_multiplexer.3,
-     man/netsnmp_netsnmp_agent_request_info_s.3,
-     man/netsnmp_netsnmp_column_info_t.3,
-     man/netsnmp_netsnmp_data_list_s.3,
-     man/netsnmp_netsnmp_handler_registration_s.3,
-     man/netsnmp_netsnmp_iterator_info_s.3,
-     man/netsnmp_netsnmp_mib_handler_access_methods.3,
-     man/netsnmp_netsnmp_mib_handler_methods.3,
-     man/netsnmp_netsnmp_mib_handler_s.3,
-     man/netsnmp_netsnmp_request_info_s.3,
-     man/netsnmp_netsnmp_table_registration_info_s.3,
-     man/netsnmp_netsnmp_table_request_info_s.3,
-     man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,
-     man/netsnmp_read_config.3, man/netsnmp_read_only.3,
-     man/netsnmp_row_merge.3, man/netsnmp_scalar.3,
-     man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,
-     man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,
-     man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,
-     man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,
-     man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,
-     man/netsnmp_table.3, man/netsnmp_table_array.3,
-     man/netsnmp_table_container.3, man/netsnmp_table_data.3,
-     man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,
-     man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,
-     man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,
-     man/netsnmp_table_rows.3, man/netsnmp_tdata.3,
-     man/netsnmp_util.3, man/netsnmp_utilities.3,
-     man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
-     documentation update
+   Include missing headers, and fix one bogus field name in Solaris
+   proc structure.
 
 2008-07-30 17:40  dts12
 
    * agent/mibgroup/agentx/protocol.c:
-     CHANGES: agent: BUG: 2003144: Increase size of AgentX packet build buffer
 
-2008-07-30 17:28  dts12
-
-   * net-snmp-config.in:
-     CHANGES: build: PATCH: 1681035: from magfr: improve net-snmp-config /bin/sh compatibility
-     Back-port of SVN revision 15961
-
-2008-07-30 09:58  dts12
-
-   * agent/mibgroup/host/hr_filesys.c:
-     CHANGES: agent: BUG: 1557372: Realign hrFSStorageIndex with hrStorageTable
+   CHANGES: agent: BUG: 2003144: Increase size of AgentX packet
+   build buffer
 
 2008-07-30 07:57  dts12
 
    * snmplib/mib.c:
-     CHANGES: snmplib: BUG: 2027834: Extend string print buffer by the minimum necessary.
+
+   CHANGES: snmplib: BUG: 2027834: Extend string print buffer by the
+   minimum necessary.
+
+2008-07-29 23:34  dts12
+
+   *  agent/mibgroup/host/data_access/swrun_cygwin.c,   
+      agent/mibgroup/host/data_access/swrun_kvm_proc.c,   
+      agent/mibgroup/host/data_access/swrun_nlist.c,   
+      agent/mibgroup/host/data_access/swrun_procfs_psinfo.c,   
+      agent/mibgroup/host/data_access/swrun_procinfo.c,   
+      agent/mibgroup/host/data_access/swrun_prpsinfo.c,   
+      agent/mibgroup/host/data_access/swrun_pstat.c:
+
+   Fix assorted silly typos - unbalanced parentheses
+   and the wrong type enumeration value names.
+
+2008-07-29 23:31  dts12
+
+   * agent/mibgroup/host/data_access/swrun.c:
+
+   Ensure swrun data is available for the prTable calls,
+   rather than relying on hrSWRunTable to trigger this.
 
 2008-07-29 16:19  dts12
 
    * agent/mibgroup/agentx/protocol.c:
-     a) Fix the size of the buffer in just one place
-     (makes it easier to change if necessary)
-     b) Fix various unfortunate line-breaks (within "pdu->flags")
+
+   a) Fix the size of the buffer in just one place
+   (makes it easier to change if necessary)
+   b) Fix various unfortunate line-breaks (within "pdu->flags")
+
+2008-07-29 16:05  dts12
+
+   *  agent/mibgroup/ucd-snmp/proc.c,   
+      include/net-snmp/data_access/swrun.h:
+
+   If the re-written SWRun module if available, then use it for
+   the UCD-specific prTable as well as the hrSWRunTable.
+   Consistency is good....
+
+2008-07-29 15:23  dts12
+
+   * agent/mibgroup/host/data_access/swrun_procfs_status.c:
+
+   Suppress junk in hrSWRunName & hrSWRunParameters values
+
+2008-07-29 10:27  dts12
+
+   *  agent/mibgroup/host/data_access/swrun.c,   
+      agent/mibgroup/host/data_access/swrun.h,   
+      agent/mibgroup/host/hrSWRunPerfTable.c,   
+      agent/mibgroup/host/hrSWRunTable.c:
+
+   The cache/container relate to the data itself, so should
+   more naturally be handled by the data_access module,
+   rather than a particular MIB table module.
+
+2008-07-28 21:18  dts12
+
+   * agent/mibgroup/hardware/fsys/fsys_mntent.c:
+
+   'used' and 'free' are not the same thing, Dave. Pay attention at
+   the back....
 
 2008-07-28 14:39  dts12
 
    * agent/mibgroup/mibII/var_route.c:
-     CHANGES: agent: BUG: 2023803: Ensure compilation is not dependent
-     on an irrelevant configure characteristic for HP-UX 11
 
-2008-07-28 11:41  dts12
-
-   * configure, configure.in, include/net-snmp/net-snmp-config.h.in:
-     NEWS: building: add --with-temp-file-pattern configure option
-     Backport of SVN revision 17121
+   CHANGES: agent: BUG: 2023803: Ensure compilation is not dependent
+   on an irrelevant configure characteristic for HP-UX 11
 
 2008-07-28 10:56  dts12
 
    * apps/snmpset.c:
-     CHANGES: apps: BUG: 1964136: Drop NULL type from snmpset usage message.
+
+   CHANGES: apps: BUG: 1964136: Drop NULL type from snmpset usage
+   message.
+
+2008-07-25 14:19  dts12
+
+   * agent/mibgroup/host.h, agent/mibgroup/host/hrSWRunTable.h:
+
+   Use '--enable-new-features' mechanism to include hrSW* re-writes
+
+2008-07-25 14:13  dts12
+
+   *  agent/mibgroup/host/data_access/swinst.h,   
+      agent/mibgroup/host/data_access/swinst_null.c,   
+      agent/mibgroup/host/data_access/swinst_pkginfo.c,   
+      agent/mibgroup/host/data_access/swinst_rpm.c,   
+      agent/mibgroup/host/data_access/swrun.c,   
+      agent/mibgroup/host/data_access/swrun.h,   
+      agent/mibgroup/host/data_access/swrun_cygwin.c,   
+      agent/mibgroup/host/data_access/swrun_darwin.c,   
+      agent/mibgroup/host/data_access/swrun_kinfo.c,   
+      agent/mibgroup/host/data_access/swrun_kvm_proc.c,   
+      agent/mibgroup/host/data_access/swrun_nlist.c,   
+      agent/mibgroup/host/data_access/swrun_null.c,   
+      agent/mibgroup/host/data_access/swrun_procfs_psinfo.c,   
+      agent/mibgroup/host/data_access/swrun_procfs_status.c,   
+      agent/mibgroup/host/data_access/swrun_procinfo.c,   
+      agent/mibgroup/host/data_access/swrun_prpsinfo.c,   
+      agent/mibgroup/host/data_access/swrun_pstat.c:
+
+   Preliminary OS-specific implementations of Running and Installed
+   Software data access.
 
 2008-07-24 23:22  tanders
 
    * man/snmpcmd.1.def:
-     CHANGES: documentation: BUG: 2027129: fix typo in snmpcmd.1
+
+   CHANGES: documentation: BUG: 2027129: fix typo in snmpcmd.1
+
+2008-07-24 10:00  jsafranek
+
+   * man/snmp.conf.5.def, sedscript.in:
+
+   reflect default temp file pattern in man page if it's modified by
+   ./configure script
+
+2008-07-24 08:36  jsafranek
+
+   * configure, configure.in, include/net-snmp/net-snmp-config.h.in:
+
+   NEWS: building: add --with-temp-file-pattern configure option
 
 2008-07-24 06:53  jsafranek
 
    * agent/agent_read_config.c:
-     CHANGES: snmpd: PATCH: 1823800: release and reload all trap destinations on SIGHUP
+
+   CHANGES: snmpd: PATCH: 1823800: release and reload all trap
+   destinations on SIGHUP
+
+2008-07-22 14:33  jsafranek
+
+   * net-snmp-create-v3-user.in:
+
+   fix net-snmp-create-v3-user to run without arguments
+
+2008-07-22 14:21  jsafranek
+
+   *  ., Makefile.in, configure, configure.in, net-snmp-config.in,   
+      net-snmp-create-v3-user.in:
+
+   NEWS: misc: separate user management from net-snmp-config into
+   new net-snmp-create-v3-user script
 
 2008-07-21 13:44  dts12
 
    * agent/helpers/old_api.c:
-     CHANGES: agent: PATCH 1944581: Protect against core dumps with long string index values.
 
-2008-07-17 15:07  dts12
+   CHANGES: agent: PATCH 1944581: Protect against core dumps with
+   long string index values.
 
-   * agent/Makefile.depend, agent/helpers/Makefile.depend,
-     agent/mibgroup/Makefile.depend, apps/Makefile.depend,
-     apps/snmpnetstat/Makefile.depend, snmplib/Makefile.depend:
-     make depend
+2008-07-18 15:19  hardaker
 
-2008-07-17 14:42  dts12
+   * dist/makerelease.xml:
 
-   * doxygen.conf:
-     - version tag ( 5.4.2.rc1 )
+   new signing key
 
 2008-07-17 10:05  jsafranek
 
    * agent/mibgroup/utilities/iquery.c:
-     CHANGES: snmpd: BUG: 2018031: Don't probe engineID in internal monitor sessions.
+
+   CHANGES: snmpd: BUG: 2018031: Don't probe engineID in internal
+   monitor sessions.
+
+2008-07-10 19:33  hardaker
+
+   * dist/makerelease.xml:
+
+   fix a regexp quote
+
+2008-07-10 14:12  tanders
+
+   * snmplib/system.c:
+
+   build fix for systems that don't have getaddrinfo (e.g. HP-UX
+   11.0 and earlier, Solaris 7 and earlier)
 
 2008-07-10 13:50  alex_b
 
    * win32/Makefile.in:
-     CHANGES: building: BUG: 2014526: Win32: snmpv3-security-includes.h not installed
+
+   CHANGES: building: BUG: 2014526: Win32:
+   snmpv3-security-includes.h not installed
 
 2008-07-06 15:05  alex_b
 
-   * README.win32, win32/Configure, win32/build.pl,
-     win32/netsnmpmibssdk/Makefile.in:
-     CHANGES: bulding: Add support for winExtDLL to build.bat (win32)
+   *  README.win32, win32/Configure, win32/build.pl,   
+      win32/dist/README.build.win32.txt,   
+      win32/netsnmpmibssdk/Makefile.in:
+
+   CHANGES: bulding: Add support for winExtDLL to build.bat (win32)
 
 2008-07-06 12:38  alex_b
 
    * win32/libsnmp_dll/libsnmp.def, win32/libsnmp_dll/libsnmp.def.in:
-     Win32 build fixes - add missing function for DLL build.
+
+   Win32 build fixes - add missing function for DLL build.
 
 2008-07-02 12:39  jsafranek
 
    * agent/mibgroup/ip-forward-mib/data_access/route_linux.c:
-     CHANGES: snmpd: BUG: 2006786: Interface name can have more than 8 characters.
+
+   CHANGES: snmpd: BUG: 2006786: Interface name can have more than 8
+   characters.
+
+2008-06-25 17:39  tanders
+
+   *  agent/agent_read_config.c, agent/agent_trap.c, apps/snmptrap.c,   
+      include/net-snmp/agent/ds_agent.h,   
+      include/net-snmp/library/system.h, man/snmpd.conf.5.def,   
+      perl/SNMP/SNMP.xs, python/netsnmp/client_intf.c,   
+      snmplib/snmpUDPDomain.c, snmplib/system.c:
+
+   NEWS: snmpd: PATCH: 1916840: new config option to set SNMPv1 trap
+   agent address
+   CHANGES: snmplib: PATCH: 1916840: introduce
+   netsnmp_gethostbyname_v4
 
 2008-06-25 15:16  jsafranek
 
    * perl/SNMP/SNMP.xs:
-     fix assertion when used with perl 5.10
 
-2008-06-24 22:36  tanders
+   fix assertion when used with perl 5.10
 
-   * testing/tests/T001snmpv1get, testing/tests/T014snmpv2cget,
-     testing/tests/T015snmpv2cgetnext,
-     testing/tests/T0160snmpv2cbulkget,
-     testing/tests/T016snmpv2cgetfail,
-     testing/tests/T017snmpv2ctov1getfail,
-     testing/tests/T018snmpv1tov2cgetfail,
-     testing/tests/T019snmpv2cnosuch, testing/tests/T020snmpv3get,
-     testing/tests/T021snmpv3getnext,
-     testing/tests/T0220snmpv3bulkget:
-     CHANGES: building: Disable tests if the agent is built without the mib module they depend on.
-     Backport of r17087.
+2008-06-24 05:01  magfr
+
+   *  agent/mibgroup/snmpv3/usmUser.c,   
+      include/net-snmp/library/snmpusm.h, snmplib/snmpusm.c:
+
+   CHANGES: snmplib, snmpd: BUG: 2001124: Allow embedded NUL
+   characters in usmUserPublic
+
+2008-06-23 19:57  magfr
+
+   * snmplib/snmp_client.c:
+
+   Only reserve space for the extra \0 after the data for OCTET
+   STRING valued entities
+
+2008-06-23 19:13  magfr
+
+   *  testing/tests/T001snmpv1get, testing/tests/T014snmpv2cget,   
+      testing/tests/T015snmpv2cgetnext,   
+      testing/tests/T0160snmpv2cbulkget,   
+      testing/tests/T016snmpv2cgetfail,   
+      testing/tests/T017snmpv2ctov1getfail,   
+      testing/tests/T018snmpv1tov2cgetfail,   
+      testing/tests/T019snmpv2cnosuch, testing/tests/T020snmpv3get,   
+      testing/tests/T021snmpv3getnext,   
+      testing/tests/T0220snmpv3bulkget:
+
+   CHANGES: building: Disable tests if the agent is built without
+   the mib module they depend on.
+
+2008-06-21 12:14  magfr
+
+   * configure, configure.in:
+
+   Remove spurious AC_MSG_RESULT inside an AC_CACHE_CHECK
+
+2008-06-18 05:07  magfr
+
+   * configure, configure.in:
+
+   Handle solaris awk as well.
+
+2008-06-17 16:01  tanders
+
+   * agent/auto_nlist.c:
+
+   CHANGES: snmpd: PATCH: 1995753: from volkov_peter: minor cleanup
+   agent/auto_nlist.c
 
 2008-06-17 08:57  dts12
 
    * snmplib/snmpTCPIPv6Domain.c:
-     Fix potential buffer overflow in sprintf for TCP/IPv6
-     Cross-port of revision 16668
+
+   Fix potential buffer overflow in sprintf for TCP/IPv6
+   Cross-port of revision 16668
 
 2008-06-16 23:55  tanders
 
    * configure.in:
-     CHANGES: build: BUG: 1995172: fix --without-elf configure usage message
 
-2008-06-15 22:15  dts12
+   CHANGES: build: BUG: 1995172: fix --without-elf configure usage
+   message
 
-   * FAQ, README, configure, configure.in, dist/net-snmp.spec,
-     sedscript.in, snmplib/snmp_version.c:
-     - version tag ( 5.4.2.pre2 )
-
-2008-06-15 22:14  dts12
-
-   * CHANGES, NEWS:
-     version update
-
-2008-06-15 21:55  dts12
-
-   * ChangeLog:
-     Version update
-     
-     Also fix all ChangeLog entries since the CVS->SVN move,
-     which have been omitting information about what files
-     were affected by any given change.
-
-2008-06-15 21:32  dts12
-
-   * agent/Makefile.depend, agent/helpers/Makefile.depend,
-     agent/mibgroup/Makefile.depend, apps/Makefile.depend,
-     apps/snmpnetstat/Makefile.depend, snmplib/Makefile.depend:
-     make depend
-
-2008-06-15 21:06  dts12
-
-   * doxygen.conf:
-     - version tag ( 5.4.2.pre2 )
 2008-06-13 22:16  dts12
 
    * dist/find-requires, dist/net-snmp.spec:
-     CHANGES: build: Improved RPM spec files, for better consistency with vendor-provided packages.
-     Provided by Jan Safranek
 
-2008-06-13 21:54  dts12
-
-   * configure, configure.in:
-     Restore embedded perl to default Mac OS/X build.
-     (reversing revision 16988)
+   CHANGES: build: Improved RPM spec files, for better consistency
+   with vendor-provided packages.
+   Provided by Jan Safranek
 
 2008-06-13 21:03  dts12
 
    * configure, configure.in:
-     CHANGES: build: PATCH: 1899762: Tweak embedded_perl configure checks.
+
+   CHANGES: build: PATCH: 1899762: Tweak embedded_perl configure
+   checks.
+
+2008-06-13 05:43  magfr
+
+   *  acconfig.h, agent/mibgroup/snmpv3mibs.h, configure, configure.in, 
+        include/net-snmp/net-snmp-config.h.in:
+
+   NEWS: building: Retire the config_old/new_require feature and
+   replace it with config_version_require that compares version
+   numbers to achieve a similar thing
 
 2008-06-12 12:50  dts12
 
    * dist/makerelease:
-     Only add non-default MIB modules to the test builds.
-     Specifying the host module is not needed on Linux systems,
-     and may break on other O/Ss. Specifying the disman/event
-     MIB is unnecessary on any system.
 
-2008-06-12 12:45  dts12
-
-   * dist/makerelease:
-     Missing MD5 signature file for zip release
-
-2008-06-12 12:44  dts12
-
-   * dist/makerelease:
-     Basic documentation and help/usage messages.
+   Only add non-default MIB modules to the test builds.
+   Specifying the host module is not needed on Linux systems,
+   and may break on other O/Ss. Specifying the disman/event
+   MIB is unnecessary on any system.
 
 2008-06-11 10:16  dts12
 
    * dist/makerelease:
-     Only enable IPX transport on Linux systems
+
+   Only enable IPX transport on Linux systems
 
 2008-06-10 14:37  dts12
 
-   * agent/mibgroup/utilities/iquery.c,
-     include/net-snmp/library/snmp_api.h, snmplib/snmp_client.c:
-     snmpd: PATCH: 1918383: Fix DisMan monitoring of AgentX subagents
-     Note that this doesn't actually use the code submitted in that
-     patch.
-     Instead it inserts a callback hook into the
-     snmp_synch_response_cb
-     routine (using the myvoid pointer and a new session flag), which
-     has
-     the same effect without needing to duplicate any code.
+   *  agent/mibgroup/utilities/iquery.c,   
+      include/net-snmp/library/snmp_api.h, snmplib/snmp_client.c:
+
+   snmpd: PATCH: 1918383: Fix DisMan monitoring of AgentX subagents
+   Note that this doesn't actually use the code submitted in that
+   patch.
+   Instead it inserts a callback hook into the
+   snmp_synch_response_cb
+   routine (using the myvoid pointer and a new session flag), which
+   has
+   the same effect without needing to duplicate any code.
 
 2008-06-10 12:52  dts12
 
    * agent/mibgroup/disman/event/mteTrigger.c:
-     Fix logic errors in handling of old/current varbind lists.
-     Reported by Fred Gao in patch #1918383
 
-2008-06-10 10:51  dts12
+   Fix logic errors in handling of old/current varbind lists.
+   Reported by Fred Gao in patch #1918383
+
+2008-06-09 19:08  hardaker
 
    * snmplib/scapi.c:
-     update to match published release
+
+   update to match published release
+
+2008-06-09 16:58  hardaker
+
+   * dist/makerelease.xml:
+
+   added snmp_version.c
 
 2008-06-09 09:05  dts12
 
    * apps/snmptrap.c, apps/snmpusm.c:
-     A couple more missing error checks.
-     Based on those reported by Boya Sun
+
+   A couple more missing error checks.
+   Based on those reported by Boya Sun
 
 2008-06-06 12:02  dts12
 
    * configure, configure.in:
-     Better handling of embedded perl on Mac OS/X
-     (nearly working on Leopard now)
 
-2008-06-05 23:07  tanders
+   Better handling of embedded perl on Mac OS/X
+   (nearly working on Leopard now)
 
-   * dist/net-snmp.spec:
-     sync with trunk
+2008-06-03 23:14  tanders
 
-2008-06-05 21:12  tanders
+   *  acconfig.h, agent/auto_nlist.c, agent/mibgroup/hardware/cpu.h,   
+      agent/mibgroup/hardware/memory.h,   
+      agent/mibgroup/host/hr_filesys.c,   
+      agent/mibgroup/host/hr_storage.c, agent/mibgroup/host/hr_swrun.c, 
+        agent/mibgroup/host/hrh_filesys.c, agent/mibgroup/mibII/icmp.c, 
+        agent/mibgroup/mibII/interfaces.c, agent/mibgroup/mibII/ip.c,   
+      agent/mibgroup/mibII/tcp.c, agent/mibgroup/mibII/udp.c,   
+      agent/mibgroup/ucd-snmp/diskio.c,   
+      agent/mibgroup/ucd-snmp/loadave.c,   
+      agent/mibgroup/ucd-snmp/proc.c, configure.in,   
+      include/net-snmp/net-snmp-config.h.in, snmplib/system.c:
 
-   * configure:
-     run autoconf
+   NEWS: aix: Add support for AIX 6.x
 
-2008-06-05 21:11  tanders
-
-   * acconfig.h, agent/auto_nlist.c, agent/mibgroup/hardware/cpu.h,
-     agent/mibgroup/hardware/memory.h,
-     agent/mibgroup/host/hr_filesys.c,
-     agent/mibgroup/host/hr_storage.c, agent/mibgroup/host/hr_swrun.c,
-     agent/mibgroup/mibII/icmp.c, agent/mibgroup/mibII/interfaces.c,
-     agent/mibgroup/mibII/ip.c, agent/mibgroup/mibII/tcp.c,
-     agent/mibgroup/mibII/udp.c, agent/mibgroup/ucd-snmp/diskio.c,
-     agent/mibgroup/ucd-snmp/loadave.c,
-     agent/mibgroup/ucd-snmp/proc.c, configure.in,
-     include/net-snmp/net-snmp-config.h.in, snmplib/system.c:
-     NEWS: AIX: Add support for AIX 6.x.
-     Successfully tested on trunk (passed extensive regression
-     testing).
-
-2008-06-05 21:04  tanders
+2008-06-03 22:46  tanders
 
    * aclocal.m4, config.guess, config.sub, configure, ltmain.sh:
-     NEWS: build: Update to libtool 1.5.26 (from 1.5.24), e.g. to
-     better support AIX 6.1 and Mac OS X Leopard.
-     Successfully tested on trunk (passed extensive regression
-     testing).
 
-2008-06-03 09:37  dts12
+   NEWS: build: Update to libtool 1.5.26 (from 1.5.24), e.g. to
+   better support AIX 6.1 and Mac OS X Leopard
 
-   * README.osX:
-     Document why embedded perl was disabled.
+2008-06-03 22:39  tanders
 
-2008-06-03 08:57  dts12
+   * acconfig.h, include/net-snmp/net-snmp-config.h.in:
+
+   why add legacy definitions for new stuff?
+
+2008-06-03 09:03  dts12
 
    * agent/mibgroup/utilities/iquery.c:
-     Ensure the default internal query session has a valid engineID,
-     to avoid having to probe for it on the first use.
 
-2008-06-02 15:18  dts12
+   Ensure the default internal query session has a valid engineID,
+   to avoid having to probe for it on the first use.
 
-   * configure, configure.in:
-     Drop embedded perl from the default build on Mac OS/X
-     Th dual-architecture nature of the default perl binary
-     confuses the configure script sufficiently that the
-     code won't actually compile.
+2008-06-02 22:17  magfr
 
-2008-06-02 13:27  dts12
+   *  include/net-snmp/library/snmp_api.h,   
+      include/net-snmp/library/snmp_client.h,   
+      include/net-snmp/library/tools.h, snmplib/snmp_api.c,   
+      snmplib/snmp_client.c, snmplib/tools.c:
+
+   NEWS: snmplib: Convert generic source arguments from const
+   u_char* to const void* for snmp_pdu_add_variable,
+   snmp_varlist_add_variable, snmp_set_var_value,
+   snmp_set_var_typed_value and memdup.
+
+2008-06-02 13:28  dts12
 
    * agent/mibgroup/disman/event/mteTrigger.c:
-     Ensure that the "trigger armed" flag is cleared whenever the
-     matching
-     expression is found to hold - even if the trigger doesn't
-     actually fire.
-     This affects the behaviour of initially-true expressions, when
-     this
-     initial firing is suppressed using the mteTrigger*Startup object.
-     Without this tweak, the trigger will fire on the second sampling
-     (as if the expression had evaluated false first time round).
+
+   Ensure that the "trigger armed" flag is cleared whenever the
+   matching
+   expression is found to hold - even if the trigger doesn't
+   actually fire.
+   This affects the behaviour of initially-true expressions, when
+   this
+   initial firing is suppressed using the mteTrigger*Startup object.
+   Without this tweak, the trigger will fire on the second sampling
+   (as if the expression had evaluated false first time round).
 
 2008-06-01 20:02  dts12
 
-   * agent/mibgroup/disman/event/mteEvent.c,
-     agent/mibgroup/disman/event/mteObjects.c,
-     agent/mibgroup/disman/event/mteObjects.h:
-     Handle varbind payload for internal linkUp/Down notifications.
+   *  agent/mibgroup/disman/event/mteEvent.c,   
+      agent/mibgroup/disman/event/mteObjects.c,   
+      agent/mibgroup/disman/event/mteObjects.h:
+
+   Handle varbind payload for internal linkUp/Down notifications.
 
 2008-06-01 06:45  tanders
 
    * perl/TrapReceiver/TrapReceiver.xs:
-     NEWS: snmptrapd: BUG: 1955227: Memory leak for embedded Perl on
-     x86_64
 
-2008-05-29 16:11  dts12
+   NEWS: snmptrapd: BUG: 1955227: Memory leak for embedded Perl on
+   x86_64
 
-   * agent/mibgroup/hardware/memory/memory_linux.c:
-     Silly typo
+2008-05-31 12:08  magfr
+
+   * agent/helpers/scalar_group.c:
+
+   CHANGES: snmpd: The scalar helper that was called from the
+   scalar_group helper did nothing save adding a trailing 0 to the
+   argument. Remove the use of the scalar helper from the
+   scalar_group and add the trailing 0 in the scalar_group helper.
+
+2008-05-30 13:56  dts12
+
+   * dist/RELEASE-INSTRUCTIONS:
+
+   Tweak list of on-line software directories to be updated.
 
 2008-05-29 09:59  dts12
 
-   * agent/agent_registry.c, agent/helpers/stash_cache.c,
-     agent/mibgroup/agent/extend.c, agent/mibgroup/agentx/client.c,
-     agent/mibgroup/disman/event/mteTrigger.c, apps/snmptest.c,
-     apps/snmptrap.c, apps/snmpusm.c, snmplib/snmpusm.c:
-     Various missing error checks, etc.
-     Reported by Boya Sun.
+   *  agent/agent_registry.c, agent/helpers/stash_cache.c,   
+      agent/mibgroup/agent/extend.c, agent/mibgroup/agentx/client.c,   
+      agent/mibgroup/disman/event/mteTrigger.c, apps/snmptest.c,   
+      apps/snmptrap.c, apps/snmpusm.c, snmplib/snmpusm.c:
+
+   Various missing error checks, etc.
+   Reported by Boya Sun.
 
 2008-05-28 11:48  dts12
 
-   * agent/mibgroup/hardware/memory/memory_freebsd.c,
-     agent/mibgroup/ucd-snmp/memory.c:
-     Report cached memory size/usage properly (particularly on
-     FreeBSD).
+   *  agent/mibgroup/hardware/memory/memory_freebsd.c,   
+      agent/mibgroup/ucd-snmp/memory.c:
+
+   Report cached memory size/usage properly (particularly on
+   FreeBSD).
 
 2008-05-28 11:21  dts12
 
    * agent/mibgroup/ucd-snmp/memory.c:
-     Bring memBuffer code into line with revision 16975.
+
+   Bring memBuffer code into line with revision 16975.
 
 2008-05-28 11:10  dts12
 
    * agent/mibgroup/hardware/memory/memory_linux.c:
-     Linux 2.6 kernel does not report shared memory information.
+
+   Linux 2.6 kernel does not report shared memory information.
 
 2008-05-28 09:18  dts12
 
    * agent/mibgroup/hardware/memory/memory_linux.c:
-     CHANGES: snmpd: BUG: 1931391: Fix reporting of Memory buffers and
-     cached memory.
-     Problem reported by doconeill.
+
+   CHANGES: snmpd: BUG: 1931391: Fix reporting of Memory buffers and
+   cached memory.
+   Problem reported by doconeill.
+
+2008-05-28 08:30  dts12
+
+   * agent/mibgroup/agentx/subagent.c:
+
+   Tweak the fix for bug #1912647
 
 2008-05-28 06:56  magfr
 
    * agent/helpers/scalar_group.c:
-     CHANGES: snmpd: Enforce the lower limit on scalar_groups
-     This fixes the case of getnext icmp.0 returning icmp.0.0 instead
-     of the
-     expected icmpInMsgs.0
+
+   CHANGES: snmpd: Enforce the lower limit on scalar_groups
+   This fixes the case of getnext icmp.0 returning icmp.0.0 instead
+   of the
+   expected icmpInMsgs.0
 
 2008-05-27 22:03  dts12
 
    * agent/mibgroup/agentx/master.c, agent/mibgroup/agentx/subagent.c:
-     CHANGES: snmpd: BUG: 1912647: Fix memory leak following failed
-     requests.
-     Fix provided by Anton Pak
+
+   CHANGES: snmpd: BUG: 1912647: Fix memory leak following failed
+   requests.
+   Fix provided by Anton Pak
 
 2008-05-27 21:22  dts12
 
    * snmplib/snmp_api.c:
-     CHANGES: snmplib: BUG: 1958041: Ensure IDs are not truncated.
+
+   CHANGES: snmplib: BUG: 1958041: Ensure IDs are not truncated.
 
 2008-05-27 14:18  dts12
 
    * agent/mibgroup/hardware/memory/memory_freebsd.c:
-     Monitor memory buffers on FreeBSD systems.
-     API suggested by Chris
+
+   Monitor memory buffers on FreeBSD systems.
+   API suggested by Chris
 
 2008-05-27 12:47  dts12
 
    * agent/mibgroup/hardware/cpu/cpu_sysctl.c:
-     Fix careless typo when applying Maxim's patch.
+
+   Fix careless typo when applying Maxim's patch.
+
+2008-05-25 21:37  magfr
+
+   *  README.agent-mibs, agent/mibgroup/snmpv3/usmStats.h,   
+      agent/mibgroup/snmpv3/usmStats_5_5.c,   
+      agent/mibgroup/snmpv3/usmStats_5_5.h,   
+      agent/mibgroup/snmpv3mibs.h:
+
+   CHANGES: snmpd: Reimplementation of usmStats.
 
 2008-05-25 07:24  magfr
 
    * agent/mibgroup/disman/event/mteEventConf.c:
-     Remove a local variable only used to track a local string
-     constant and replace t with a direct reference to the string
-     constant.
-     Mark two local functions static as well.
+
+   Remove a local variable only used to track a local string
+   constant and replace t with a direct reference to the string
+   constant.
+   Mark two local functions static as well.
 
 2008-05-25 07:17  magfr
 
    * agent/mibgroup/utilities/iquery.c:
-     Reorder to avoid one strlen call.
-     Add missing cast.
+
+   Reorder to avoid one strlen call.
+   Add missing cast.
 
 2008-05-25 07:14  magfr
 
    * agent/mibgroup/ip-mib/data_access/scalars_linux.c:
-     Make ipfw_name a static array instead of a pointer as it is
-     private to this module.
+
+   Make ipfw_name a static array instead of a pointer as it is
+   private to this module.
 
 2008-05-25 07:05  magfr
 
    * agent/helpers/instance.c:
-     When casting, cast to the right type.
+
+   When casting, cast to the right type.
+
+2008-05-25 06:08  magfr
+
+   *  agent/helpers/cache_handler.c, agent/helpers/read_only.c,   
+      agent/helpers/stash_cache.c, agent/mibgroup/agent/extend.c,   
+      agent/mibgroup/agent/nsCache.c, agent/mibgroup/agent/nsLogging.c, 
+        agent/mibgroup/host/hr_print.c, agent/mibgroup/host/hr_swinst.c,
+         agent/snmp_agent.c, apps/snmptest.c, snmplib/read_config.c,   
+      snmplib/snmp_client.c:
+
+   Remove warnings about unreachable code on solaris.
 
 2008-05-24 20:30  dts12
 
    * python/netsnmp/client_intf.c:
-     CHANGES: python: BUG: 1826174: Check for buffer overflow when
-     printing values.
-     Addresses CVE-2008-2292
+
+   CHANGES: python: BUG: 1826174: Check for buffer overflow when
+   printing values.
+   Addresses CVE-2008-2292
+
+2008-05-24 13:11  magfr
+
+   * configure, configure.in:
+
+   On AIX netinet/in_pcb.h depends on net/route.h. Add the include
+   for configure.
+
+2008-05-24 09:06  magfr
+
+   *  acconfig.h, configure, configure.in,   
+      include/net-snmp/net-snmp-config.h.in:
+
+   Make the checks for netinet/in_pcb.h and sys/disklabel.h use the
+   normal
+   machinery.
+   Add a netsnmp prefix to the cache variable
+   cv_sys_ioctl_h_has_SIOCGIFADDR to
+   pacify aclocal.
 
 2008-05-23 20:27  dts12
 
-   * agent/mibgroup/hardware/cpu.h,
-     agent/mibgroup/hardware/cpu/cpu_sysctl.c:
-     CHANGES: snmpd: PATCH: Fix for CPU stats on FreeBSD
-     Provided by Maxim Sobolev
+   *  agent/mibgroup/hardware/cpu.h,   
+      agent/mibgroup/hardware/cpu/cpu_sysctl.c:
+
+   CHANGES: snmpd: PATCH: Fix for CPU stats on FreeBSD
+   Provided by Maxim Sobolev
 
 2008-05-23 20:12  dts12
 
    * dist/snmpd-init.d, dist/snmptrapd-init.d:
-     CHANGES: install: PATCH: 1969627: Handle empty
-     /etc/sysconfig/network file
-     Fix provided by Josh Wilmes
+
+   CHANGES: install: PATCH: 1969627: Handle empty
+   /etc/sysconfig/network file
+   Fix provided by Josh Wilmes
 
 2008-05-23 20:07  dts12
 
    * agent/mibgroup/host/hr_filesys.c:
-     CHANGES: snmpd: PATCH: 1967194: Recognise NFS4 mounts
-     Submitted by Fabrice Bacchella
+
+   CHANGES: snmpd: PATCH: 1967194: Recognise NFS4 mounts
+   Submitted by Fabrice Bacchella
 
 2008-05-22 20:55  dts12
 
    * snmplib/asn1.c:
-     Don't change length of OID buffer if parsing the OID fails.
-     Reported by saifulla Mohd Abdul.
+
+   Don't change length of OID buffer if parsing the OID fails.
+   Reported by saifulla Mohd Abdul.
+
+2008-05-22 13:34  hardaker
+
+   * dist/makerelease.xml:
+
+   update the advertising section and change note about how to
+   upload files (adding an automatted rsync command)
+
+2008-05-22 04:08  magfr
+
+   * agent/mibgroup/util_funcs/header_simple_table.c:
+
+   Add missing include.
+
+2008-05-21 20:27  magfr
+
+   * snmplib/snmpAliasDomain.c:
+
+   Make it possible to build the alias module with a C++ compiler.
+
+2008-05-21 13:40  hardaker
+
+   * dist/makerelease.xml:
+
+   added FSF directory info
+
+2008-05-21 09:21  dts12
+
+   * dist/RELEASE-INSTRUCTIONS:
+
+   Add Free Software Directory to the list of places to be updated.
+
+2008-05-20 23:00  magfr
+
+   *  agent/mibgroup/agent/extend.c, agent/mibgroup/agent/extend.h,   
+      agent/mibgroup/examples/example.c,   
+      agent/mibgroup/examples/example.h,   
+      agent/mibgroup/examples/ucdDemoPublic.c,   
+      agent/mibgroup/examples/ucdDemoPublic.h,   
+      agent/mibgroup/mibII/icmp.c, agent/mibgroup/mibII/interfaces.c,   
+      agent/mibgroup/mibII/interfaces.h, agent/mibgroup/mibII/ip.c,   
+      agent/mibgroup/mibII/tcp.c, agent/mibgroup/mibII/udp.c,   
+      agent/mibgroup/mibII/vacm_vars.c,   
+      agent/mibgroup/mibII/vacm_vars.h, agent/mibgroup/misc/ipfwacc.c,  
+       agent/mibgroup/misc/ipfwacc.h,   
+      agent/mibgroup/snmpv3/snmpEngine.c,   
+      agent/mibgroup/snmpv3/snmpEngine.h,   
+      agent/mibgroup/snmpv3/snmpMPDStats.c,   
+      agent/mibgroup/snmpv3/snmpMPDStats.h,   
+      agent/mibgroup/snmpv3/usmStats.c,   
+      agent/mibgroup/snmpv3/usmStats.h,   
+      agent/mibgroup/snmpv3/usmUser.c, agent/mibgroup/snmpv3/usmUser.h, 
+        agent/mibgroup/target/snmpTargetAddrEntry.c,   
+      agent/mibgroup/target/snmpTargetAddrEntry.h,   
+      agent/mibgroup/ucd-snmp/disk.c, agent/mibgroup/ucd-snmp/disk.h,   
+      agent/mibgroup/ucd-snmp/diskio.c,   
+      agent/mibgroup/ucd-snmp/diskio.h,   
+      agent/mibgroup/ucd-snmp/errormib.c,   
+      agent/mibgroup/ucd-snmp/errormib.h,   
+      agent/mibgroup/ucd-snmp/extensible.c,   
+      agent/mibgroup/ucd-snmp/extensible.h,   
+      agent/mibgroup/ucd-snmp/file.c, agent/mibgroup/ucd-snmp/file.h,   
+      agent/mibgroup/ucd-snmp/lmSensors.c,   
+      agent/mibgroup/ucd-snmp/lmSensors.h,   
+      agent/mibgroup/ucd-snmp/loadave.c,   
+      agent/mibgroup/ucd-snmp/loadave.h,   
+      agent/mibgroup/ucd-snmp/logmatch.c,   
+      agent/mibgroup/ucd-snmp/logmatch.h,   
+      agent/mibgroup/ucd-snmp/memory_aix4.c,   
+      agent/mibgroup/ucd-snmp/memory_aix4.h,   
+      agent/mibgroup/ucd-snmp/memory_darwin7.c,   
+      agent/mibgroup/ucd-snmp/memory_darwin7.h,   
+      agent/mibgroup/ucd-snmp/memory_dynix.c,   
+      agent/mibgroup/ucd-snmp/memory_dynix.h,   
+      agent/mibgroup/ucd-snmp/memory_netbsd1.c,   
+      agent/mibgroup/ucd-snmp/memory_netbsd1.h,   
+      agent/mibgroup/ucd-snmp/memory_solaris2.c,   
+      agent/mibgroup/ucd-snmp/memory_solaris2.h,   
+      agent/mibgroup/ucd-snmp/vmstat_aix4.c,   
+      agent/mibgroup/ucd-snmp/vmstat_aix4.h,   
+      agent/mibgroup/ucd-snmp/vmstat_bsdi4.c,   
+      agent/mibgroup/ucd-snmp/vmstat_bsdi4.h,   
+      agent/mibgroup/ucd-snmp/vmstat_darwin7.c,   
+      agent/mibgroup/ucd-snmp/vmstat_darwin7.h,   
+      agent/mibgroup/ucd-snmp/vmstat_dynix.c,   
+      agent/mibgroup/ucd-snmp/vmstat_dynix.h,   
+      agent/mibgroup/ucd-snmp/vmstat_freebsd2.c,   
+      agent/mibgroup/ucd-snmp/vmstat_freebsd2.h,   
+      agent/mibgroup/ucd-snmp/vmstat_hpux.c,   
+      agent/mibgroup/ucd-snmp/vmstat_hpux.h,   
+      agent/mibgroup/ucd-snmp/vmstat_linux.c,   
+      agent/mibgroup/ucd-snmp/vmstat_linux.h,   
+      agent/mibgroup/ucd-snmp/vmstat_netbsd1.c,   
+      agent/mibgroup/ucd-snmp/vmstat_netbsd1.h,   
+      agent/mibgroup/ucd-snmp/vmstat_solaris2.c,   
+      agent/mibgroup/ucd-snmp/vmstat_solaris2.h,   
+      agent/mibgroup/util_funcs, agent/mibgroup/util_funcs.c,   
+      agent/mibgroup/util_funcs.h,   
+      agent/mibgroup/util_funcs/MIB_STATS_CACHE_TIMEOUT.h,   
+      agent/mibgroup/util_funcs/header_generic.c,   
+      agent/mibgroup/util_funcs/header_generic.h,   
+      agent/mibgroup/util_funcs/header_simple_table.c,   
+      agent/mibgroup/util_funcs/header_simple_table.h:
+
+   CHANGES: snmpd: The majority of the dependencies on util_funcs is
+   for the header_* functions. Factor out the header_* functions and
+   adjust the requirements.
+
+2008-05-20 22:40  magfr
+
+   *  agent/mibgroup/Rmon/agutil.c, agent/mibgroup/Rmon/alarm.c,   
+      agent/mibgroup/Rmon/alarm.h, agent/mibgroup/Rmon/event.c,   
+      agent/mibgroup/Rmon/event.h, agent/mibgroup/Rmon/history.c,   
+      agent/mibgroup/Rmon/history.h, agent/mibgroup/Rmon/rows.c,   
+      agent/mibgroup/Rmon/statistics.c,   
+      agent/mibgroup/Rmon/statistics.h, agent/mibgroup/agent/nsCache.c, 
+        agent/mibgroup/agent/nsDebug.c,
+      agent/mibgroup/agent/nsLogging.c,   
+      agent/mibgroup/hardware/sensors/kstat_sensors.c,   
+      agent/mibgroup/hardware/sensors/lmsensors_v2.c,   
+      agent/mibgroup/hardware/sensors/lmsensors_v3.c,   
+      agent/mibgroup/hardware/sensors/picld_sensors.c,   
+      agent/mibgroup/mibII/ipAddr.h, agent/mibgroup/mibII/ipv6.c,   
+      agent/mibgroup/mibII/kernel_linux.c,   
+      agent/mibgroup/mibII/route_headers.h,   
+      agent/mibgroup/mibII/snmp_mib.c, agent/mibgroup/mibII/tcp.h,   
+      agent/mibgroup/mibII/tcpTable.h, agent/mibgroup/mibII/udp.h,   
+      agent/mibgroup/mibII/udpTable.h,   
+      agent/mibgroup/mibII/vacm_conf.c,   
+      agent/mibgroup/mibII/vacm_conf.h,   
+      agent/mibgroup/mibII/var_route.c,   
+      agent/mibgroup/mibII/var_route.h, agent/mibgroup/smux/smux.c,   
+      agent/mibgroup/target/snmpTargetParamsEntry.h,   
+      agent/mibgroup/tunnel/tunnel.c,   
+      agent/mibgroup/utilities/override.c, agent/mibgroup/winExtDLL.c,  
+       agent/mibgroup/winExtDLL.h, agent/snmp_agent.c:
+
+   CHANGES: Do not config_require(util_funcs) if nothing from
+   util_funcs is used
 
 2008-05-14 13:35  tanders
 
    * agent/mibgroup/if-mib/data_access/interface_linux.c:
-     fix build failures with earlier Linux kernels (e.g. with RH7.1)
-     introduced by r16909
 
-2008-05-09 19:04  dts12
+   fix build failures with earlier Linux kernels (e.g. with RH7.1)
+   introduced by r16909
 
-   * FAQ, README, configure, configure.in, dist/net-snmp.spec,
-     perl/ASN/ASN.pm, perl/AnyData_SNMP/Storage.pm, perl/OID/OID.pm,
-     perl/SNMP/SNMP.pm, perl/TrapReceiver/TrapReceiver.pm,
-     perl/agent/Support/Support.pm, perl/agent/agent.pm,
-     perl/agent/default_store/default_store.pm,
-     perl/default_store/default_store.pm, sedscript.in,
-     snmplib/snmp_version.c:
-     - version tag ( 5.4.2.pre1 )
+2008-05-13 18:56  hardaker
 
-2008-05-09 19:04  dts12
+   * include/net-snmp/net-snmp-config.h.in:
 
-   * CHANGES, NEWS:
-     version update
+   fix comment typo
 
-2008-05-09 18:47  dts12
+2008-05-13 15:46  hardaker
 
-   * ChangeLog:
-     version update
+   * NEWS:
 
-2008-05-09 15:24  dts12
+   document the -t switch change
 
-   * agent/Makefile.depend, agent/helpers/Makefile.depend,
-     agent/mibgroup/Makefile.depend, apps/Makefile.depend,
-     apps/snmpnetstat/Makefile.depend, snmplib/Makefile.depend:
-     make depend
+2008-05-13 15:45  hardaker
 
-2008-05-09 15:14  dts12
+   * man/snmpcmd.1.def:
 
-   * doxygen.conf:
-     - version tag ( 5.4.2.pre1 )
+   document the alias keyword
 
-2008-05-09 14:51  dts12
+2008-05-13 15:41  hardaker
 
-   * man/netsnmp_agent.3, man/netsnmp_agent_registry.3,
-     man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,
-     man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,
-     man/netsnmp_cache_handler.3, man/netsnmp_callback.3,
-     man/netsnmp_container.3, man/netsnmp_data_list.3,
-     man/netsnmp_debug.3, man/netsnmp_default_store.3,
-     man/netsnmp_handler.3, man/netsnmp_instance.3,
-     man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,
-     man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,
-     man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,
-     man/netsnmp_multiplexer.3,
-     man/netsnmp_netsnmp_agent_request_info_s.3,
-     man/netsnmp_netsnmp_column_info_t.3,
-     man/netsnmp_netsnmp_data_list_s.3,
-     man/netsnmp_netsnmp_handler_registration_s.3,
-     man/netsnmp_netsnmp_iterator_info_s.3,
-     man/netsnmp_netsnmp_mib_handler_access_methods.3,
-     man/netsnmp_netsnmp_mib_handler_methods.3,
-     man/netsnmp_netsnmp_mib_handler_s.3,
-     man/netsnmp_netsnmp_request_info_s.3,
-     man/netsnmp_netsnmp_table_registration_info_s.3,
-     man/netsnmp_netsnmp_table_request_info_s.3,
-     man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,
-     man/netsnmp_read_config.3, man/netsnmp_read_only.3,
-     man/netsnmp_row_merge.3, man/netsnmp_scalar.3,
-     man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,
-     man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,
-     man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,
-     man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,
-     man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,
-     man/netsnmp_table.3, man/netsnmp_table_array.3,
-     man/netsnmp_table_container.3, man/netsnmp_table_data.3,
-     man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,
-     man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,
-     man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,
-     man/netsnmp_table_rows.3, man/netsnmp_tdata.3,
-     man/netsnmp_util.3, man/netsnmp_utilities.3,
-     man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
-     documentation update
+   * man/snmpcmd.1.def, snmplib/snmp_parse_args.c:
 
-2008-05-09 14:47  dts12
+   allow floating point numbers to be used for timeout values
 
-   * doxygen.conf:
-     - version tag ( 5.4.2 )
+2008-05-12 21:11  hardaker
 
-2008-05-09 14:23  dts12
+   * mibs/NET-SNMP-TC.txt, snmplib/snmpAliasDomain.c:
 
-   * Makefile.top:
-     version update
+   Added a real snmpAliasDomain OID definition
 
-2008-05-09 13:58  dts12
+2008-05-12 21:07  hardaker
 
-   * agent/mibgroup/host/hr_filesys.c:
-     Debugging messages.
+   * NEWS:
+
+   updated NEWS with new alias blurb
+
+2008-05-12 21:07  hardaker
+
+   *  acconfig.h, configure, configure.in,   
+      include/net-snmp/library/snmpAliasDomain.h,   
+      include/net-snmp/net-snmp-config.h.in, man/snmp.conf.5.def,   
+      snmplib/snmpAliasDomain.c, snmplib/snmp_transport.c:
+
+   NEWS: snmplib: Added a alias transport for mapping complex
+   transport strings to simple name definitions
+
+2008-05-12 19:38  hardaker
+
+   * dist/makerelease.xml:
+
+   strip off trailing module name
+
+2008-05-12 06:03  magfr
+
+   * agent/mibgroup/mibII/snmp_mib.c:
+
+   Make mibII/snmp work again.
+
+2008-05-10 21:47  magfr
+
+   *  agent/mibgroup/ip-mib/ip_scalars.c,   
+      agent/mibgroup/ucd-snmp/diskio.c:
+
+   CHANGES: snmpd: Remove unused variables.
+
+2008-05-10 09:55  magfr
+
+   *  agent/agent_index.c, agent/mibgroup/agentx/master.c,   
+      agent/mibgroup/agentx/master_admin.c,   
+      agent/mibgroup/ucd-snmp/proxy.c, agent/snmp_agent.c,   
+      snmplib/asn1.c:
+
+   CHANGES: snmpd, snmplib: Replace the invalid %08p format
+   specifier with the correct %8p.
+
+2008-05-10 09:51  magfr
+
+   *  agent/mibgroup/disman/schedule/schedCore.c,   
+      agent/mibgroup/if-mib/data_access/interface_linux.c,   
+      agent/mibgroup/mibII/at.c, agent/mibgroup/mibII/icmp.c,   
+      agent/mibgroup/mibII/ipAddr.c, agent/mibgroup/mibII/ipv6.c,   
+      agent/mibgroup/mibII/route_write.c,   
+      agent/mibgroup/mibII/tcpTable.c, agent/mibgroup/mibII/udpTable.c, 
+        agent/mibgroup/mibII/vacm_vars.c,   
+      agent/mibgroup/mibII/var_route.c,   
+      agent/mibgroup/snmpv3/snmpEngine.c,   
+      agent/mibgroup/snmpv3/usmUser.c,   
+      agent/mibgroup/target/snmpTargetAddrEntry.c,   
+      agent/mibgroup/target/snmpTargetParamsEntry.c,   
+      agent/mibgroup/ucd-snmp/disk.c,   
+      agent/mibgroup/ucd-snmp/loadave.c,   
+      agent/mibgroup/ucd-snmp/pass.c,   
+      agent/mibgroup/ucd-snmp/pass_persist.c, apps/snmpdelta.c,   
+      apps/snmpnetstat/inet.c, apps/snmpnetstat/inet6.c,   
+      apps/snmpnetstat/main.c, apps/snmptrapd.c,   
+      apps/snmptrapd_handlers.c:
+
+   CHANGES: snmpd, snmpnetstat, snmptrapd, snmpdelta: Use NULL
+   instead of 0 for NULL pointers. Use casted 0's instead of 0 for
+   NULL function pointers.
+
+2008-05-10 09:40  magfr
+
+   *  agent/mibgroup/host/hr_disk.h,   
+      include/net-snmp/agent/agent_sysORTable.h,   
+      include/net-snmp/agent/stash_cache.h:
+
+   CHANGES: snmpd: Add missing function declarations.
+
+2008-05-10 09:39  magfr
+
+   *  agent/mibgroup/agentx/subagent.c,   
+      agent/mibgroup/disman/expr/expExpressionConf.c,   
+      agent/mibgroup/ucd-snmp/diskio.c, agent/snmp_vars.c:
+
+   CHANGES: snmpd: Add missing include files.
+
+2008-05-10 09:33  magfr
+
+   *  agent/agent_registry.c, agent/helpers/table_data.c,   
+      agent/helpers/table_dataset.c,   
+      agent/mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable_interface.c,
+        
+      agent/mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable_interface.c,
+        
+      agent/mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable_interface.c,
+        
+      agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_interface.c,  
+      
+      agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable_interface.c,
+         agent/snmp_agent.c, local/mib2c-conf.d/mfd-interface.m2c,   
+      snmplib/data_list.c:
+
+   CHANGES: snmpd, snmplib, mib2c: Move the definition of inline
+   functions so that the compiler sees them before it sees uses of
+   them.
+
+2008-05-10 09:30  magfr
+
+   *  agent/agent_handler.c, agent/helpers/table_dataset.c,   
+      include/net-snmp/agent/agent_handler.h,   
+      include/net-snmp/agent/snmp_agent.h,   
+      include/net-snmp/agent/table_data.h,   
+      include/net-snmp/agent/table_dataset.h,   
+      include/net-snmp/library/data_list.h:
+
+   CHANGES: snmpd, snmplib: Remove the inline declarations for
+   functions that lack an inline definition.
+
+2008-05-09 21:35  magfr
+
+   *  agent/agent_index.c, agent/agent_registry.c, agent/agent_trap.c,  
+       agent/helpers/table.c, agent/mibgroup/Rmon/rows.c,   
+      agent/mibgroup/agentx/subagent.c,   
+      agent/mibgroup/disman/expr/expValueTable.c,   
+      agent/mibgroup/host/hr_device.c, agent/mibgroup/host/hr_disk.c,   
+      agent/mibgroup/host/hr_filesys.c,   
+      agent/mibgroup/host/hr_network.c,   
+      agent/mibgroup/host/hr_partition.c,   
+      agent/mibgroup/host/hr_print.c, agent/mibgroup/host/hr_proc.c,   
+      agent/mibgroup/host/hr_storage.c,   
+      agent/mibgroup/host/hr_swinst.c, agent/mibgroup/host/hr_swrun.c,  
+       agent/mibgroup/host/hr_system.c,   
+      agent/mibgroup/mibII/vacm_conf.c, agent/mibgroup/smux/smux.c,   
+      agent/mibgroup/util_funcs.c, agent/mibgroup/utilities/execute.c,  
+       agent/snmp_agent.c, snmplib/container_binary_array.c,   
+      snmplib/container_null.c, snmplib/lcd_time.c, snmplib/md5.c,   
+      snmplib/mib.c, snmplib/parse.c, snmplib/snmpAAL5PVCDomain.c,   
+      snmplib/snmpTCPDomain.c, snmplib/snmpTCPIPv6Domain.c,   
+      snmplib/snmpUnixDomain.c, snmplib/snmp_alarm.c,   
+      snmplib/snmp_api.c, snmplib/snmp_client.c, snmplib/snmp_debug.c,  
+       snmplib/snmp_logging.c, snmplib/snmpusm.c, snmplib/tools.c:
+
+   CHANGES: snmpd, snmplib: Use NULL instead of 0 for NULL pointers.
+   Use casted 0's instead of 0 for NULL function pointers.
+
+2008-05-09 21:27  magfr
+
+   *  agent/helpers/old_api.c, agent/mibgroup/mibII/ipv6.c,   
+      agent/mibgroup/smux/smux.c, agent/snmp_agent.c,   
+      snmplib/default_store.c, snmplib/parse.c, snmplib/read_config.c,  
+       snmplib/snmp_version.c:
+
+   CHANGES: snmpd, snmplib: fixups for prototype [(void) replacing
+   ()].
+
+2008-05-09 21:23  magfr
+
+   * agent/mibgroup/udp-mib/data_access/udp_endpoint_common.c:
+
+   Remove dead code.
+
+2008-05-09 19:16  dts12
+
+   * dist/makerelease:
+
+   Missing MD5 signature file for zip release
+
+2008-05-09 19:15  dts12
+
+   * dist/makerelease:
+
+   Basic documentation and help/usage messages.
 
 2008-05-08 14:00  dts12
 
    * agent/mibgroup/if-mib/data_access/interface_linux.c:
-     Drop support for the interim SIOCDEVPRIVATE-based ioctl calls.
-     SIOCGMIIPHY/SIOCGMIIREG have been defined since at least Sept
-     2001 (kernel 2.4.10),
-     so the risk of calling an inappropriate private ioctl is probably
-     greater than
-     that of missing information from an ancient system.
+
+   Drop support for the interim SIOCDEVPRIVATE-based ioctl calls.
+   SIOCGMIIPHY/SIOCGMIIREG have been defined since at least Sept
+   2001 (kernel 2.4.10),
+   so the risk of calling an inappropriate private ioctl is probably
+   greater than
+   that of missing information from an ancient system.
 
 2008-05-08 09:02  dts12
 
    * snmplib/snmp_api.c:
-     Don't try to automatically create anonymous users.
-     (An invalid trapsess directive may crash the agent)
+
+   Don't try to automatically create anonymous users.
+   (An invalid trapsess directive may crash the agent)
+
+2008-05-06 08:38  jsafranek
+
+   * dist/net-snmp.spec:
+
+   - remove %{libcurrent}
+   - add openssl-devel to build requirements
+   - don't use Provides: unless necessary, let rpmbuild compute the
+   provided libraries
+   - don't specify PREFIX for perl
+
+2008-05-06 08:38  jsafranek
+
+   * agent/agent_read_config.c, agent/agent_trap.c:
+
+   reverting accidentaly commited files
+
+2008-05-06 08:34  jsafranek
+
+   * agent/agent_read_config.c, agent/agent_trap.c:
+
+   - remove %{libcurrent}
+   - add openssl-devel to build requirements
+   - don't use Provides: unless necessary, let rpmbuild compute the
+   provided libraries
+   - don't specify PREFIX for perl
+
+2008-05-05 21:43  dts12
+
+   * configure, configure.in:
+
+   Mechanism to select upcoming module re-writes and/or
+   recently-deprecated modules.
 
 2008-05-02 10:19  dts12
 
    * include/net-snmp/system/darwin9.h:
-     Handle udpTable indexing on both PPC and Intel hardware.
+
+   Handle udpTable indexing on both PPC and Intel hardware.
+
+2008-04-30 19:45  magfr
+
+   * snmplib/snmp_debug.c:
+
+   CHANGES: snmplib: Remove the support for generation of statistics
+   of how often a certain debug log level is triggered.
+
+2008-04-30 19:41  magfr
+
+   * snmplib/snmp_debug.c:
+
+   NEWS: snmplib: Remove the variable debug_num_excluded.
+   There is nothing that sets debug_num_excluded and there is no way
+   to for it
+   to affect the result of any function.
 
 2008-04-30 05:28  magfr
 
    * snmplib/snmp_debug.c:
-     Remove unncessary prototypes
+
+   Remove unncessary prototypes
+
+2008-04-23 16:39  hardaker
+
+   * dist/makerelease.xml:
+
+   actually use the branch path, don't just say you're going to
 
 2008-04-19 22:20  tanders
 
    * agent/mibgroup/disman/event/mteTriggerConf.c:
-     don't depend on OID resolution for disman linkUpDownNotifications
+
+   don't depend on OID resolution for disman linkUpDownNotifications
+
+2008-04-08 20:43  magfr
+
+   * include/net-snmp/agent/sysORTable.h:
+
+   Accept that people will try to compile this code with pre-ANSI
+   compilers and change it to handle that case.
 
 2008-04-08 20:38  hardaker
 
    * perl/agent/agent.pm:
-     CHANGES: perl: fixed an extra brace in the docs pointed out by
-     Jason Martin
+
+   CHANGES: perl: fixed an extra brace in the docs pointed out by
+   Jason Martin
+
+2008-04-08 20:34  hardaker
+
+   * dist/makerelease.xml:
+
+   update and restructure a bit to fix a few problems
+
+2008-04-07 20:06  magfr
+
+   * agent/helpers/null.c:
+
+   CHANGES: snmpd: As the null handler is perfectly capable of
+   handling GET_BULK requests it is now marked as such in the
+   registration.
 
 2008-04-07 14:00  dts12
 
    * snmplib/parse.c:
-     Another over-short DESCRIPTION buffer.
+
+   Another over-short DESCRIPTION buffer.
 
 2008-04-07 13:57  dts12
 
    * snmplib/parse.c:
-     Handle longer DESCRIPTION/REFERENCE strings in Capabilities
-     statements.
-     (Consistent processing with other MIB definition macros).
-     Fix provided by Aleksandr Lomanov.
+
+   Handle longer DESCRIPTION/REFERENCE strings in Capabilities
+   statements.
+   (Consistent processing with other MIB definition macros).
+   Fix provided by Aleksandr Lomanov.
+
+2008-04-02 19:35  hardaker
+
+   * FAQ:
+
+   mention libelf package rename
+
+2008-03-29 09:29  magfr
+
+   *  README.agent-mibs, agent/Makefile.in, agent/agent_sysORTable.c,   
+      agent/mibgroup/agentx/master.h,   
+      agent/mibgroup/agentx/master_admin.c,   
+      agent/mibgroup/agentx/subagent.c, agent/mibgroup/mibII/icmp.c,   
+      agent/mibgroup/mibII/interfaces.c, agent/mibgroup/mibII/ip.c,   
+      agent/mibgroup/mibII/ipAddr.c, agent/mibgroup/mibII/snmp_mib.c,   
+      agent/mibgroup/mibII/sysORTable.c,   
+      agent/mibgroup/mibII/sysORTable.h,   
+      agent/mibgroup/mibII/system_mib.c, agent/mibgroup/mibII/tcp.c,   
+      agent/mibgroup/mibII/tcpTable.c, agent/mibgroup/mibII/udp.c,   
+      agent/mibgroup/mibII/udpTable.c,   
+      agent/mibgroup/mibII/vacm_conf.c,   
+      agent/mibgroup/mibII/vacm_vars.c,   
+      agent/mibgroup/snmpv3/snmpEngine.c,   
+      agent/mibgroup/snmpv3/snmpMPDStats.c,   
+      agent/mibgroup/snmpv3/usmStats.c, agent/mibgroup/tunnel/tunnel.c, 
+        agent/snmp_vars.c, include/net-snmp/agent/agent_sysORTable.h,   
+      include/net-snmp/agent/sysORTable.h:
+
+   NEWS: snmpd: Enable automatic reregistering of sysORTable entries
+   from AgentX subagents. Add the sysORTable interface to the
+   include directory. Rewrite the sysORTable module to use the
+   table_container handler.
+
+2008-03-27 03:21  hardaker
+
+   * dist/makerelease, dist/net-snmp.spec, dist/patme:
+
+   uncommit 3 accidental multiple file commits
+
+2008-03-27 03:18  hardaker
+
+   *  dist/makerelease, dist/makerelease.xml, dist/net-snmp.spec,   
+      dist/patme:
+
+   various rewording, restructuring and proper file replacement
+   scheme
 
 2008-03-26 07:52  magfr
 
    * snmplib/read_config.c:
-     NEWS: snmplib: from "Aleksandr Lomanov": Corrected registering of
-     multiple premib config handlers so that all of them get
-     registered as premib handlers as opposed to the earlier behaviour
-     where they always got registered as normal config items.
+
+   NEWS: snmplib: from "Aleksandr Lomanov": Corrected registering of
+   multiple premib config handlers so that all of them get
+   registered as premib handlers as opposed to the earlier behaviour
+   where they always got registered as normal config items.
+
+2008-03-26 07:16  magfr
+
+   * agent/helpers/table_container.c:
+
+   CHANGES: snmpd: Get the table_container data from the right
+   handler when unregistering a table_container.
 
 2008-03-25 06:07  magfr
 
    * agent/agent_registry.c:
-     Remove spurious printf from unregister_mib_context
+
+   Remove spurious printf from unregister_mib_context
 
 2008-03-24 17:54  dts12
 
    * local/mib2c:
-     CHANGES: mib2c: BUG: 1874059,1737068: Handle MIB objects with
-     embedded hyphens
+
+   CHANGES: mib2c: BUG: 1874059,1737068: Handle MIB objects with
+   embedded hyphens
 
 2008-03-24 17:29  dts12
 
    * snmplib/asn1.c:
-     CHANGES: snmplib: BUG: 1866655: Handle parsing invalid OID
-     subidentifiers
+
+   CHANGES: snmplib: BUG: 1866655: Handle parsing invalid OID
+   subidentifiers
 
 2008-03-24 16:53  dts12
 
    * snmplib/asn1.c:
-     CHANGES: library: PATCH: 1921861: Avoid endless loop after
-     truncating 64bit int
+
+   CHANGES: library: PATCH: 1921861: Avoid endless loop after
+   truncating 64bit int
 
 2008-03-24 15:00  dts12
 
    * configure, configure.in:
-     CHANGES: build: BUG: 1823381: Valid MIB directory search path on
-     Windows
+
+   CHANGES: build: BUG: 1823381: Valid MIB directory search path on
+   Windows
+
+2008-03-22 08:42  magfr
+
+   * apps/snmptrapd.c:
+
+   Make it possible to build snmptrapd without embedded perl again.
 
 2008-03-21 17:55  hardaker
 
-   * agent/mibgroup/smux/smux.c, snmplib/snmpAAL5PVCDomain.c,
-     snmplib/snmpCallbackDomain.c, snmplib/snmpTCPDomain.c,
-     snmplib/snmpTCPIPv6Domain.c, snmplib/snmpUnixDomain.c,
-     snmplib/winpipe.c:
-     NEWS: libsnmp: PATCH: 1895927: from jhum8111: change obsolete
-     recv/send to recvfrom/sendto
+   *  agent/mibgroup/smux/smux.c, snmplib/snmpAAL5PVCDomain.c,   
+      snmplib/snmpCallbackDomain.c, snmplib/snmpTCPDomain.c,   
+      snmplib/snmpTCPIPv6Domain.c, snmplib/snmpUnixDomain.c,   
+      snmplib/winpipe.c:
+
+   NEWS: libsnmp: PATCH: 1895927: from jhum8111: change obsolete
+   recv/send to recvfrom/sendto
 
 2008-03-21 17:49  hardaker
 
    * python/netsnmp/client_intf.c:
-     CHANGES: python: PATCH: 1862177: from wafflesouffle: made code
-     more windows/cygwin compiler friendl
+
+   CHANGES: python: PATCH: 1862177: from wafflesouffle: made code
+   more windows/cygwin compiler friendl
 
 2008-03-21 17:45  hardaker
 
    * python/netsnmp/client.py:
-     CHANGES: python: PATCH: 1877840: fix MIB label and indexing due
-     to slightly broken regexp
+
+   CHANGES: python: PATCH: 1877840: fix MIB label and indexing due
+   to slightly broken regexp
 
 2008-03-21 17:39  hardaker
 
    * perl/agent/Support/Support.pm:
-     CHANGES: perl: PATCH: 1920390: from wilmesj: fix registration of
-     tables with .0 as IIDs
+
+   CHANGES: perl: PATCH: 1920390: from wilmesj: fix registration of
+   tables with .0 as IIDs
 
 2008-03-21 17:32  hardaker
 
    * perl/agent/Support/Support.pm:
-     CHANGES: perl: PATCH: 1914645: from wilmesj: better end of mib
-     support
+
+   CHANGES: perl: PATCH: 1914645: from wilmesj: better end of mib
+   support
 
 2008-03-21 17:28  hardaker
 
    * perl/agent/agent.xs:
-     CHANGES: perl: PATCH: 1914643: from wilmesj: fix issues with
-     embedded perl returning 0 being reclassified as a wrong data type
-     when an int works.
+
+   CHANGES: perl: PATCH: 1914643: from wilmesj: fix issues with
+   embedded perl returning 0 being reclassified as a wrong data type
+   when an int works.
 
 2008-03-21 17:22  hardaker
 
    * local/Makefile.in:
-     CHANGES: mib2c: PATCH 1914398: from wilmesj: install
-     mib2c.perl.conf
+
+   CHANGES: mib2c: PATCH 1914398: from wilmesj: install
+   mib2c.perl.conf
 
 2008-03-21 17:02  hardaker
 
    * perl/agent/Support/Support.pm:
-     CHANGES: perl: PATCH: 1914393: from wilmesj: registerAgent can
-     now be run multiple times
+
+   CHANGES: perl: PATCH: 1914393: from wilmesj: registerAgent can
+   now be run multiple times
 
 2008-03-21 16:35  hardaker
 
    * agent/helpers/table_iterator.c:
-     NEWS: snmpd: PATCH: 1909813: fix table_iterator hint to get_first
-     when SORTED flag is set
+
+   NEWS: snmpd: PATCH: 1909813: fix table_iterator hint to get_first
+   when SORTED flag is set
+
+2008-03-21 16:24  hardaker
+
+   * agent/snmp_perl.c, apps/snmptrapd.c:
+
+   NEWS: snmptrapd: PATCH: 1908288: from anedel: If snmptrapd -f
+   interrupted with ctrl-C run perl END block
+
+2008-03-21 16:16  hardaker
+
+   * agent/mibgroup/ip-mib/data_access/arp_linux.c:
+
+   CHANGES: PATCH: 1902113: from jsafranek: fix error log in
+   inetNetToMediatable
+
+2008-03-21 16:12  hardaker
+
+   *  agent/mibgroup/if-mib/data_access/interface_linux.c,   
+      agent/mibgroup/ip-mib/data_access/ipaddress_linux.c,   
+      agent/mibgroup/util_funcs.c:
+
+   CHANGES: PATCH: 1902105: from jsafranek: hide and improve debug
+   log messages created by patch 1705594
+
+2008-03-07 15:42  dts12
+
+   *  agent/mibgroup/host/hr_storage.h,   
+      agent/mibgroup/host/hrh_filesys.c,   
+      agent/mibgroup/host/hrh_filesys.h:
+
+   HAL-based implementation of the hrFSTable.
+
+2008-03-07 15:40  dts12
+
+   *  agent/mibgroup/hardware/fsys, agent/mibgroup/hardware/fsys.h,   
+      agent/mibgroup/hardware/fsys/fsys_getfsstats.c,   
+      agent/mibgroup/hardware/fsys/fsys_mntent.c,   
+      agent/mibgroup/hardware/fsys/hw_fsys.c,   
+      agent/mibgroup/hardware/fsys/hw_fsys.h,   
+      agent/mibgroup/hardware/fsys/mnttypes.h,   
+      agent/mibgroup/hardware/fsys/mounts.h:
+
+   Initial HAL implementation of FileSystem information
+
+2008-03-07 15:35  dts12
+
+   * configure, configure.in, include/net-snmp/net-snmp-config.h.in:
+
+   Check for getvfsstat()
+
+2008-03-07 15:34  dts12
+
+   * configure, configure.in:
+
+   CHANGES: build: BUG: 1823381: Use a sensible default MIBDIR path
+   on Cygwin/MinGW
+   (Should this be applied to other branches? If so, which?)
 
 2008-02-27 22:12  hardaker
 
    * agent/mibgroup/host/hr_swinst.c:
-     Fix C++ style comment
+
+   Fix C++ style comment
+
+2008-02-27 07:49  magfr
+
+   * agent/mibgroup/host/hr_disk.c:
+
+   The LVM disk patch introduced a memory leak. This removes the
+   leak.
+
+2008-02-26 23:27  hardaker
+
+   * dist/makerelease.xml:
+
+   make the script more hierarchial/structured
+
+2008-02-26 21:36  nba
+
+   * apps/snmptranslate.c:
+
+   CHANGES: Initalize log subsystem
+
+2008-02-26 21:34  nba
+
+   * snmplib/parse.c:
+
+   CHANGES: Fix for refs to OBJECT-GROUP in another MIB
+
+2008-02-26 21:23  nba
+
+   *  mibs/DISMAN-EVENT-MIB.txt, mibs/DISMAN-EXPRESSION-MIB.txt,   
+      mibs/IP-FORWARD-MIB.txt, mibs/IP-MIB.txt,   
+      mibs/IPV6-FLOW-LABEL-MIB.txt, mibs/NOTIFICATION-LOG-MIB.txt,   
+      mibs/SNMP-USM-AES-MIB.txt, mibs/SNMP-USM-DH-OBJECTS-MIB.txt,   
+      mibs/TRANSPORT-ADDRESS-MIB.txt, mibs/TUNNEL-MIB.txt:
+
+   Update to autoextracted mib files (blank line chanmges)
+
+2008-02-26 20:46  nba
+
+   * mibs/Makefile.mib, mibs/ianalist, mibs/rfclist:
+
+   Update for currently released RFC MIBS
+
+2008-02-26 20:45  nba
+
+   *  mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt,   
+      mibs/IANA-LANGUAGE-MIB.txt, mibs/IANA-RTPROTO-MIB.txt,   
+      mibs/IANAifType-MIB.txt:
+
+   Update IANA MIBS to current version
+
+2008-02-25 22:21  tanders
+
+   * agent/mibgroup/util_funcs.h:
+
+   add missing #include<pthread.h> for pthread_mutex_t
+
+2008-02-25 22:06  tanders
+
+   * agent/mibgroup/Rmon/alarmTable.c:
+
+   a better portability fix
+
+2008-02-23 00:59  hardaker
+
+   *  agent/mibgroup/if-mib/data_access/interface_linux.c,   
+      agent/mibgroup/ip-mib/data_access/ipaddress_common.c,   
+      agent/mibgroup/ip-mib/data_access/ipaddress_linux.c,   
+      agent/mibgroup/ip-mib/ipAddressPrefixTable/ipAddressPrefixTable.c,
+        
+      agent/mibgroup/ip-mib/ipAddressPrefixTable/ipAddressPrefixTable_constants.h,
+        
+      agent/mibgroup/ip-mib/ipAddressPrefixTable/ipAddressPrefixTable_data_access.c,
+         agent/mibgroup/util_funcs.c, agent/mibgroup/util_funcs.h,   
+      include/net-snmp/data_access/ipaddress.h:
+
+   NEWS: snmpd: PATCH: 1705594: from c_varun: Fix various aspects of
+   linux ipAddressPrefixTable reporting.
 
 2008-02-22 23:52  hardaker
 
    * agent/mibgroup/if-mib/data_access/interface.c:
-     CHANGES: snmpd: PATCH: 1896118: patch from jsafranek: fix ifTable
-     32bit counters on linux
+
+   CHANGES: snmpd: PATCH: 1896118: patch from jsafranek: fix ifTable
+   32bit counters on linux
+
+2008-02-22 23:49  hardaker
+
+   * agent/mibgroup/ip-mib/data_access/ipv6scopezone_linux.c:
+
+   patch from jsafranek: Create ipv6ScopeZoneEntry only for
+   link-local addresses and only once per interface.
 
 2008-02-22 23:44  hardaker
 
    * snmplib/parse.c:
-     CHANGES: libsnmp: PATCH: 1898204: from Mike Wescott: fix bug
-     1898198 in parse.c to avoid a segfault when parsing broken mibs.
+
+   CHANGES: libsnmp: PATCH: 1898204: from Mike Wescott: fix bug
+   1898198 in parse.c to avoid a segfault when parsing broken mibs.
 
 2008-02-18 12:11  dts12
 
    * man/mib_api.3.def:
-     Clarify the need to reset buffer length when calling 'read_objid'
-     repeatedly.
+
+   Clarify the need to reset buffer length when calling 'read_objid'
+   repeatedly.
+
+2008-02-18 10:32  tanders
+
+   * agent/mibgroup/Rmon/alarmTable.c:
+
+   portability fix
+
+2008-02-18 07:39  tanders
+
+   * agent/mibgroup/Rmon/alarmTable.c:
+
+   make sure that netsnmp_iquery_user_session et al. are properly
+   declared
 
 2008-02-17 18:01  tanders
 
    * agent/mibgroup/mibII/var_route.c:
-     fix typo in variable name
+
+   fix typo in variable name
 
 2008-02-17 08:38  tanders
 
    * agent/agent_registry.c:
-     portability fix
+
+   portability fix
+
+2008-02-15 17:45  hardaker
+
+   * agent/mibgroup/ip-mib/data_access/arp_linux.c:
+
+   lowered failure message to insert to debug; removed CVS ID from
+   top of line
+
+2008-02-15 17:39  hardaker
+
+   * agent/mibgroup/ip-mib/data_access/arp_linux.c:
+
+   don't insert empty entries
+
+2008-02-15 17:31  hardaker
+
+   * agent/mibgroup/ip-mib/data_access/arp_linux.c:
+
+   patch from jsafrane on irc: make ipv6 entries work on 64 bit
+   machines
+
+2008-02-15 16:24  hardaker
+
+   * dist/makerelease.xml:
+
+   pass 1 at a new makerelease script; currently just converted code
+   mostly
+
+2008-02-15 16:22  hardaker
+
+   * agent/mibgroup/host/hr_disk.c:
+
+   remove linux checks
+
+2008-02-15 15:45  hardaker
+
+   * agent/mibgroup/ip-mib/data_access/arp_linux.c:
+
+   remove references to RDA_RTA
+
+2008-02-15 15:37  hardaker
+
+   * agent/mibgroup/ip-mib/data_access/arp_linux.c:
+
+   don't compile in the ipv6 code if NDA_RTA isn't defined
 
 2008-02-15 13:00  tanders
 
    * agent/mibgroup/host/hr_swinst.c:
-     portability fix
+
+   portability fix
+
+2008-02-15 06:19  hardaker
+
+   * agent/mibgroup/ip-mib/data_access/arp_linux.c:
+
+   minor bug update from c_varun
+
+2008-02-15 05:13  hardaker
+
+   *  agent/mibgroup/ip-mib/data_access/arp_linux.c,   
+      agent/mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable_data_access.c,
+         configure, configure.in:
+
+   NEWS: snmpd: PATCH: 1704105: from c_varun: Add IPv6 support to
+   the inetNetToMediaTable for linux
+
+2008-02-15 05:12  hardaker
+
+   * agent/mibgroup/ip-mib.h:
+
+   require new ipv6ScopeZoneIndexTable table
+
+2008-02-15 05:00  hardaker
+
+   *  agent/mibgroup/ip-mib/data_access/ipv6scopezone.h,   
+      agent/mibgroup/ip-mib/data_access/ipv6scopezone_common.c,   
+      agent/mibgroup/ip-mib/data_access/ipv6scopezone_linux.c,   
+      agent/mibgroup/ip-mib/ipv6ScopeZoneIndexTable,   
+      agent/mibgroup/ip-mib/ipv6ScopeZoneIndexTable.h,   
+      agent/mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable.c,
+        
+      agent/mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable.h,
+        
+      agent/mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable_data_access.c,
+        
+      agent/mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable_data_access.h,
+        
+      agent/mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable_enums.h,
+        
+      agent/mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable_interface.c,
+        
+      agent/mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable_interface.h,
+        
+      agent/mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable_oids.h,
+         include/net-snmp/data_access/scopezone.h:
+
+   NEWS: snmpd: PATCH: 1715405: from c_varun: Implement the
+   ipv6ScopeZoneIndexTable on linux
 
 2008-02-15 04:39  hardaker
 
    * agent/snmpd.c:
-     CHANGES: snmpd: PATCH: 1716548: from myamato: Fix help output so
-     no space is printed between -D and arguments.
+
+   CHANGES: snmpd: PATCH: 1716548: from myamato: Fix help output so
+   no space is printed between -D and arguments.
+
+2008-02-15 04:27  hardaker
+
+   *  agent/mibgroup/Rmon.h, agent/mibgroup/Rmon/alarmTable.c,   
+      agent/mibgroup/Rmon/alarmTable.h:
+
+   NEWS: snmpd: PATCH: 1723611: from Emi Yanagi: New implementation
+   of the rmon alarmTable
 
 2008-02-15 03:44  hardaker
 
    * agent/agent_registry.c:
-     NEWS: snmpd: PATCH: 1893468: from gkoenig: fixed registration of
-     OIDs with ranges
+
+   NEWS: snmpd: PATCH: 1893468: from gkoenig: fixed registration of
+   OIDs with ranges
 
 2008-02-14 21:40  tanders
 
    * agent/mibgroup/mibII/var_route.c:
-     fix typo in variable declaration (unbreaks the build on a few
-     systems)
+
+   fix typo in variable declaration (unbreaks the build on a few
+   systems)
 
 2008-02-14 00:29  hardaker
 
    * COPYING:
-     year update for sparta
+
+   year update for sparta
 
 2008-02-13 23:37  magfr
 
    * include/net-snmp/library/container.h, snmplib/container.c:
-     NEWS: snmplib: Change CONTAINER_INSERT to not do partial inserts
-     in containers with multiple indices when one insert fails.
+
+   NEWS: snmplib: Change CONTAINER_INSERT to not do partial inserts
+   in containers with multiple indices when one insert fails.
 
 2008-02-13 23:11  hardaker
 
    * snmplib/snmpusm.c:
-     Fixed the createUser line to specify the -e flag (responding to a
-     complaint about it be missing)
+
+   Fixed the createUser line to specify the -e flag (responding to a
+   complaint about it be missing)
+
+2008-02-13 17:42  hardaker
+
+   * agent/mibgroup/ucd-snmp/diskio.c:
+
+   NEWS: snmpd: PATCH: 1779558: from brumbs: Implement the
+   diskIOLA1,5,10 objections in the diskio-mib under linux
 
 2008-02-13 17:15  hardaker
 
    * agent/mibgroup/host/hr_swinst.c:
-     CHANGES: snmpd: PATCH: 1783733: Put the package version number
-     into the hrSWInst table for solaris.
+
+   CHANGES: snmpd: PATCH: 1783733: Put the package version number
+   into the hrSWInst table for solaris.
+
+2008-02-13 16:58  hardaker
+
+   * agent/mibgroup/if-mib/data_access/interface_linux.c:
+
+   CHANGES: snmpd: PATCH: 1783423: from jsafranek: return a correct
+   ipv6InterfaceIdentifier of loopback on linux
 
 2008-02-13 16:12  hardaker
 
-   * agent/mibgroup/mibII/at.c, agent/mibgroup/mibII/ipAddr.c,
-     agent/mibgroup/mibII/udpTable.c,
-     agent/mibgroup/mibII/var_route.c:
-     CHANGES: snmpd: PATCH: 1784747: from jsafranek: Fix long usage
-     for ip adresses on 64 bit systems in various MIB-II tables.
+   *  agent/mibgroup/mibII/at.c, agent/mibgroup/mibII/ipAddr.c,   
+      agent/mibgroup/mibII/udpTable.c,   
+      agent/mibgroup/mibII/var_route.c:
+
+   CHANGES: snmpd: PATCH: 1784747: from jsafranek: Fix long usage
+   for ip adresses on 64 bit systems in various MIB-II tables.
+
+2008-02-13 16:07  hardaker
+
+   *  agent/agent_trap.c, agent/mibgroup/agentx/master_admin.c,   
+      agent/mibgroup/agentx/protocol.c,   
+      include/net-snmp/agent/agent_trap.h:
+
+   NEWS: snmpd: PATCH: 1806501: from jmagder: Add a snmp_v3trap
+   function for sending traps with a snmpv3 context
 
 2008-02-13 16:02  hardaker
 
-   * agent/mibgroup/ip-mib/data_access/ipaddress_linux.c,
-     include/net-snmp/library/tools.h:
-     CHANGES: snmpd: PATCH: 1826102: from jsafranek: support longer
-     interface names on linux
+   *  agent/mibgroup/ip-mib/data_access/ipaddress_linux.c,   
+      include/net-snmp/library/tools.h:
 
-2008-02-13 09:22  tanders
-
-   * configure:
-     revert to autoconf 2.59 per existing policy
+   CHANGES: snmpd: PATCH: 1826102: from jsafranek: support longer
+   interface names on linux
 
 2008-02-12 23:23  hardaker
 
    * snmplib/mib.c:
-     CHANGES: libsnmp: PATCH: 1807489: fix ignoring of display hints.
+
+   CHANGES: libsnmp: PATCH: 1807489: fix ignoring of display hints.
+
+2008-02-12 23:19  hardaker
+
+   * agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c:
+
+   
+
+2008-02-12 23:16  hardaker
+
+   * agent/mibgroup/mibII/icmp.c:
+
+   CHANGES: snmpd: patch 1823465 from jsafranek: fix icmp cache
+   registration
+
+2008-02-12 22:16  hardaker
+
+   *  README.agent-mibs,   
+      agent/mibgroup/ip-mib/data_access/scalars_linux.c,   
+      agent/mibgroup/ip-mib/ip_scalars.c:
+
+   NEWS: snmpd: PATCH: 1828602: from tgohad: Support ipDefaultTTL
+   and ipForwarding SETs on linux
 
 2008-02-12 22:09  hardaker
 
    * agent/mibgroup/ucd-snmp/diskio.c:
-     CHANGES: snmpd: PATCH: 1866823: from jsafranek: truncate 32 bit
-     counter values on 64 bit machines to avoid bogus warnings.
+
+   CHANGES: snmpd: PATCH: 1866823: from jsafranek: truncate 32 bit
+   counter values on 64 bit machines to avoid bogus warnings.
 
 2008-02-12 19:05  hardaker
 
-   * agent/mibgroup/if-mib/data_access/interface.c,
-     agent/mibgroup/if-mib/ifTable/ifTable_data_access.c:
-     CHANGES: snmpd: PATCH: 1849903: from jsafranek: do not spam log
-     with asserts when XEN is used
+   *  agent/mibgroup/if-mib/data_access/interface.c,   
+      agent/mibgroup/if-mib/ifTable/ifTable_data_access.c:
+
+   CHANGES: snmpd: PATCH: 1849903: from jsafranek: do not spam log
+   with asserts when XEN is used
 
 2008-02-12 18:50  hardaker
 
    * snmplib/callback.c:
-     CHANGES: libsnmp: PATCH: 1875022: from sem_prg: improve callback
-     locking mechanisms
+
+   CHANGES: libsnmp: PATCH: 1875022: from sem_prg: improve callback
+   locking mechanisms
 
 2008-02-12 17:40  hardaker
 
    * agent/mibgroup/ucd-snmp/memory_freebsd2.c:
-     CHANGES: snmpd: PATCH: 1879261: from amesbury: Add in inactive
-     memory to the cached report for freebsd
 
-2008-02-12 15:22  hardaker
+   CHANGES: snmpd: PATCH: 1879261: from amesbury: Add in inactive
+   memory to the cached report for freebsd
+
+2008-02-12 15:32  hardaker
+
+   * include/net-snmp/library/snmpv3.h, snmplib/snmpv3.c:
+
+   NEWS: libsnmp: Patch: 1882069: from nschrenk: Add a exactEngineID
+   token for specifying an exact SNMPv3 engineID to use
+
+2008-02-12 15:18  hardaker
 
    * agent/mibgroup/host/hr_disk.c:
-     Change snprintf print lengths to len-1 to leave 0 in final
-     position for printing
+
+   minor cleanups from reviewing parts of the code
+
+2008-02-12 15:17  hardaker
+
+   * agent/mibgroup/host/hr_disk.c:
+
+   NEWS: snmpd: PATCH: 1882621: from jsafranek: Add LVM support to
+   the partition table
 
 2008-02-11 22:26  hardaker
 
    * configure, configure.in:
-     fix quoted strings in help output
+
+   fix quoted strings in help output
 
 2008-01-30 17:29  hardaker
 
    * configure, configure.in:
-     added vacm_conf to existing configure files (for trapd too)
+
+   added vacm_conf to existing configure files (for trapd too)
 
 2008-01-20 07:55  tanders
 
    * configure, configure.in:
-     CHANGES: build: BUG: 1872266: PERLCC check fails for CC with
-     options
+
+   CHANGES: build: BUG: 1872266: PERLCC check fails for CC with
+   options
 
 2008-01-17 01:13  hardaker
 
    * agent/mibgroup/default_modules.h:
-     fix default mibs to include vacm_conf too
+
+   fix default mibs to include vacm_conf too
 
 2008-01-17 00:09  magfr
 
    * agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c:
-     CHANGES: snmpd: PATCH: 1826088: from Jan Safranek: Use the right
-     interface t read the netmask
+
+   CHANGES: snmpd: PATCH: 1826088: from Jan Safranek: Use the right
+   interface t read the netmask
 
 2008-01-16 21:54  magfr
 
    * agent/mibgroup/ucd-snmp/disk.c:
-     CHANGES: Handle device names with embedded spaces in
-     UCD-SNMP-MIB::dskDevice
+
+   CHANGES: Handle device names with embedded spaces in
+   UCD-SNMP-MIB::dskDevice
 
 2008-01-16 00:47  magfr
 
    * agent/mibgroup/ucd-snmp/disk.c:
-     CHANGES: snmpd: PATCH: 1828839: from jsafranek to provide better
-     handling of disks mounted on paths with embedded spaces
+
+   CHANGES: snmpd: PATCH: 1828839: from jsafranek to provide better
+   handling of disks mounted on paths with embedded spaces
 
 2008-01-15 16:47  hardaker
 
    * snmplib/default_store.c:
-     coverity bug 205: double check pointer that should never be null
+
+   coverity bug 205: double check pointer that should never be null
+
+2008-01-14 23:55  magfr
+
+   *  README.agent-mibs, agent/mibgroup/mibII/snmp_mib.c,   
+      agent/mibgroup/mibII/snmp_mib.h,   
+      agent/mibgroup/mibII/system_mib.c,   
+      agent/mibgroup/mibII/system_mib.h,   
+      agent/mibgroup/mibII/updates.c, agent/mibgroup/mibII/updates.h:
+
+   Update the snmp and system mibs to be handler based
+
+2008-01-13 00:00  magfr
+
+   *  Makefile.in, configure, configure.in, dist/RELEASE-INSTRUCTIONS,  
+       doxygen.conf, local/Version-Munge.pl, sedscript.in,   
+      snmplib/snmp_version.c:
+
+   Lessen the number of places that need to be changed in order to
+   do a release.
+   Change to use the configure version number as the package version
+   number.
 
 2008-01-09 21:58  magfr
 
    * snmplib/container_binary_array.c:
-     Delete unused static functions
+
+   Delete unused static functions
 
 2008-01-06 13:01  magfr
 
    * snmplib/snmp_client.c:
-     Make error_string private and readonly
+
+   Make error_string private and readonly
 
 2007-12-22 19:22  dts12
 
    * perl/SNMP/SNMP.xs:
-     CHANGES: perl: BUG: 1826174: Check for buffer overflow when
-     printing values.
+
+   CHANGES: perl: BUG: 1826174: Check for buffer overflow when
+   printing values.
 
 2007-12-21 23:19  dts12
 
    * perl/SNMP/SNMP.pm:
-     CHANGES: perl: BUG: 1747733: More robust handling of undefined
-     values.
-     Patch supplied by Matti Linnanvuori
+
+   CHANGES: perl: BUG: 1747733: More robust handling of undefined
+   values.
+   Patch supplied by Matti Linnanvuori
 
 2007-12-21 21:33  dts12
 
    * agent/mibgroup/host/hr_filesys.c, agent/mibgroup/ucd-snmp/disk.c:
-     CHANGES: snmpd: BUG: 1748206: Protect against failures to open
-     /etc/mtab (or equiv)
+
+   CHANGES: snmpd: BUG: 1748206: Protect against failures to open
+   /etc/mtab (or equiv)
 
 2007-12-21 18:42  dts12
 
    * net-snmp-config.in:
-     Bring order of agent library linking into line with agent
-     Makefile.
-     Problem reported by Steve McCarthy.
-     Qn: Should 5.2.x and 5.3.x also use the same order?
-     (for both agent Makefile and net-snmp-config)
+
+   Bring order of agent library linking into line with agent
+   Makefile.
+   Problem reported by Steve McCarthy.
+   Qn: Should 5.2.x and 5.3.x also use the same order?
+   (for both agent Makefile and net-snmp-config)
 
 2007-12-21 13:11  dts12
 
    * apps/snmptrapd_log.c:
-     CHANGES: build: BUG: 1802833: Ensure snmptrapd builds with
-     --disable-snmpv1/2c
+
+   CHANGES: build: BUG: 1802833: Ensure snmptrapd builds with
+   --disable-snmpv1/2c
 
 2007-12-20 16:26  dts12
 
    * perl/SNMP/SNMP.xs:
-     CHANGES: perl: BUG: 1834539: Consistent handling of OID parsing.
-     Applies patch #1834983, provided by Dmitry Karasik
+
+   CHANGES: perl: BUG: 1834539: Consistent handling of OID parsing.
+   Applies patch #1834983, provided by Dmitry Karasik
+
+2007-12-20 16:05  dts12
+
+   * snmplib/snmp_client.c:
+
+   More internal query debugging output.
 
 2007-12-20 14:20  dts12
 
    * agent/helpers/watcher.c:
-     CHANGES: snmpd: BUG: 1822360: Fix spinlock helper error handling.
+
+   CHANGES: snmpd: BUG: 1822360: Fix spinlock helper error handling.
 
 2007-12-20 14:18  dts12
 
    * snmplib/asn1.c:
-     CHANGES: snmplib: BUG: 1795840: Signed 32-bit truncation logged
-     as debug message rather then error.
+
+   CHANGES: snmplib: BUG: 1795840: Signed 32-bit truncation logged
+   as debug message rather then error.
 
 2007-12-20 14:14  dts12
 
    * agent/mibgroup/host/hr_filesys.c:
-     CHANGES: snmpd: BUG: 1792890: include CIFS mounts when skipping
-     remote filesystems
+
+   CHANGES: snmpd: BUG: 1792890: include CIFS mounts when skipping
+   remote filesystems
 
 2007-12-20 14:12  dts12
 
    * agent/mibgroup/if-mib/ifTable/ifTable_data_access.c:
-     CHANGES: snmpd: BUG: 1771221: Retain ifLastChange information on
-     data reload.
+
+   CHANGES: snmpd: BUG: 1771221: Retain ifLastChange information on
+   data reload.
 
 2007-12-20 14:08  dts12
 
    * agent/mibgroup/notification-log-mib/notification_log.c:
-     CHANGES: snmpd: BUG: 1758212: Handling missing variable types
-     (IpAddress,Counter,Opaque)
+
+   CHANGES: snmpd: BUG: 1758212: Handling missing variable types
+   (IpAddress,Counter,Opaque)
 
 2007-12-19 22:39  magfr
 
-   * snmplib/container.c, snmplib/container_iterator.c,
-     snmplib/container_null.c, snmplib/data_list.c,
-     snmplib/read_config.c:
-     Correct doxygen warnings
+   *  snmplib/container.c, snmplib/container_iterator.c,   
+      snmplib/container_null.c, snmplib/data_list.c,   
+      snmplib/read_config.c:
+
+   Correct doxygen warnings
 
 2007-12-19 22:31  magfr
 
-   * testing/tests/Sv3vacmconfig, testing/tests/T001snmpv1get,
-     testing/tests/T014snmpv2cget, testing/tests/T015snmpv2cgetnext,
-     testing/tests/T0160snmpv2cbulkget,
-     testing/tests/T016snmpv2cgetfail,
-     testing/tests/T017snmpv2ctov1getfail,
-     testing/tests/T018snmpv1tov2cgetfail,
-     testing/tests/T019snmpv2cnosuch, testing/tests/T022snmpv3getMD5,
-     testing/tests/T023snmpv3getMD5AES,
-     testing/tests/T023snmpv3getMD5DES,
-     testing/tests/T025snmpv3getSHADES,
-     testing/tests/T030snmpv3usercreation,
-     testing/tests/T051snmpv2ctrap, testing/tests/T052snmpv2cinform,
-     testing/tests/T058agentauthtrap,
-     testing/tests/T059trapdtraphandle, testing/tests/T060trapdperl,
-     testing/tests/T061agentperl, testing/tests/T065agentextend,
-     testing/tests/T100agenthup, testing/tests/T115agentxperl,
-     testing/tests/T120proxyget, testing/tests/T121proxyset,
-     testing/tests/T122proxysetfail, testing/tests/T130snmpv1vacmget,
-     testing/tests/T131snmpv2cvacmget,
-     testing/tests/T140snmpv1vacmgetfail,
-     testing/tests/T141snmpv2cvacmgetfail,
-     testing/tests/T150solarishostcpu,
-     testing/tests/T151solarishostdisk, testing/tests/T152hostuptime,
-     testing/tests/T153solarisswap, testing/tests/T160snmpnetstat,
-     testing/tests/T200snmpv2cwalkall:
-     Use NETSNMP_-prefixed symbols when deciding what tests to run as
-     the compat symbols aren't defined.
+   *  testing/tests/Sv3vacmconfig, testing/tests/T001snmpv1get,   
+      testing/tests/T014snmpv2cget, testing/tests/T015snmpv2cgetnext,   
+      testing/tests/T0160snmpv2cbulkget,   
+      testing/tests/T016snmpv2cgetfail,   
+      testing/tests/T017snmpv2ctov1getfail,   
+      testing/tests/T018snmpv1tov2cgetfail,   
+      testing/tests/T019snmpv2cnosuch, testing/tests/T022snmpv3getMD5,  
+       testing/tests/T023snmpv3getMD5AES,   
+      testing/tests/T023snmpv3getMD5DES,   
+      testing/tests/T025snmpv3getSHADES,   
+      testing/tests/T030snmpv3usercreation,   
+      testing/tests/T051snmpv2ctrap, testing/tests/T052snmpv2cinform,   
+      testing/tests/T058agentauthtrap,   
+      testing/tests/T059trapdtraphandle, testing/tests/T060trapdperl,   
+      testing/tests/T061agentperl, testing/tests/T065agentextend,   
+      testing/tests/T100agenthup, testing/tests/T115agentxperl,   
+      testing/tests/T120proxyget, testing/tests/T121proxyset,   
+      testing/tests/T122proxysetfail, testing/tests/T130snmpv1vacmget,  
+       testing/tests/T131snmpv2cvacmget,   
+      testing/tests/T140snmpv1vacmgetfail,   
+      testing/tests/T141snmpv2cvacmgetfail,   
+      testing/tests/T150solarishostcpu,   
+      testing/tests/T151solarishostdisk, testing/tests/T152hostuptime,  
+       testing/tests/T153solarisswap, testing/tests/T160snmpnetstat,   
+      testing/tests/T200snmpv2cwalkall:
+
+   Use NETSNMP_-prefixed symbols when deciding what tests to run as
+   the compat symbols aren't defined.
 
 2007-12-19 22:06  magfr
 
    * snmplib/snmp_api.c:
-     BUG 1831568: strdup might fail and return NULL - take care of it
-     in this case at least.
+
+   BUG 1831568: strdup might fail and return NULL - take care of it
+   in this case at least.
 
 2007-12-19 21:49  magfr
 
    * agent/mibgroup/utilities/override.c, snmplib/snmp_api.c:
-     BUG 1824883: Remove memory leak
+
+   BUG 1824883: Remove memory leak
 
 2007-12-19 20:46  magfr
 
    * agent/helpers/watcher.c:
-     CHANGES: BUG: 1851047: Do not try to do more handling of a value
-     once it is found to be corrupt by the watcher helper, thus
-     avoiding code that counts on getting the right type. This bug was
-     found by Charlie Miller, Independent Security Evaluators.
+
+   CHANGES: BUG: 1851047: Do not try to do more handling of a value
+   once it is found to be corrupt by the watcher helper, thus
+   avoiding code that counts on getting the right type. This bug was
+   found by Charlie Miller, Independent Security Evaluators.
 
 2007-11-27 09:56  dts12
 
    * man/snmptrapd.8.def:
-     Clarify use of the -A (log append) option.
+
+   Clarify use of the -A (log append) option.
 
 2007-11-22 15:42  rstory
 
    * agent/mibgroup/agent/nsCache.c, agent/mibgroup/agent/nsDebug.c:
-     check request, not requests. reported by ulim on irc
 
-2007-11-22 15:16  rstory
+   check request, not requests. reported by ulim on irc
+
+2007-11-22 15:17  rstory
 
    * agent/mibgroup/agent/nsLogging.c:
-     check request, not requests. reported by ulim on irc
+
+   check request, not requests. reported by ulim on irc
 
 2007-11-19 21:34  tanders
 
    * agent/mibgroup/kernel_sunos5.c:
-     CHANGES: Solaris: PATCH: 1834699: from apersson: Fix 1833294:
-     DLPI problems on Solaris 2.6
+
+   CHANGES: Solaris: PATCH: 1834699: from apersson: Fix 1833294:
+   DLPI problems on Solaris 2.6
+
+2007-11-17 16:26  magfr
+
+   *  agent/helpers/instance.c, configure, configure.in,   
+      include/net-snmp/agent/instance.h,   
+      include/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: snmpd: Use the worker helpers from the
+   register_*_instance helpers and schedule the instance helpers for
+   removal in 5.6
+
+2007-11-14 12:21  dts12
+
+   *  agent/mibgroup/hardware/sensors/lmsensors_v3.c,   
+      agent/mibgroup/hardware/sensors/lmsensors_v3.h:
+
+   Support v3 lmsensors API.
+
+2007-11-14 12:19  dts12
+
+   * agent/mibgroup/hardware/sensors/hw_sensors.c:
+
+   Fix misleading debug output message.
+
+2007-11-13 13:59  dts12
+
+   *  agent/mibgroup/hardware/sensors,   
+      agent/mibgroup/hardware/sensors.h,   
+      agent/mibgroup/hardware/sensors/dummy_sensors.c,   
+      agent/mibgroup/hardware/sensors/dummy_sensors.h,   
+      agent/mibgroup/hardware/sensors/hw_sensors.c,   
+      agent/mibgroup/hardware/sensors/hw_sensors.h,   
+      agent/mibgroup/hardware/sensors/kstat_sensors.c,   
+      agent/mibgroup/hardware/sensors/kstat_sensors.h,   
+      agent/mibgroup/hardware/sensors/lmsensors_v2.c,   
+      agent/mibgroup/hardware/sensors/lmsensors_v2.h,   
+      agent/mibgroup/hardware/sensors/picld_sensors.c,   
+      agent/mibgroup/hardware/sensors/picld_sensors.h,   
+      agent/mibgroup/ucd-snmp/lmsensorsMib.c,   
+      agent/mibgroup/ucd-snmp/lmsensorsMib.h, configure, configure.in,  
+       include/net-snmp/agent/hardware/sensors.h:
+
+   Preliminary re-working of the LM-SENSORS-MIB, to separate out
+   the sensor hardware processing from the MIB tables themselves.
 
 2007-11-08 23:17  tanders
 
-   * agent/mibgroup/if-mib/data_access/interface_solaris2.c,
-     agent/mibgroup/kernel_sunos5.c, agent/mibgroup/kernel_sunos5.h,
-     agent/mibgroup/mibII/interfaces.c:
-     CHANGES: Solaris: PATCH: 1824196: {ifOperStatus,ipAdEntIfIndex}
-     reported incorrectly
-     Patch supplied by Anders Persson. Fixes Bugs 1822275 and 1819189.
+   *  agent/mibgroup/if-mib/data_access/interface_solaris2.c,   
+      agent/mibgroup/kernel_sunos5.c, agent/mibgroup/kernel_sunos5.h,   
+      agent/mibgroup/mibII/interfaces.c:
+
+   CHANGES: Solaris: PATCH: 1824196: {ifOperStatus,ipAdEntIfIndex}
+   reported incorrectly
+   Patch supplied by Anders Persson. Fixes Bugs 1822275 and 1819189.
+
+2007-10-26 21:22  magfr
+
+   *  agent/helpers/watcher.c, agent/mibgroup/examples/watched.c,   
+      include/net-snmp/agent/watcher.h:
+
+   NEWS: snmpd: Added support for a user provided length variable
+   and C string values to the watcher helper.
+
+2007-10-16 22:39  magfr
+
+   *  agent/agent_trap.c, agent/helpers/debug_handler.c,   
+      agent/helpers/table_iterator.c, agent/helpers/table_tdata.c,   
+      agent/mibgroup/agentx/subagent.c,   
+      agent/mibgroup/disman/event/mteEvent.c,   
+      agent/mibgroup/disman/event/mteEventNotificationTable.c,   
+      agent/mibgroup/disman/event/mteEventSetTable.c,   
+      agent/mibgroup/disman/event/mteEventTable.c,   
+      agent/mibgroup/disman/event/mteTrigger.c,   
+      agent/mibgroup/disman/expr/expErrorTable.c,   
+      agent/mibgroup/disman/expr/expExpression.c,   
+      agent/mibgroup/disman/expr/expExpressionTable.c,   
+      agent/mibgroup/disman/expr/expObject.c,   
+      agent/mibgroup/disman/expr/expObjectTable.c,   
+      agent/mibgroup/disman/expr/expValueTable.c,   
+      agent/mibgroup/disman/schedule/schedCore.c,   
+      agent/mibgroup/host/hr_storage.c,   
+      agent/mibgroup/if-mib/data_access/interface_linux.c,   
+      agent/mibgroup/ip-forward-mib/data_access/route_linux.c,   
+      agent/mibgroup/ip-mib/data_access/systemstats_linux.c,   
+      agent/mibgroup/notification/snmpNotifyTable.c,   
+      agent/mibgroup/tcp-mib/data_access/tcpConn_linux.c,   
+      apps/snmptrapd_handlers.c, snmplib/default_store.c,   
+      snmplib/snmpSTDDomain.c, snmplib/snmpUDPDomain.c,   
+      snmplib/snmp_client.c:
+
+   Use %p to print pointers. Do not use %p to print numbers.
+
+2007-10-16 07:31  magfr
+
+   * snmplib/snmp_api.c:
+
+   Make the library buildable as C again.
 
 2007-10-16 07:17  magfr
 
-   * agent/helpers/instance.c, agent/helpers/scalar.c,
-     agent/helpers/watcher.c, agent/mibgroup/examples/example.c,
-     agent/mibgroup/smux/smux.c:
-     CHANGES: misc: avoid calling debug macros with too many
-     arguments.
+   *  agent/helpers/instance.c, agent/helpers/scalar.c,   
+      agent/helpers/watcher.c, agent/mibgroup/examples/example.c,   
+      agent/mibgroup/smux/smux.c:
+
+   CHANGES: misc: avoid calling debug macros with too many
+   arguments.
 
 2007-10-16 06:18  magfr
 
-   * snmplib/snmp_service.c, snmplib/snmp_transport.c:
-     Make the library buildable as C++ again.
+   *  snmplib/snmp_api.c, snmplib/snmp_service.c,   
+      snmplib/snmp_transport.c:
+
+   Make the library buildable as C++ again.
+
+2007-10-15 20:52  rstory
+
+   *  include/net-snmp/library/container_binary_array.h,   
+      snmplib/dir_utils.c:
+
+   declare netsnmp_binary_array_options_set; include header for it
+   as needed
 
 2007-10-15 20:39  magfr
 
    * agent/mibgroup/disman/expr/expValueTable.c:
-     Convert an infinite loop to a finite one.
-     Remove an unused variable.
+
+   Convert an infinite loop to a finite one.
+   Remove an unused variable.
 
 2007-10-14 22:10  magfr
 
-   * agent/mibgroup/ip-mib/data_access/ipaddress_common.c,
-     agent/mibgroup/ip-mib/data_access/scalars_linux.c,
-     agent/mibgroup/smux/smux.c,
-     agent/mibgroup/tcp-mib/data_access/tcpConn_common.c:
-     CHANGES: misc: Avoid calling debug macros with too few arguments.
+   *  agent/mibgroup/ip-mib/data_access/ipaddress_common.c,   
+      agent/mibgroup/ip-mib/data_access/scalars_linux.c,   
+      agent/mibgroup/smux/smux.c,   
+      agent/mibgroup/tcp-mib/data_access/tcpConn_common.c:
+
+   CHANGES: misc: Avoid calling debug macros with too few arguments.
 
 2007-10-14 20:51  tanders
 
    * snmplib/read_config.c:
-     CHANGES: snmplib: PATCH: 1811469: read_config_files_in_path()
-     reads past malloc'd buffer
+
+   CHANGES: snmplib: PATCH: 1811469: read_config_files_in_path()
+   reads past malloc'd buffer
 
 2007-10-14 20:41  tanders
 
    * perl/SNMP/SNMP.xs:
-     CHANGES: perl: PATCH: 1811463: perl async callback coredump
-     CHANGES: perl: BUG: 1606062: perl bulkwalk (async) coredump
+
+   CHANGES: perl: PATCH: 1811463: perl async callback coredump
+   CHANGES: perl: BUG: 1606062: perl bulkwalk (async) coredump
 
 2007-10-14 19:07  tanders
 
    * snmplib/snmp_logging.c:
-     CHANGES: snmplib: PATCH: 1806336: fix -LS option parsing
+
+   CHANGES: snmplib: PATCH: 1806336: fix -LS option parsing
 
 2007-10-14 12:12  tanders
 
    * agent/mibgroup/mibII/tcpTable.c:
-     fix comment
+
+   fix comment
 
 2007-10-13 23:28  tanders
 
    * testing/tests/T160snmpnetstat:
-     CHANGES: test: enhance snmpnetstat test to check tcpTable in TCP
-     mode
+
+   CHANGES: test: enhance snmpnetstat test to check tcpTable in TCP
+   mode
 
 2007-10-13 22:28  tanders
 
-   * agent/mibgroup/mibII/tcpTable.c,
-     include/net-snmp/system/solaris.h:
-     CHANGES: Solaris: BUG: 1810814: tcpTable missing entries and
-     wrong ports
+   *  agent/mibgroup/mibII/tcpTable.c,   
+      include/net-snmp/system/solaris.h:
+
+   CHANGES: Solaris: BUG: 1810814: tcpTable missing entries and
+   wrong ports
 
 2007-10-12 21:46  tanders
 
    * include/net-snmp/system/solaris.h:
-     CHANGES: Solaris: #define NEW_MIB_COMPLIANT to support Solaris
-     10U4+
+
+   CHANGES: Solaris: #define NEW_MIB_COMPLIANT to support Solaris
+   10U4+
 
 2007-10-11 20:46  magfr
 
    * snmplib/snmpUDPDomain.c:
-     CHANGES: snmplib: Do not leak memory whenever an udp address is
-     formatted.
+
+   CHANGES: snmplib: Do not leak memory whenever an udp address is
+   formatted.
+
+2007-10-03 01:02  alex_b
+
+   *  win32/dist/README.build.win32.txt, win32/dist/README.txt,   
+      win32/dist/installer/Add2Path.nsi,   
+      win32/dist/installer/net-snmp.nsi:
+
+   -Fix for bug 1768797. NSIS Installer script now warns the user if
+   the PATH
+   is > 1024 as NSIS can not handle variables larger than 1024.
+   -Updates to build instructions.
 
 2007-09-30 20:59  magfr
 
-   * agent/mibgroup/agentx/agentx_config.c,
-     include/net-snmp/library/snmp_service.h, snmplib/snmp_api.c,
-     snmplib/snmp_service.c, snmplib/snmp_transport.c:
-     CHANGES: BUG: 1801835: Added the ability to have multiple default
-     transports for an application. On open the different transports
-     will be tried in order. As a consequence snmp and snmptrap now
-     will try first udp and then udp6 and agentx wil try first unix
-     and then tcp.
+   *  agent/mibgroup/agentx/agentx_config.c,   
+      include/net-snmp/library/snmp_service.h, snmplib/snmp_api.c,   
+      snmplib/snmp_service.c, snmplib/snmp_transport.c:
+
+   CHANGES: BUG: 1801835: Added the ability to have multiple default
+   transports for an application. On open the different transports
+   will be tried in order. As a consequence snmp and snmptrap now
+   will try first udp and then udp6 and agentx wil try first unix
+   and then tcp.
 
 2007-09-29 13:10  magfr
 
    * snmplib/snmpUDPIPv6Domain.c:
-     CHANGES: snmplib: Do not try to look up empty strings as
-     hostnames for IPv6
-     Additinally, print what string filed to resolve using getaddrinfo
-     for IPv6
+
+   CHANGES: snmplib: Do not try to look up empty strings as
+   hostnames for IPv6
+   Additinally, print what string filed to resolve using getaddrinfo
+   for IPv6
+
+2007-09-29 06:26  tanders
+
+   * agent/mibgroup/ip-mib/data_access/systemstats_solaris2.c:
+
+   CHANGES: snmpd: PATCH: 1804445: from apersson: High order bits of
+   HCInOctets not set on Solaris
 
 2007-09-24 20:43  hardaker
 
    * COPYING:
-     year update
+
+   year update
+
+2007-09-23 06:03  tanders
+
+   * snmplib/dir_utils.c:
+
+   fix #elif
+
+2007-09-21 22:04  tanders
+
+   *  configure, configure.in, include/net-snmp/net-snmp-config.h.in,   
+      snmplib/dir_utils.c:
+
+   CHANGES: snmplib: attempt to fix build for Solaris/AIX/HP-UX
+   broken by r16684
 
 2007-09-20 21:55  tanders
 
    * agent/mibgroup/ucd-snmp/proc.c:
-     CHANGES: snmpd: PATCH: 1746831: from cunnijd: fix process
-     checking race
-     condition under Linux and platform #ifdefs
+
+   CHANGES: snmpd: PATCH: 1746831: from cunnijd: fix process
+   checking race
+   condition under Linux and platform #ifdefs
 
 2007-09-19 21:09  tanders
 
    * snmplib/snmpUDPDomain.c:
-     CHANGES: snmplib: BUG: Coverity #183: fix memory leak if
-     IP_PKTINFO fails
+
+   CHANGES: snmplib: BUG: Coverity #183: fix memory leak if
+   IP_PKTINFO fails
+
+2007-09-19 19:57  dts12
+
+   * dist/RELEASE-INSTRUCTIONS:
+
+   Fix misnumberings of steps.
+   It is *so* difficult to find properly numerate staff these
+   days....
 
 2007-09-16 09:51  magfr
 
    * local/mib2c-update:
-     Remove bashisms. This is netbsd patch-et from bug 1745404.
+
+   Remove bashisms. This is netbsd patch-et from bug 1745404.
 
 2007-09-16 09:45  magfr
 
    * agent/mibgroup/host/hr_device.c:
-     Use const char* for temporary constant string variable. This is
-     netbsd patch-ea from bug 1745404.
+
+   Use const char* for temporary constant string variable. This is
+   netbsd patch-ea from bug 1745404.
 
 2007-09-16 09:40  magfr
 
    * snmplib/snmp_api.c:
-     Use the natural type of in_addr_t's for comparisions. This is
-     netbsd patch-ea from bug 1745404.
+
+   Use the natural type of in_addr_t's for comparisions. This is
+   netbsd patch-ea from bug 1745404.
 
 2007-09-16 07:06  magfr
 
    * agent/mibgroup/agentx/master.c:
-     CHANGES: BUG: 1793545: Take the name from the sockaddr_un in
-     order to avoid transport specifiers and other decorations.
 
-2007-09-14 14:44  dts12
+   CHANGES: BUG: 1793545: Take the name from the sockaddr_un in
+   order to avoid transport specifiers and other decorations.
+
+2007-09-14 13:18  rstory
+
+   * include/net-snmp/data_access/swrun.h:
+
+   Apple patches
+   - header for swrun rewrite
+
+2007-09-14 13:16  rstory
+
+   * include/net-snmp/system/darwin9.h:
+
+   Apple patches
+   - add utility macro
+   - activate new host resource rewrites
+
+2007-09-14 13:13  rstory
+
+   * agent/mibgroup/host.h:
+
+   Apple patches
+   - config_require for new rewrites, if enabled
+
+2007-09-14 13:11  rstory
+
+   *  agent/mibgroup/host/hr_disk.c, agent/mibgroup/host/hr_filesys.c,  
+       agent/mibgroup/host/hr_partition.c:
+
+   Apple patches
+   - add/fix disk/partition tables on darwin
+
+2007-09-14 13:09  rstory
+
+   *  agent/mibgroup/host/data_access/swinst.c,   
+      agent/mibgroup/host/data_access/swinst.h,   
+      agent/mibgroup/host/data_access/swinst_darwin.c,   
+      agent/mibgroup/host/hrSWInstalledTable.c,   
+      agent/mibgroup/host/hrSWInstalledTable.h,   
+      include/net-snmp/data_access/swinst.h:
+
+   Apple patches
+   - add hrSWInstalledTable for darwin
+
+2007-09-14 08:44  dts12
 
    * dist/makerelease:
-     Synch with main trunk release script.
+
+   Protect against unexpected command arguments.
+
+2007-09-14 08:00  dts12
+
+   * dist/RELEASE-INSTRUCTIONS:
+
+   Document use of "svn export" rather than "svn checkout".
+   Cover generation of the zip archive as well as the tarball.
 
 2007-09-13 21:25  tanders
 
    * README:
-     drop obsolete mirrors
+
+   drop obsolete mirrors
+
+2007-09-13 17:29  rstory
+
+   *  agent/mibgroup/host/data_access,   
+      agent/mibgroup/host/data_access/swrun.c,   
+      agent/mibgroup/host/data_access/swrun.h,   
+      agent/mibgroup/host/data_access/swrun_darwin.c,   
+      agent/mibgroup/host/hrSWRunPerfTable.c,   
+      agent/mibgroup/host/hrSWRunPerfTable.h,   
+      agent/mibgroup/host/hrSWRunTable.c,   
+      agent/mibgroup/host/hrSWRunTable.h:
+
+   Apple patches
+   - host resources SWRun and SWRunPerf Table for darwin9
+
+2007-09-13 17:22  rstory
+
+   * agent/helpers/table.c, include/net-snmp/agent/table.h:
+
+   Apple patches
+   - improve error handling and cleanup in registration functions
+
+2007-09-13 17:19  rstory
+
+   * snmplib/system.c:
+
+   Apple patches
+   - for darwin9, rexec after fork to avoid problems with some mach
+   calls
+
+2007-09-12 18:51  rstory
+
+   *  include/net-snmp/library/dir_utils.h, snmplib/Makefile.in,   
+      snmplib/dir_utils.c:
+
+   Apple patches
+   - new utility function to read a directory hierarcy into a
+   container
+
+2007-09-12 17:55  rstory
+
+   * include/net-snmp/library/container.h, snmplib/container.c:
+
+   Apple patches
+   - new string compare callback
+
+2007-09-12 17:53  rstory
+
+   *  agent/helpers/cache_handler.c,   
+      include/net-snmp/agent/cache_handler.h:
+
+   Apple patches
+   - new netsnmp_cache_free function
+
+2007-09-12 17:46  rstory
+
+   * snmplib/snmpUDPDomain.c:
+
+   add missing newline in debug msg
+
+2007-09-12 17:42  rstory
+
+   * local/mib2c.container.conf:
+
+   Patches from Apple
+   - add optional cache
+   - check/handle errors for all functions in init func
+   - typedef generated struct
+   - skip processed requests
+   - check for null when extracting row
+
+2007-09-12 17:35  rstory
+
+   * COPYING:
+
+   add new copyright/contributor
+
+2007-09-05 20:12  magfr
+
+   * agent/mibgroup/mibII/system_mib.c:
+
+   Combine system_parse_config_sys{loc,con,name} into one function
+   since they all do the same thing
 
 2007-08-25 14:24  magfr
 
-   * agent/mibgroup/notification-log-mib/notification_log.c,
-     agent/mibgroup/notification-log-mib/notification_log.h:
-     Make most of notification_log static. Minimize the header file.
+   *  agent/mibgroup/notification-log-mib/notification_log.c,   
+      agent/mibgroup/notification-log-mib/notification_log.h:
+
+   Make most of notification_log static. Minimize the header file.
 
 2007-08-22 21:56  tanders
 
    * agent/agent_registry.c:
-     NEWS: agent: suppress annoying "registration != duplicate"
-     warning for root oids
-     (otherwise, you'll get this message on almost every startup)
+
+   NEWS: agent: suppress annoying "registration != duplicate"
+   warning for root oids
+   (otherwise, you'll get this message on almost every startup)
 
 2007-08-20 08:06  tanders
 
    * snmplib/snmpUDPIPv6Domain.c:
-     NEWS: snmplib: fix potential buffer overflow in sprintf for
-     UDP/IPv6
 
-2007-08-17 09:08  dts12
+   NEWS: snmplib: fix potential buffer overflow in sprintf for
+   UDP/IPv6
+
+2007-08-17 09:10  dts12
 
    * FAQ:
-     Synch with main development (and on-line) FAQ text.
+
+   Subversion, not CVS.
 
 2007-08-17 08:59  dts12
 
    * FAQ:
-     Clarify handling of unknown communities
+
+   Clarify handling of unknown communities
 
 2007-08-16 15:36  dts12
 
    * agent/mibgroup/agent/extend.c:
-     Don't just report the problem - it might be sensible to avoid
-     crashing the agent as well!
+
+   Don't just report the problem - it might be sensible to avoid
+   crashing the agent as well!
 
 2007-08-16 15:35  dts12
 
    * agent/mibgroup/agent/extend.c:
-     CHANGES: snmpd: PATCH: 1744157: Report duplicate "extend/exec"
-     identifiers.
+
+   CHANGES: snmpd: PATCH: 1744157: Report duplicate "extend/exec"
+   identifiers.
 
 2007-08-16 15:24  dts12
 
    * agent/mibgroup/mibII/vacm_conf.c, apps/snmptrapd_ds.h:
-     CHANGES: snmptrapd: PATCH: 1746992: Improve snmptrapd
-     access-control error messages.
+
+   CHANGES: snmptrapd: PATCH: 1746992: Improve snmptrapd
+   access-control error messages.
 
 2007-08-16 14:12  dts12
 
    * agent/mibgroup/util_funcs.c:
-     CHANGES: snmpd: PATCH: 1752934: Fix off-by-one qsort error in
-     table utilities.
+
+   CHANGES: snmpd: PATCH: 1752934: Fix off-by-one qsort error in
+   table utilities.
 
 2007-08-16 13:31  dts12
 
    * agent/snmp_agent.c:
-     CHANGES: snmpd: PATCH: 1753437: Fix error index on failing SET
-     requests
+
+   CHANGES: snmpd: PATCH: 1753437: Fix error index on failing SET
+   requests
 
 2007-08-16 13:25  dts12
 
    * agent/mibgroup/agentx/master.c:
-     CHANGES: snmpd: PATCH: 1753449: Fix AgentX error propagation
+
+   CHANGES: snmpd: PATCH: 1753449: Fix AgentX error propagation
 
 2007-08-16 12:34  dts12
 
    * agent/mibgroup/agentx/subagent.c:
-     CHANGES: snmpd: PATCH: 1753463: Fix AgentX subagent ping alarm
-     handling
+
+   CHANGES: snmpd: PATCH: 1753463: Fix AgentX subagent ping alarm
+   handling
 
 2007-08-16 12:13  dts12
 
    * agent/mibgroup/notification-log-mib/notification_log.c:
-     CHANGES: snmpd: PATCH: 1758208: Fix memory leak
+
+   CHANGES: snmpd: PATCH: 1758208: Fix memory leak
 
 2007-08-16 12:03  dts12
 
    * agent/mibgroup/host/hr_swrun.c:
-     CHANGES: snmpd: PATCH: 1774612: More resilient process status
-     handling
+
+   CHANGES: snmpd: PATCH: 1774612: More resilient process status
+   handling
 
 2007-08-16 11:58  dts12
 
    * snmplib/snmpUDPDomain.c:
-     CHANGES: snmplib: PATCH: 1775124: Fix clientaddr functionality
+
+   CHANGES: snmplib: PATCH: 1775124: Fix clientaddr functionality
 
 2007-08-16 09:38  dts12
 
    * snmplib/parse.c:
-     CHANGES: snmplib: PATCH: 1768285: Count MIB files correctly in
-     add_mibdir()
+
+   CHANGES: snmplib: PATCH: 1768285: Count MIB files correctly in
+   add_mibdir()
 
 2007-08-16 09:35  dts12
 
    * apps/snmptrapd.c:
-     CHANGES: snmptrapd: PATCH: 1767725: Close all non standard file
-     handles
+
+   CHANGES: snmptrapd: PATCH: 1767725: Close all non standard file
+   handles
 
 2007-08-16 09:00  dts12
 
    * agent/mibgroup/disman/expr/expValue.c:
-     Declare initialisation routine correctly, and omit unused
-     variables.
-     Patch from Magnus Fromreide.
+
+   Declare initialisation routine correctly, and omit unused
+   variables.
+   Patch from Magnus Fromreide.
 
 2007-08-16 08:55  dts12
 
    * include/net-snmp/agent/net-snmp-agent-includes.h:
-     Read in agent configuration settings *before* the header
-     files that might rely on them.
+
+   Read in agent configuration settings *before* the header
+   files that might rely on them.
+
+2007-08-05 16:16  alex_b
+
+   * win32/dist/README.build.win32.txt, win32/dist/README.txt:
+
+   Change win32 build readme files to CRLF.
+
+2007-08-05 14:16  alex_b
+
+   * win32/dist/README.build.win32.txt:
+
+   Win32: Change build docs to use dynamic (DLL) instead of static.
 
 2007-08-02 13:46  dts12
 
    * mibs/NET-SNMP-EXAMPLES-MIB.txt:
-     It might be slightly less confusing if the netSnmpExampleString
-     MIB object did actually take string values. Picky, I know....
 
--------------------------------------------------------------------------------
+   It might be slightly less confusing if the netSnmpExampleString
+   MIB object did actually take string values. Picky, I know....
 
-Changes: V5-4-patches branch created -> V5.4.1
+2007-07-28 13:02  rstory
 
-2007-07-27 17:02  hardaker
+   * dist/svnup:
 
-   * FAQ, README, configure, configure.in, dist/net-snmp.spec,
-     sedscript.in, snmplib/snmp_version.c:
-     - version tag ( 5.4.1 )
-
-2007-07-27 17:01  hardaker
-
-   * CHANGES, NEWS:
-     version update
-
-2007-07-27 16:58  hardaker
-
-   * ChangeLog:
-     remove bogus empty * lines from the ChangeLog
-
-2007-07-27 16:54  hardaker
-
-   * ChangeLog:
-     fix version numbers in ChangeLog
-
-2007-07-27 16:54  hardaker
-
-   * ChangeLog:
-     version update
-
-2007-07-27 16:15  hardaker
-
-   * man/netsnmp_agent.3, man/netsnmp_agent_registry.3,
-     man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,
-     man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,
-     man/netsnmp_cache_handler.3, man/netsnmp_callback.3,
-     man/netsnmp_container.3, man/netsnmp_data_list.3,
-     man/netsnmp_debug.3, man/netsnmp_default_store.3,
-     man/netsnmp_handler.3, man/netsnmp_instance.3,
-     man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,
-     man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,
-     man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,
-     man/netsnmp_multiplexer.3,
-     man/netsnmp_netsnmp_agent_request_info_s.3,
-     man/netsnmp_netsnmp_column_info_t.3,
-     man/netsnmp_netsnmp_data_list_s.3,
-     man/netsnmp_netsnmp_handler_registration_s.3,
-     man/netsnmp_netsnmp_iterator_info_s.3,
-     man/netsnmp_netsnmp_mib_handler_access_methods.3,
-     man/netsnmp_netsnmp_mib_handler_methods.3,
-     man/netsnmp_netsnmp_mib_handler_s.3,
-     man/netsnmp_netsnmp_request_info_s.3,
-     man/netsnmp_netsnmp_table_registration_info_s.3,
-     man/netsnmp_netsnmp_table_request_info_s.3,
-     man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,
-     man/netsnmp_read_config.3, man/netsnmp_read_only.3,
-     man/netsnmp_row_merge.3, man/netsnmp_scalar.3,
-     man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,
-     man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,
-     man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,
-     man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,
-     man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,
-     man/netsnmp_table.3, man/netsnmp_table_array.3,
-     man/netsnmp_table_container.3, man/netsnmp_table_data.3,
-     man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,
-     man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,
-     man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,
-     man/netsnmp_table_rows.3, man/netsnmp_tdata.3,
-     man/netsnmp_util.3, man/netsnmp_utilities.3,
-     man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
-     documentation update
-
-2007-07-27 16:13  hardaker
-
-   * doxygen.conf:
-     - version tag ( 5.4.1 )
+   fix tag extraction; check for empty tag earlier
 
 2007-07-25 22:41  tanders
 
    * agent/mibgroup/agentx/subagent.c:
-     CHANGES: snmpd: BUG: 1760633: fix typo in debug message
 
-2007-07-22 00:55  tanders
+   CHANGES: snmpd: BUG: 1760633: fix typo in debug message
 
-   * NEWS:
-     remove duplicate entry
-
-2007-07-22 00:52  tanders
-
-   * NEWS:
-     improve NEWS section for 5.4.1
-
-2007-07-21 16:17  hardaker
-
-   * FAQ, README, configure, configure.in, dist/net-snmp.spec,
-     sedscript.in, snmplib/snmp_version.c:
-     - version tag ( 5.4.1.rc4 )
-
-2007-07-21 16:16  hardaker
-
-   * CHANGES, NEWS:
-     version update
-
-2007-07-21 16:13  hardaker
-
-   * ChangeLog:
-     version update
-
-2007-07-21 15:07  hardaker
-
-   * man/netsnmp_agent.3, man/netsnmp_agent_registry.3,
-     man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,
-     man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,
-     man/netsnmp_cache_handler.3, man/netsnmp_callback.3,
-     man/netsnmp_container.3, man/netsnmp_data_list.3,
-     man/netsnmp_debug.3, man/netsnmp_default_store.3,
-     man/netsnmp_handler.3, man/netsnmp_instance.3,
-     man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,
-     man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,
-     man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,
-     man/netsnmp_multiplexer.3,
-     man/netsnmp_netsnmp_agent_request_info_s.3,
-     man/netsnmp_netsnmp_column_info_t.3,
-     man/netsnmp_netsnmp_data_list_s.3,
-     man/netsnmp_netsnmp_handler_registration_s.3,
-     man/netsnmp_netsnmp_iterator_info_s.3,
-     man/netsnmp_netsnmp_mib_handler_access_methods.3,
-     man/netsnmp_netsnmp_mib_handler_methods.3,
-     man/netsnmp_netsnmp_mib_handler_s.3,
-     man/netsnmp_netsnmp_request_info_s.3,
-     man/netsnmp_netsnmp_table_registration_info_s.3,
-     man/netsnmp_netsnmp_table_request_info_s.3,
-     man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,
-     man/netsnmp_read_config.3, man/netsnmp_read_only.3,
-     man/netsnmp_row_merge.3, man/netsnmp_scalar.3,
-     man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,
-     man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,
-     man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,
-     man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,
-     man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,
-     man/netsnmp_table.3, man/netsnmp_table_array.3,
-     man/netsnmp_table_container.3, man/netsnmp_table_data.3,
-     man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,
-     man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,
-     man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,
-     man/netsnmp_table_rows.3, man/netsnmp_tdata.3,
-     man/netsnmp_util.3, man/netsnmp_utilities.3,
-     man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
-     documentation update
-
-2007-07-21 15:06  hardaker
-
-   * doxygen.conf:
-     - version tag ( 5.4.1.rc4 )
-
-2007-07-21 14:51  hardaker
+2007-07-21 21:36  tanders
 
    * snmplib/snmp_api.c:
-     patch to fix forwarding encoding
+
+   CHANGES: snmplib: fix forwarding encoding
 
 2007-07-20 08:21  dts12
 
    * agent/mibgroup/ucd-snmp/extensible.c:
-     Tweak warning message for (old-style, invalid format) "exec OID"
-     directives.
 
-2007-07-19 21:16  tanders
-
-   * aclocal.m4, config.guess, config.sub, configure, ltmain.sh:
-     NEWS: build: update to libtool 1.5.24 (from 1.5.22)
-     CHANGES: HP-UX: BUG: 1742278: compile error on HP-UX 11.23 (IA64)
-
-2007-07-19 21:01  dts12
-
-   * agent/mibgroup/disman/schedule/schedCore.c, agent/snmpd.c:
-     Check for presence of 'chown' and 'localtime_r' routines before
-     using them.
-
-2007-07-19 21:00  dts12
-
-   * configure, configure.in, include/net-snmp/net-snmp-config.h.in,
-     win32/net-snmp/net-snmp-config.h,
-     win32/net-snmp/net-snmp-config.h.in:
-     Configure checks for 'chown' and 'localtime_r' functions
-
-2007-07-17 00:20  hardaker
-
-   * FAQ, README, configure, configure.in, dist/net-snmp.spec,
-     sedscript.in, snmplib/snmp_version.c:
-     - version tag ( 5.4.1.rc3 )
-
-2007-07-17 00:19  hardaker
-
-   * ChangeLog:
-     version update
-
-2007-07-17 00:17  hardaker
-
-   * man/netsnmp_agent.3, man/netsnmp_agent_registry.3,
-     man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,
-     man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,
-     man/netsnmp_cache_handler.3, man/netsnmp_callback.3,
-     man/netsnmp_container.3, man/netsnmp_data_list.3,
-     man/netsnmp_debug.3, man/netsnmp_default_store.3,
-     man/netsnmp_handler.3, man/netsnmp_instance.3,
-     man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,
-     man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,
-     man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,
-     man/netsnmp_multiplexer.3,
-     man/netsnmp_netsnmp_agent_request_info_s.3,
-     man/netsnmp_netsnmp_column_info_t.3,
-     man/netsnmp_netsnmp_data_list_s.3,
-     man/netsnmp_netsnmp_handler_registration_s.3,
-     man/netsnmp_netsnmp_iterator_info_s.3,
-     man/netsnmp_netsnmp_mib_handler_access_methods.3,
-     man/netsnmp_netsnmp_mib_handler_methods.3,
-     man/netsnmp_netsnmp_mib_handler_s.3,
-     man/netsnmp_netsnmp_request_info_s.3,
-     man/netsnmp_netsnmp_table_registration_info_s.3,
-     man/netsnmp_netsnmp_table_request_info_s.3,
-     man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,
-     man/netsnmp_read_config.3, man/netsnmp_read_only.3,
-     man/netsnmp_row_merge.3, man/netsnmp_scalar.3,
-     man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,
-     man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,
-     man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,
-     man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,
-     man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,
-     man/netsnmp_table.3, man/netsnmp_table_array.3,
-     man/netsnmp_table_container.3, man/netsnmp_table_data.3,
-     man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,
-     man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,
-     man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,
-     man/netsnmp_table_rows.3, man/netsnmp_tdata.3,
-     man/netsnmp_util.3, man/netsnmp_utilities.3,
-     man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
-     documentation update
-
-2007-07-17 00:16  hardaker
-
-   * doxygen.conf:
-     - version tag ( 5.4.1.rc3 )
+   Tweak warning message for (old-style, invalid format) "exec OID"
+   directives.
 
 2007-07-16 23:59  hardaker
 
-   * agent/agent_registry.c,
-     agent/mibgroup/ip-forward-mib/data_access/route_common.c,
-     agent/mibgroup/ip-mib/data_access/ipaddress_common.c,
-     agent/mibgroup/mibII/icmp.c, agent/mibgroup/mibII/ip.c,
-     agent/mibgroup/mibII/tcp.c, agent/mibgroup/mibII/udp.c,
-     snmplib/data_list.c:
-     Apply (correct) patch from Marcus Rueckert to remove asserts
-     using sort-o-illegal C string compares
+   *  agent/agent_registry.c,   
+      agent/mibgroup/ip-forward-mib/data_access/route_common.c,   
+      agent/mibgroup/ip-mib/data_access/ipaddress_common.c,   
+      agent/mibgroup/mibII/icmp.c, agent/mibgroup/mibII/ip.c,   
+      agent/mibgroup/mibII/tcp.c, agent/mibgroup/mibII/udp.c,   
+      snmplib/data_list.c:
+
+   Apply (correct) patch from Marcus Rueckert to remove asserts
+   using sort-o-illegal C string compares
 
 2007-07-16 23:59  hardaker
 
-   * agent/agent_registry.c,
-     agent/mibgroup/ip-forward-mib/data_access/route_common.c,
-     agent/mibgroup/ip-mib/data_access/ipaddress_common.c,
-     agent/mibgroup/mibII/icmp.c, agent/mibgroup/mibII/ip.c,
-     agent/mibgroup/mibII/tcp.c, agent/mibgroup/mibII/udp.c,
-     snmplib/data_list.c:
-     Remove previous patch which was the wrong version
+   *  agent/agent_registry.c,   
+      agent/mibgroup/ip-forward-mib/data_access/route_common.c,   
+      agent/mibgroup/ip-mib/data_access/ipaddress_common.c,   
+      agent/mibgroup/mibII/icmp.c, agent/mibgroup/mibII/ip.c,   
+      agent/mibgroup/mibII/tcp.c, agent/mibgroup/mibII/udp.c,   
+      snmplib/data_list.c:
+
+   Remove previous patch which was the wrong version
 
 2007-07-16 23:57  hardaker
 
-   * agent/agent_registry.c,
-     agent/mibgroup/ip-forward-mib/data_access/route_common.c,
-     agent/mibgroup/ip-mib/data_access/ipaddress_common.c,
-     agent/mibgroup/mibII/icmp.c, agent/mibgroup/mibII/ip.c,
-     agent/mibgroup/mibII/tcp.c, agent/mibgroup/mibII/udp.c,
-     snmplib/data_list.c:
-     Apply patch from Marcus Rueckert to remove asserts using
-     sort-o-illegal C string compares
+   *  agent/agent_registry.c,   
+      agent/mibgroup/ip-forward-mib/data_access/route_common.c,   
+      agent/mibgroup/ip-mib/data_access/ipaddress_common.c,   
+      agent/mibgroup/mibII/icmp.c, agent/mibgroup/mibII/ip.c,   
+      agent/mibgroup/mibII/tcp.c, agent/mibgroup/mibII/udp.c,   
+      snmplib/data_list.c:
+
+   Apply patch from Marcus Rueckert to remove asserts using
+   sort-o-illegal C string compares
+
+2007-07-13 19:27  hardaker
+
+   * dist/makerelease:
+
+   generate zip files
 
 2007-07-12 21:51  tanders
 
    * perl/agent/agent.pm:
-     fix subagent example (documentation)
+
+   fix subagent example (documentation)
 
 2007-07-12 21:27  tanders
 
    * man/snmp_sess_api.3.def:
-     snmp_sess_read returns int, not void
 
-2007-07-07 00:17  hardaker
-
-   * FAQ, README, configure, configure.in, dist/net-snmp.spec,
-     sedscript.in, snmplib/snmp_version.c:
-     - version tag ( 5.4.1.rc2 )
-
-2007-07-07 00:17  hardaker
-
-   * CHANGES:
-     version update
-
-2007-07-07 00:13  hardaker
-
-   * ChangeLog:
-     version update
-
-2007-07-07 00:11  hardaker
-
-   * man/netsnmp_agent.3, man/netsnmp_agent_registry.3,
-     man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,
-     man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,
-     man/netsnmp_cache_handler.3, man/netsnmp_callback.3,
-     man/netsnmp_container.3, man/netsnmp_data_list.3,
-     man/netsnmp_debug.3, man/netsnmp_default_store.3,
-     man/netsnmp_handler.3, man/netsnmp_instance.3,
-     man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,
-     man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,
-     man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,
-     man/netsnmp_multiplexer.3,
-     man/netsnmp_netsnmp_agent_request_info_s.3,
-     man/netsnmp_netsnmp_column_info_t.3,
-     man/netsnmp_netsnmp_data_list_s.3,
-     man/netsnmp_netsnmp_handler_registration_s.3,
-     man/netsnmp_netsnmp_iterator_info_s.3,
-     man/netsnmp_netsnmp_mib_handler_access_methods.3,
-     man/netsnmp_netsnmp_mib_handler_methods.3,
-     man/netsnmp_netsnmp_mib_handler_s.3,
-     man/netsnmp_netsnmp_request_info_s.3,
-     man/netsnmp_netsnmp_table_registration_info_s.3,
-     man/netsnmp_netsnmp_table_request_info_s.3,
-     man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,
-     man/netsnmp_read_config.3, man/netsnmp_read_only.3,
-     man/netsnmp_row_merge.3, man/netsnmp_scalar.3,
-     man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,
-     man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,
-     man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,
-     man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,
-     man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,
-     man/netsnmp_table.3, man/netsnmp_table_array.3,
-     man/netsnmp_table_container.3, man/netsnmp_table_data.3,
-     man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,
-     man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,
-     man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,
-     man/netsnmp_table_rows.3, man/netsnmp_tdata.3,
-     man/netsnmp_util.3, man/netsnmp_utilities.3,
-     man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
-     documentation update
-
-2007-07-07 00:10  hardaker
-
-   * doxygen.conf:
-     - version tag ( 5.4.1.rc2 )
+   snmp_sess_read returns int, not void
 
 2007-07-06 23:39  hardaker
 
    * Makefile.rules, Makefile.top:
-     CHANGES: build: use libtool clean for removing files to ensure we
-     delete all libtool temporary files.
+
+   CHANGES: build: use libtool clean for removing files to ensure we
+   delete all libtool temporary files.
+
+2007-07-06 23:34  hardaker
+
+   * dist/patme:
+
+   use a recursive revert instead of rm/update; remove double / from
+   editing calls
 
 2007-07-06 21:22  rstory
 
    * snmplib/read_config.c:
-     stop searching paths when done
+
+   stop searching paths when done
 
 2007-07-06 21:14  rstory
 
    * agent/mibgroup/if-mib/data_access/interface_linux.c:
-     do not free interface entry just because we can not get stats for
-     it
+
+   do not free interface entry just because we can not get stats for
+   it
 
 2007-07-06 15:32  dts12
 
    * agent/mibgroup/agent/extend.c:
-     CHANGES: snmpd: BUG 1745113: Handle single-line (and zero-line)
-     output in UCD compatability mode.
+
+   CHANGES: snmpd: BUG 1745113: Handle single-line (and zero-line)
+   output in UCD compatability mode.
+
+2007-07-06 09:08  dts12
+
+   *  configure, configure.in, snmplib/snmp_client.c,   
+      win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: library: PATCH 1728247: from Mitsuru Chinen: cleans up
+   the int64 type checking and usage for building packets especially
+   under MSVC.
 
 2007-07-05 14:45  rstory
 
    * ., README.osX:
-     r20044@dhcp211: rstory | 2007-07-05 10:44:01 -0400
-     remove disable-static from recommended options
+
+   r20044@dhcp211: rstory | 2007-07-05 10:44:01 -0400
+   remove disable-static from recommended options
 
 2007-07-05 11:05  rstory
 
    * agent/mibgroup/if-mib/data_access/interface_linux.c:
-     skip stats parsing on interfaces with no statistics
+
+   skip stats parsing on interfaces with no statistics
+
+2007-07-05 11:01  rstory
+
+   * dist/check-api-change:
+
+   check for dir existence
 
 2007-07-04 23:26  tanders
 
    * agent/Makefile.in, apps/Makefile.in:
-     CHANGES: perl: install embedded perl init files for
-     snmpd/snmptrapd with mode 644 instead of 755
+
+   CHANGES: perl: install embedded perl init files for
+   snmpd/snmptrapd with mode 644 instead of 755
 
 2007-07-04 21:42  tanders
 
    * README.osX:
-     Perl problems (believed to be) fixed
 
-2007-07-03 22:36  hardaker
-
-   * configure, configure.in, include/net-snmp/net-snmp-config.h.in,
-     include/net-snmp/types.h, snmplib/snmp_client.c,
-     win32/net-snmp/net-snmp-config.h,
-     win32/net-snmp/net-snmp-config.h.in:
-     CHANGES: library: Patch from "Mitsuru Chinen": cleans up the
-     int64 type checking and usage for building packets especially
-     under MSVC.
+   Perl problems (believed to be) fixed
 
 2007-07-03 12:56  tanders
 
    * perl/agent/Support/Support.pm:
-     remove executable flag from SVN properties
+
+   remove executable flag from SVN properties
+
+2007-07-02 06:53  magfr
+
+   * apps/snmptrapd.c, apps/snmpvacm.c:
+
+   Remove unused oid declarations
 
 2007-07-02 06:02  magfr
 
    * agent/mibgroup/disman/event/mteEvent.c:
-     Add missing return value to _mteEvent_fire_notify.
+
+   Add missing return value to _mteEvent_fire_notify.
 
 2007-07-02 05:31  magfr
 
    * agent/mibgroup/tcp-mib/data_access/tcpConn_common.c:
-     Remove the declaration of an undefined static function.
 
-2007-07-01 19:59  tanders
+   Remove the declaration of an undefined static function.
 
-   * configure, configure.in:
-     minor help text formatting fix
+2007-07-01 20:32  tanders
 
-2007-06-30 05:34  tanders
+   * dist/nsb-nightly, dist/nsb-package:
 
-   * dist/net-snmp.spec:
-     add --enable-as-needed if building with embedded Perl support
+   make getopts work on Tru64 by respawning in Posix mode
 
-2007-06-30 04:37  hardaker
+2007-07-01 19:56  tanders
 
-   * FAQ, README, configure, configure.in, dist/net-snmp.spec,
-     sedscript.in, snmplib/snmp_version.c:
-     - version tag ( 5.4.1.rc1 )
+   *  agent/Makefile.in, apps/Makefile.in, configure, configure.in,   
+      net-snmp-config.in:
 
-2007-06-30 04:37  hardaker
+   CHANGES: build: --disable-as-needed now allows to revert to the
+   former default behaviour of linking libperl to applications
+   rather than Net-SNMP Libraries (in case of any problems)
 
-   * CHANGES, NEWS:
-     version update
+2007-06-30 06:17  hardaker
 
-2007-06-30 04:36  hardaker
+   * dist/makerelease:
 
-   * ChangeLog:
-     version update
+   actually call removefiles
 
-2007-06-30 04:34  hardaker
+2007-06-28 23:50  magfr
 
-   * man/netsnmp_agent.3, man/netsnmp_agent_registry.3,
-     man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,
-     man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,
-     man/netsnmp_cache_handler.3, man/netsnmp_callback.3,
-     man/netsnmp_container.3, man/netsnmp_data_list.3,
-     man/netsnmp_debug.3, man/netsnmp_default_store.3,
-     man/netsnmp_handler.3, man/netsnmp_instance.3,
-     man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,
-     man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,
-     man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,
-     man/netsnmp_multiplexer.3,
-     man/netsnmp_netsnmp_agent_request_info_s.3,
-     man/netsnmp_netsnmp_column_info_t.3,
-     man/netsnmp_netsnmp_data_list_s.3,
-     man/netsnmp_netsnmp_handler_registration_s.3,
-     man/netsnmp_netsnmp_iterator_info_s.3,
-     man/netsnmp_netsnmp_mib_handler_access_methods.3,
-     man/netsnmp_netsnmp_mib_handler_methods.3,
-     man/netsnmp_netsnmp_mib_handler_s.3,
-     man/netsnmp_netsnmp_request_info_s.3,
-     man/netsnmp_netsnmp_table_registration_info_s.3,
-     man/netsnmp_netsnmp_table_request_info_s.3,
-     man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,
-     man/netsnmp_read_config.3, man/netsnmp_read_only.3,
-     man/netsnmp_row_merge.3, man/netsnmp_scalar.3,
-     man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,
-     man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,
-     man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,
-     man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,
-     man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,
-     man/netsnmp_table.3, man/netsnmp_table_array.3,
-     man/netsnmp_table_container.3, man/netsnmp_table_data.3,
-     man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,
-     man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,
-     man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,
-     man/netsnmp_table_rows.3, man/netsnmp_tdata.3,
-     man/netsnmp_util.3, man/netsnmp_utilities.3,
-     man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
-     documentation update
+   * include/net-snmp/library/snmp_debug.h:
 
-2007-06-30 04:32  hardaker
+   NEWS: snmplib: Added GCC format checking attributes to the debug
+   functions.
 
-   * doxygen.conf:
-     - version tag ( 5.4.1.rc1 )
+2007-06-28 23:37  magfr
 
-2007-06-29 22:18  tanders
+   * agent/mibgroup/host/hr_disk.c, agent/mibgroup/host/hr_system.c:
 
-   * README.aix, README.irix, README.solaris, agent/Makefile.in,
-     apps/Makefile.in, configure, configure.in, net-snmp-config.in:
-     NEWS: perl: BUG: 1619827: link libnetsnmpagent/libnetsnmptrapd
-     (rather than snmpd/snmptrapd) against libperl when configured
-     with --enable-as-needed
+   Remove casts of unused values
+
+2007-06-28 23:36  magfr
+
+   *  agent/mibgroup/agentx/protocol.c,   
+      agent/mibgroup/host/hr_storage.c:
+
+   Remove unused variables
 
 2007-06-28 22:09  tanders
 
    * net-snmp-config.in:
-     rename last occurence of DEFAULT_MIB[DIR]S to
-     NETSNMP_DEFAULT_MIB[DIR]S
+
+   rename last occurence of DEFAULT_MIB[DIR]S to
+   NETSNMP_DEFAULT_MIB[DIR]S
+
+2007-06-28 08:15  magfr
+
+   * apps/snmptrapd_handlers.c:
+
+   Do not transform the ignored result of realloc_format_trap
 
 2007-06-26 22:12  tanders
 
    * apps/Makefile.in:
-     CHANGES: build: work around libnetsnmpagent/libnetsnmphelpers
-     dependency issues when linking snmptrapd
+
+   CHANGES: build: work around libnetsnmpagent/libnetsnmphelpers
+   dependency issues when linking snmptrapd
 
 2007-06-26 21:45  tanders
 
    * agent/Makefile.in, agent/helpers/Makefile.in:
-     CHANGES: build: use LDFLAGS when building agent, helpers and mib
-     lib to be consistent with libnetnmp
+
+   CHANGES: build: use LDFLAGS when building agent, helpers and mib
+   lib to be consistent with libnetnmp
 
 2007-06-26 21:28  tanders
 
    * INSTALL:
-     minor updates
+
+   minor updates
+
+2007-06-26 15:10  rstory
+
+   * apps/snmptrapd.c, apps/snmptrapd_handlers.c:
+
+   don't initialize var in extern decl; instead, initialize actual
+   var
+
+2007-06-25 21:29  tanders
+
+   * aclocal.m4, config.guess, config.sub, configure, ltmain.sh:
+
+   NEWS: build: update to libtool 1.5.24 (from 1.5.22)
 
 2007-06-24 12:57  tanders
 
-   * acconfig.h, configure, configure.in,
-     include/net-snmp/net-snmp-config.h.in:
-     HAVE_SSIZE_T cleanup
+   *  acconfig.h, configure, configure.in,   
+      include/net-snmp/net-snmp-config.h.in:
+
+   HAVE_SSIZE_T cleanup
 
 2007-06-23 22:56  tanders
 
    * README.hpux11:
-     don't suggest --with-libs=-lnm
 
-2007-06-22 15:09  dts12
+   don't suggest --with-libs=-lnm
 
-   * win32/encode_keychange/encode_keychange.dsp,
-     win32/libagent/libagent.dsp, win32/libhelpers/libhelpers.dsp,
-     win32/libnetsnmptrapd/libnetsnmptrapd.dsp, win32/libsdll.dsw,
-     win32/libsnmp/libsnmp.dsp, win32/libsnmp_dll/libsnmp_dll.dsp,
-     win32/netsnmpmibs/netsnmpmibs.dsp,
-     win32/netsnmpmibssdk/netsnmpmibssdk.dsp,
-     win32/snmpbulkget/snmpbulkget.dsp,
-     win32/snmpbulkwalk/snmpbulkwalk.dsp, win32/snmpd/snmpd.dsp,
-     win32/snmpdelta/snmpdelta.dsp, win32/snmpdf/snmpdf.dsp,
-     win32/snmpdsdk/snmpd.dsp, win32/snmpget/snmpget.dsp,
-     win32/snmpgetnext/snmpgetnext.dsp,
-     win32/snmpnetstat/snmpnetstat.dsp, win32/snmpset/snmpset.dsp,
-     win32/snmpstatus/snmpstatus.dsp, win32/snmptable/snmptable.dsp,
-     win32/snmptest/snmptest.dsp,
-     win32/snmptranslate/snmptranslate.dsp,
-     win32/snmptrap/snmptrap.dsp, win32/snmptrapd/snmptrapd.dsp,
-     win32/snmpusm/snmpusm.dsp, win32/snmpvacm/snmpvacm.dsp,
-     win32/snmpwalk/snmpwalk.dsp, win32/win32.dsw, win32/win32sdk.dsw:
-     Enforce DOS-style line endings, to keep Visual Studio happy.
+2007-06-22 15:05  dts12
+
+   *  win32/encode_keychange/encode_keychange.dsp,   
+      win32/libagent/libagent.dsp, win32/libhelpers/libhelpers.dsp,   
+      win32/libnetsnmptrapd/libnetsnmptrapd.dsp, win32/libsdll.dsw,   
+      win32/libsnmp/libsnmp.dsp, win32/libsnmp_dll/libsnmp_dll.dsp,   
+      win32/netsnmpmibs/netsnmpmibs.dsp,   
+      win32/netsnmpmibssdk/netsnmpmibssdk.dsp,   
+      win32/snmpbulkget/snmpbulkget.dsp,   
+      win32/snmpbulkwalk/snmpbulkwalk.dsp, win32/snmpd/snmpd.dsp,   
+      win32/snmpdelta/snmpdelta.dsp, win32/snmpdf/snmpdf.dsp,   
+      win32/snmpdsdk/snmpd.dsp, win32/snmpget/snmpget.dsp,   
+      win32/snmpgetnext/snmpgetnext.dsp,   
+      win32/snmpnetstat/snmpnetstat.dsp, win32/snmpset/snmpset.dsp,   
+      win32/snmpstatus/snmpstatus.dsp, win32/snmptable/snmptable.dsp,   
+      win32/snmptest/snmptest.dsp,   
+      win32/snmptranslate/snmptranslate.dsp,   
+      win32/snmptrap/snmptrap.dsp, win32/snmptrapd/snmptrapd.dsp,   
+      win32/snmpusm/snmpusm.dsp, win32/snmpvacm/snmpvacm.dsp,   
+      win32/snmpwalk/snmpwalk.dsp, win32/win32.dsw, win32/win32sdk.dsw:
+
+   Enforce DOS-style line endings, to keep Visual Studio happy.
+
+2007-06-21 14:01  rstory
+
+   *  include/net-snmp/system/freebsd.h,   
+      include/net-snmp/system/openbsd.h,   
+      include/net-snmp/system/solaris.h:
+
+   default to using ifTable rewrites
 
 2007-06-20 21:34  tanders
 
-   * agent/mibgroup/if-mib/data_access/interface_sysctl.c:
-     fix typo
+   *  agent/mibgroup/if-mib/data_access/interface_openbsd.c,   
+      agent/mibgroup/if-mib/data_access/interface_sysctl.c:
+
+   fix typo
 
 2007-06-19 22:23  tanders
 
    * configure, configure.in:
-     fix Perl-related autoconf messages
+
+   fix Perl-related autoconf messages
 
 2007-06-19 15:08  tanders
 
    * dist/net-snmp.spec:
-     CHANGES: build: add "BuildRequires: perl-ExtUtils-Embed" to the
-     spec file, e.g. for Fedora 7
+
+   CHANGES: build: add "BuildRequires: perl-ExtUtils-Embed" to the
+   spec file, e.g. for Fedora 7
 
 2007-06-18 22:28  hardaker
 
    * perl/SNMP/SNMP.xs:
-     fix broken comment.
 
-2007-06-18 22:04  hardaker
-
-   * FAQ, README, configure, configure.in, dist/net-snmp.spec,
-     sedscript.in, snmplib/snmp_version.c:
-     - version tag ( 5.4.1.pre3 )
-
-2007-06-18 22:03  hardaker
-
-   * CHANGES, NEWS:
-     version update
-
-2007-06-18 21:57  hardaker
-
-   * ChangeLog:
-     version update
+   fix broken comment.
 
 2007-06-18 21:54  hardaker
 
    * agent/helpers/Makefile.in:
-     revert double linking of libnetsmnp part of patch that was
-     supposed to be pulled bofer applying in r16538 (thanks tanders
-     for catching it)
 
-2007-06-18 21:48  hardaker
-
-   * agent/mibgroup/Makefile.depend:
-     make depend
-
-2007-06-18 21:47  hardaker
-
-   * man/netsnmp_agent.3, man/netsnmp_agent_registry.3,
-     man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,
-     man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,
-     man/netsnmp_cache_handler.3, man/netsnmp_callback.3,
-     man/netsnmp_container.3, man/netsnmp_data_list.3,
-     man/netsnmp_debug.3, man/netsnmp_default_store.3,
-     man/netsnmp_handler.3, man/netsnmp_instance.3,
-     man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,
-     man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,
-     man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,
-     man/netsnmp_multiplexer.3,
-     man/netsnmp_netsnmp_agent_request_info_s.3,
-     man/netsnmp_netsnmp_column_info_t.3,
-     man/netsnmp_netsnmp_data_list_s.3,
-     man/netsnmp_netsnmp_handler_registration_s.3,
-     man/netsnmp_netsnmp_iterator_info_s.3,
-     man/netsnmp_netsnmp_mib_handler_access_methods.3,
-     man/netsnmp_netsnmp_mib_handler_methods.3,
-     man/netsnmp_netsnmp_mib_handler_s.3,
-     man/netsnmp_netsnmp_request_info_s.3,
-     man/netsnmp_netsnmp_table_registration_info_s.3,
-     man/netsnmp_netsnmp_table_request_info_s.3,
-     man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,
-     man/netsnmp_read_config.3, man/netsnmp_read_only.3,
-     man/netsnmp_row_merge.3, man/netsnmp_scalar.3,
-     man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,
-     man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,
-     man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,
-     man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,
-     man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,
-     man/netsnmp_table.3, man/netsnmp_table_array.3,
-     man/netsnmp_table_container.3, man/netsnmp_table_data.3,
-     man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,
-     man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,
-     man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,
-     man/netsnmp_table_rows.3, man/netsnmp_tdata.3,
-     man/netsnmp_util.3, man/netsnmp_utilities.3,
-     man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
-     documentation update
-
-2007-06-18 21:46  hardaker
-
-   * doxygen.conf:
-     - version tag ( 5.4.1.pre3 )
+   revert double linking of libnetsmnp part of patch that was
+   supposed to be pulled bofer applying in r16538 (thanks tanders
+   for catching it)
 
 2007-06-18 21:34  hardaker
 
    * agent/helpers/Makefile.in, apps/Makefile.in, snmplib/Makefile.in:
-     CHANGES: build: patch from apple to simplify makefile target
-     references in some rules.
+
+   CHANGES: build: patch from apple to simplify makefile target
+   references in some rules.
 
 2007-06-18 21:17  hardaker
 
    * man/snmp_config.5.def, man/snmpget.1.def:
-     CHANGES: patch from apple to fix minor documentation bugs.
+
+   CHANGES: patch from apple to fix minor documentation bugs.
 
 2007-06-18 21:13  hardaker
 
-   * agent/mibgroup/if-mib/data_access/interface.h,
-     include/net-snmp/system/darwin9.h:
-     
+   *  agent/mibgroup/if-mib/data_access/interface.h,   
+      include/net-snmp/system/darwin9.h:
+
+   
 
 2007-06-18 21:12  hardaker
 
    * agent/mibgroup/hardware/memory/memory_darwin.c:
-     CHANGES: patch from apple to improve memory reporting
+
+   CHANGES: patch from apple to improve memory reporting
 
 2007-06-18 21:09  hardaker
 
    * include/net-snmp/system/darwin9.h:
-     CHANGES: patch from apple to fix cross-compile builds in apples
-     build environment.
+
+   CHANGES: patch from apple to fix cross-compile builds in apples
+   build environment.
 
 2007-06-18 20:54  hardaker
 
    * snmplib/snmp_parse_args.c:
-     CHANGES: patch: 1737085: from jsafranek: fix the -M switch for
-     mib parsing by loading defaults first before performing the set
-     so it does not get overwritten by the defaults later.
+
+   CHANGES: patch: 1737085: from jsafranek: fix the -M switch for
+   mib parsing by loading defaults first before performing the set
+   so it does not get overwritten by the defaults later.
 
 2007-06-18 20:50  hardaker
 
    * perl/SNMP/SNMP.xs:
-     NEWS: perl: patch: 1725049: fix bulkwalk in cases of non-repeater
-     usage.
+
+   NEWS: perl: patch: 1725049: fix bulkwalk in cases of non-repeater
+   usage.
 
 2007-06-18 14:10  tanders
 
    * perl/TrapReceiver/Makefile.PL:
-     CHANGES: perl: fix prerequisites for NetSNMP::TrapReceiver
+
+   CHANGES: perl: fix prerequisites for NetSNMP::TrapReceiver
 
 2007-06-18 13:39  tanders
 
    * perl/agent/Support/Support.pm:
-     CHANGES: perl: fix syntax error in NetSNMP::agent::Support
+
+   CHANGES: perl: fix syntax error in NetSNMP::agent::Support
+
+2007-06-16 23:01  tanders
+
+   *  agent/Makefile.in, apps/Makefile.in, configure, configure.in,   
+      net-snmp-config.in:
+
+   NEWS: perl: BUG: 1619827: link libnetsnmpagent/libnetsnmptrapd
+   (rather than snmpd/snmptrapd) against libperl.
 
 2007-06-14 15:41  rstory
 
    * local/mib2c.conf:
-     fix typo in user output, as noted on coders
+
+   fix typo in user output, as noted on coders
+
+2007-06-14 15:36  rstory
+
+   * dist/cvsshow:
+
+   use 'svn info' to query for url
 
 2007-06-14 04:37  magfr
 
    * agent/mibgroup/smux/smux.h:
-     Add missing argument type in order to silence a gcc warning
+
+   Add missing argument type in order to silence a gcc warning
+
+2007-06-13 06:37  magfr
+
+   * configure, configure.in:
+
+   Do not try to be clever in the handing of -lkvm in LAGENTLIBS.
+   Include it if any sought function is in it.
 
 2007-06-11 10:11  tanders
 
    * README.aix:
-     document xlc<->cc_r compiler issues with Perl on AIX (see bug
-     #1600099)
+
+   document xlc<->cc_r compiler issues with Perl on AIX (see bug
+   #1600099)
 
 2007-06-10 22:29  tanders
 
-   * configure, configure.in, include/net-snmp/net-snmp-config.h.in,
-     include/net-snmp/types.h:
-     CHANGES: build: PATCH: 1728247: from mitsuru_chinen: Add type
-     check for int??_t and uint??_t
+   *  configure, configure.in, include/net-snmp/net-snmp-config.h.in,   
+      include/net-snmp/types.h:
+
+   CHANGES: build: PATCH: 1728247: from mitsuru_chinen: Add type
+   check for int??_t and uint??_t
 
 2007-06-10 22:22  tanders
 
-   * configure, configure.in, include/net-snmp/net-snmp-config.h.in,
-     snmplib/snmpUDPIPv6Domain.c:
-     CHANGES: build: PATCH: 1728244: from mitsuru_chinen: Add
-     configure check for sin6_scope_id
+   *  configure, configure.in, include/net-snmp/net-snmp-config.h.in,   
+      snmplib/snmpUDPIPv6Domain.c:
+
+   CHANGES: build: PATCH: 1728244: from mitsuru_chinen: Add
+   configure check for sin6_scope_id
 
 2007-06-10 22:15  tanders
 
-   * configure, configure.in, include/net-snmp/net-snmp-config.h.in,
-     snmplib/snmpUDPDomain.c:
-     CHANGES: PATCH: 1728241: from mitsuru_chinen: add configure check
-     for <sys/uio.h> (make sure iov structure is declared)
+   *  configure, configure.in, include/net-snmp/net-snmp-config.h.in,   
+      snmplib/snmpUDPDomain.c:
+
+   CHANGES: PATCH: 1728241: from mitsuru_chinen: add configure check
+   for <sys/uio.h> (make sure iov structure is declared)
+
+2007-06-10 06:33  magfr
+
+   *  acconfig.h, configure, configure.in,   
+      include/net-snmp/net-snmp-config.h.in:
+
+   Use NETSNMP_SEARCH_LIBS to simplify searching for system specific
+   libraries
+
+2007-06-10 06:26  magfr
+
+   * configure, configure.in:
+
+   Use NETSNMP_SEARCH_LIBS to simplify searching for -lsensors
+
+2007-06-10 06:18  magfr
+
+   *  acconfig.h, configure, configure.in,   
+      include/net-snmp/net-snmp-config.h.in:
+
+   Use NETSNMP_SEARCH_LIBS to simplify searching for -ldevstat
+
+2007-06-10 06:13  magfr
+
+   *  agent/mibgroup/ucd-snmp/dlmod.c, configure, configure.in,   
+      include/net-snmp/net-snmp-config.h.in,   
+      win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   Use NETSNMP_SEARCH_LIBS to simplify searching for -ldl
+
+2007-06-09 08:58  magfr
+
+   *  configure, configure.in, include/net-snmp/net-snmp-config.h.in,   
+      win32/config.h.borland, win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   Use NETSNMP_SEARCH_LIBS to simplify searching for -lkvm
 
 2007-06-08 20:32  tanders
 
-   * Makefile.in:
-     Fix regression introduced by r16479: 'make test TESTOPTS="-T
-     tcp"' now
-     works again. makerelease now uses the right option.
+   * Makefile.in, dist/makerelease:
+
+   Fix regression introduced by r16479: 'make test TESTOPTS="-T
+   tcp"' now
+   works again. makerelease now uses the right option.
+
+2007-06-08 10:46  dts12
+
+   * apps/snmptrapd.c, apps/snmptrapd_handlers.c:
+
+   CHANGES: snmptrapd: FEATURE: 741375: Extend -F flag to cover
+   syslog/execute format strings.
 
 2007-06-08 10:44  dts12
 
-   * apps/snmptrapd.c, apps/snmptrapd_handlers.c:
-     Improve memory handling of style-specific format strings.
+   * apps/snmptrapd_handlers.c:
+
+   Improve memory handling of style-specific format strings.
 
 2007-06-08 10:33  dts12
 
    * agent/mibgroup/host/hr_storage.c:
-     Default to reporting NFS mounts as NetworkDisk.
+
+   Default to reporting NFS mounts as NetworkDisk.
+
+2007-06-08 06:02  magfr
+
+   *  configure, configure.in, include/net-snmp/net-snmp-config.h.in,   
+      win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   Use NETSNMP_SEARCH_LIBS to simplify searching for -lrpm and
+   things it depends
+   on
+
+2007-06-08 05:59  magfr
+
+   * agent/helpers/Makefile.in:
+
+   Add missing \
+
+2007-06-08 05:31  magfr
+
+   * configure, configure.in:
+
+   Use NETSNMP_SEARCH_LIBS to simplify searching for -lkstat
+
+2007-06-08 05:28  magfr
+
+   * acinclude.m4:
+
+   CHANGES: building: Add a variation of AC_SEARCH_LIBS where the
+   result variable is settable.
 
 2007-06-08 05:16  magfr
 
-   * acconfig.h, include/net-snmp/net-snmp-config.h.in,
-     win32/net-snmp/net-snmp-config.h,
-     win32/net-snmp/net-snmp-config.h.in:
-     Remove the unused undef HAVE_PERL_EVAL_PV.
-     The Perl_eval_pv functions are handled by the
-     HAVE_PERL_EVAL_PV_[UL]C defines,
-     this one is never set by our configure script.
+   *  win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   Remove the unused undef HAVE_PERL_EVAL_PV.
+   The Perl_eval_pv functions are handled by the
+   HAVE_PERL_EVAL_PV_[UL]C defines,
+   this one is never set by our configure script.
 
 2007-06-07 16:02  dts12
 
-   * .cvsignore, agent/.cvsignore, agent/helpers/.cvsignore,
-     agent/mibgroup/.cvsignore, agent/mibgroup/Rmon/.cvsignore,
-     agent/mibgroup/agent/.cvsignore,
-     agent/mibgroup/agentx/.cvsignore,
-     agent/mibgroup/disman/.cvsignore,
-     agent/mibgroup/disman/event/.cvsignore,
-     agent/mibgroup/disman/expr/.cvsignore,
-     agent/mibgroup/disman/schedule/.cvsignore,
-     agent/mibgroup/examples/.cvsignore,
-     agent/mibgroup/hardware/cpu/.cvsignore,
-     agent/mibgroup/hardware/memory/.cvsignore,
-     agent/mibgroup/host/.cvsignore,
-     agent/mibgroup/if-mib/data_access/.cvsignore,
-     agent/mibgroup/if-mib/ifTable/.cvsignore,
-     agent/mibgroup/if-mib/ifXTable/.cvsignore,
-     agent/mibgroup/ip-forward-mib/data_access/.cvsignore,
-     agent/mibgroup/ip-forward-mib/inetCidrRouteTable/.cvsignore,
-     agent/mibgroup/ip-forward-mib/ipCidrRouteTable/.cvsignore,
-     agent/mibgroup/ip-mib/.cvsignore,
-     agent/mibgroup/ip-mib/data_access/.cvsignore,
-     agent/mibgroup/ip-mib/inetNetToMediaTable/.cvsignore,
-     agent/mibgroup/ip-mib/ipAddressPrefixTable/.cvsignore,
-     agent/mibgroup/ip-mib/ipAddressTable/.cvsignore,
-     agent/mibgroup/ip-mib/ipSystemStatsTable/.cvsignore,
-     agent/mibgroup/ip-mib/ipv4InterfaceTable/.cvsignore,
-     agent/mibgroup/ip-mib/ipv6InterfaceTable/.cvsignore,
-     agent/mibgroup/ipfwchains/.cvsignore,
-     agent/mibgroup/mibII/.cvsignore, agent/mibgroup/misc/.cvsignore,
-     agent/mibgroup/notification-log-mib/.cvsignore,
-     agent/mibgroup/notification/.cvsignore,
-     agent/mibgroup/smux/.cvsignore,
-     agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable/.cvsignore,
-     agent/mibgroup/snmp-usm-dh-objects-mib/usmDHParameters/.cvsignore,
-     agent/mibgroup/snmp-usm-dh-objects-mib/usmDHUserKeyTable/.cvsignore,
-     agent/mibgroup/snmpv3/.cvsignore,
-     agent/mibgroup/target/.cvsignore,
-     agent/mibgroup/tcp-mib/data_access/.cvsignore,
-     agent/mibgroup/tcp-mib/tcpConnectionTable/.cvsignore,
-     agent/mibgroup/tcp-mib/tcpListenerTable/.cvsignore,
-     agent/mibgroup/ucd-snmp/.cvsignore,
-     agent/mibgroup/udp-mib/data_access/.cvsignore,
-     agent/mibgroup/udp-mib/udpEndpointTable/.cvsignore,
-     agent/mibgroup/utilities/.cvsignore, apps/.cvsignore,
-     apps/snmpnetstat/.cvsignore, dist/.cvsignore,
-     include/net-snmp/.cvsignore, include/net-snmp/agent/.cvsignore,
-     include/net-snmp/library/.cvsignore, include/ucd-snmp/.cvsignore,
-     local/.cvsignore, man/.cvsignore, mibs/.cvsignore, ov/.cvsignore,
-     perl/.cvsignore, perl/ASN/.cvsignore,
-     perl/AnyData_SNMP/.cvsignore, perl/OID/.cvsignore,
-     perl/SNMP/.cvsignore, perl/SNMP/t/.cvsignore,
-     perl/TrapReceiver/.cvsignore, perl/agent/.cvsignore,
-     perl/agent/Support/.cvsignore,
-     perl/agent/default_store/.cvsignore,
-     perl/default_store/.cvsignore, perl/manager/.cvsignore,
-     snmplib/.cvsignore, testing/.cvsignore, win32/.cvsignore,
-     win32/bin/.cvsignore, win32/encode_keychange/.cvsignore,
-     win32/lib/.cvsignore, win32/libagent/.cvsignore,
-     win32/libhelpers/.cvsignore, win32/libnetsnmptrapd/.cvsignore,
-     win32/libsnmp/.cvsignore, win32/libsnmp_dll/.cvsignore,
-     win32/libucdmibs/.cvsignore, win32/net-snmp/.cvsignore,
-     win32/net-snmp/agent/.cvsignore,
-     win32/net-snmp/library/.cvsignore, win32/netsnmpmibs/.cvsignore,
-     win32/netsnmpmibssdk/.cvsignore, win32/snmpbulkget/.cvsignore,
-     win32/snmpbulkwalk/.cvsignore, win32/snmpd/.cvsignore,
-     win32/snmpdelta/.cvsignore, win32/snmpdf/.cvsignore,
-     win32/snmpdsdk/.cvsignore, win32/snmpget/.cvsignore,
-     win32/snmpgetnext/.cvsignore, win32/snmpnetstat/.cvsignore,
-     win32/snmpset/.cvsignore, win32/snmpstatus/.cvsignore,
-     win32/snmptable/.cvsignore, win32/snmptest/.cvsignore,
-     win32/snmptranslate/.cvsignore, win32/snmptrap/.cvsignore,
-     win32/snmptrapd/.cvsignore, win32/snmpusm/.cvsignore,
-     win32/snmpvacm/.cvsignore, win32/snmpwalk/.cvsignore:
-     Remove redundant CVS-admin files.
+   *  .cvsignore, agent/.cvsignore, agent/helpers/.cvsignore,   
+      agent/mibgroup/.cvsignore, agent/mibgroup/Rmon/.cvsignore,   
+      agent/mibgroup/agent/.cvsignore,   
+      agent/mibgroup/agentx/.cvsignore,   
+      agent/mibgroup/disman/.cvsignore,   
+      agent/mibgroup/disman/event/.cvsignore,   
+      agent/mibgroup/disman/expr/.cvsignore,   
+      agent/mibgroup/disman/schedule/.cvsignore,   
+      agent/mibgroup/examples/.cvsignore,   
+      agent/mibgroup/hardware/cpu/.cvsignore,   
+      agent/mibgroup/hardware/memory/.cvsignore,   
+      agent/mibgroup/host/.cvsignore,   
+      agent/mibgroup/if-mib/data_access/.cvsignore,   
+      agent/mibgroup/if-mib/ifTable/.cvsignore,   
+      agent/mibgroup/if-mib/ifXTable/.cvsignore,   
+      agent/mibgroup/ip-forward-mib/data_access/.cvsignore,   
+      agent/mibgroup/ip-forward-mib/inetCidrRouteTable/.cvsignore,   
+      agent/mibgroup/ip-forward-mib/ipCidrRouteTable/.cvsignore,   
+      agent/mibgroup/ip-mib/.cvsignore,   
+      agent/mibgroup/ip-mib/data_access/.cvsignore,   
+      agent/mibgroup/ip-mib/inetNetToMediaTable/.cvsignore,   
+      agent/mibgroup/ip-mib/ipAddressPrefixTable/.cvsignore,   
+      agent/mibgroup/ip-mib/ipAddressTable/.cvsignore,   
+      agent/mibgroup/ip-mib/ipSystemStatsTable/.cvsignore,   
+      agent/mibgroup/ip-mib/ipv4InterfaceTable/.cvsignore,   
+      agent/mibgroup/ip-mib/ipv6InterfaceTable/.cvsignore,   
+      agent/mibgroup/ipfwchains/.cvsignore,   
+      agent/mibgroup/mibII/.cvsignore, agent/mibgroup/misc/.cvsignore,  
+       agent/mibgroup/notification-log-mib/.cvsignore,   
+      agent/mibgroup/notification/.cvsignore,   
+      agent/mibgroup/smux/.cvsignore,   
+      agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable/.cvsignore,
+        
+      agent/mibgroup/snmp-usm-dh-objects-mib/usmDHParameters/.cvsignore,
+        
+      agent/mibgroup/snmp-usm-dh-objects-mib/usmDHUserKeyTable/.cvsignore,
+         agent/mibgroup/snmpv3/.cvsignore,   
+      agent/mibgroup/target/.cvsignore,   
+      agent/mibgroup/tcp-mib/data_access/.cvsignore,   
+      agent/mibgroup/tcp-mib/tcpConnectionTable/.cvsignore,   
+      agent/mibgroup/tcp-mib/tcpListenerTable/.cvsignore,   
+      agent/mibgroup/ucd-snmp/.cvsignore,   
+      agent/mibgroup/udp-mib/data_access/.cvsignore,   
+      agent/mibgroup/udp-mib/udpEndpointTable/.cvsignore,   
+      agent/mibgroup/utilities/.cvsignore, apps/.cvsignore,   
+      apps/snmpnetstat/.cvsignore, dist/.cvsignore,   
+      include/net-snmp/.cvsignore, include/net-snmp/agent/.cvsignore,   
+      include/net-snmp/library/.cvsignore, include/ucd-snmp/.cvsignore, 
+        local/.cvsignore, man/.cvsignore, mibs/.cvsignore,
+      ov/.cvsignore,    perl/.cvsignore, perl/ASN/.cvsignore,   
+      perl/AnyData_SNMP/.cvsignore, perl/OID/.cvsignore,   
+      perl/SNMP/.cvsignore, perl/SNMP/t/.cvsignore,   
+      perl/TrapReceiver/.cvsignore, perl/agent/.cvsignore,   
+      perl/agent/Support/.cvsignore,   
+      perl/agent/default_store/.cvsignore,   
+      perl/default_store/.cvsignore, perl/manager/.cvsignore,   
+      snmplib/.cvsignore, testing/.cvsignore, win32/.cvsignore,   
+      win32/bin/.cvsignore, win32/encode_keychange/.cvsignore,   
+      win32/lib/.cvsignore, win32/libagent/.cvsignore,   
+      win32/libhelpers/.cvsignore, win32/libnetsnmptrapd/.cvsignore,   
+      win32/libsnmp/.cvsignore, win32/libsnmp_dll/.cvsignore,   
+      win32/libucdmibs/.cvsignore, win32/net-snmp/.cvsignore,   
+      win32/net-snmp/agent/.cvsignore,   
+      win32/net-snmp/library/.cvsignore, win32/netsnmpmibs/.cvsignore,  
+       win32/netsnmpmibssdk/.cvsignore, win32/snmpbulkget/.cvsignore,   
+      win32/snmpbulkwalk/.cvsignore, win32/snmpd/.cvsignore,   
+      win32/snmpdelta/.cvsignore, win32/snmpdf/.cvsignore,   
+      win32/snmpdsdk/.cvsignore, win32/snmpget/.cvsignore,   
+      win32/snmpgetnext/.cvsignore, win32/snmpnetstat/.cvsignore,   
+      win32/snmpset/.cvsignore, win32/snmpstatus/.cvsignore,   
+      win32/snmptable/.cvsignore, win32/snmptest/.cvsignore,   
+      win32/snmptranslate/.cvsignore, win32/snmptrap/.cvsignore,   
+      win32/snmptrapd/.cvsignore, win32/snmpusm/.cvsignore,   
+      win32/snmpvacm/.cvsignore, win32/snmpwalk/.cvsignore:
+
+   Remove redundant CVS-admin files.
 
 2007-06-07 12:56  dts12
 
    * snmplib/snmp_secmod.c:
-     Handle unregistering the first Security Model in the list.
-     Reported by Aleksandr Lomanov.
+
+   Handle unregistering the first Security Model in the list.
+   Reported by Aleksandr Lomanov.
 
 2007-06-07 09:13  dts12
 
    * agent/helpers/Makefile.in:
-     Install header files for stash_cache and stash_to_next helpers.
+
+   Install header files for stash_cache and stash_to_next helpers.
 
 2007-06-07 09:07  dts12
 
    * agent/helpers/Makefile.in:
-     Separate out header files that don't have a corresponding C
-     source file.
+
+   Separate out header files that don't have a corresponding C
+   source file.
 
 2007-06-07 08:59  dts12
 
    * agent/helpers/Makefile.in:
-     Sort lists of helpers (source code, object files and headers).
-     This should make it easier to spot files that have been omitted.
+
+   Sort lists of helpers (source code, object files and headers).
+   This should make it easier to spot files that have been omitted.
 
 2007-06-07 08:42  dts12
 
    * snmplib/read_config.c:
-     Protect against systems without S_ISDIR.
+
+   Protect against systems without S_ISDIR.
+
+2007-06-06 22:36  magfr
+
+   * configure, configure.in:
+
+   We aren't using libtools dlopen support, so there is no need to
+   configure for it
 
 2007-06-06 12:37  tanders
 
    * configure, configure.in:
-     CHANGES: AIX: use "-Wl,-brtl" when compiling with gcc
+
+   CHANGES: AIX: use "-Wl,-brtl" when compiling with gcc
+
+2007-06-06 10:26  magfr
+
+   * acconfig.h, include/net-snmp/net-snmp-config.h.in:
+
+   Remove the unused undef HAVE_PERL_EVAL_PV.
+   The Perl_eval_pv functions are handled by the
+   HAVE_PERL_EVAL_PV_[UL]C defines,
+   this one is never set by our configure script.
 
 2007-06-06 10:20  dts12
 
    * apps/snmptrapd.c:
-     Ensure output is properly directed to syslog.
-     Otherwise, problems in the config environment can trigger
-     errors being directed to stderr, and subsequent logging
-     output gets lost.
+
+   Ensure output is properly directed to syslog.
+   Otherwise, problems in the config environment can trigger
+   errors being directed to stderr, and subsequent logging
+   output gets lost.
 
 2007-06-06 10:13  dts12
 
    * snmplib/snmp_client.c:
-     More helpful debugging output.
+
+   More helpful debugging output.
 
 2007-06-06 05:53  magfr
 
-   * apps/snmptrapd.c, apps/snmptrapd_handlers.c,
-     testing/tests/T035snmpv3trapdusermgmt:
-     CHANGES: misc: Don't use the legacy symbol
-     SNMPTRAPD_DISABLE_AGENTX
+   *  apps/snmptrapd.c, apps/snmptrapd_handlers.c,   
+      testing/tests/T035snmpv3trapdusermgmt:
+
+   CHANGES: misc: Don't use the legacy symbol
+   SNMPTRAPD_DISABLE_AGENTX
+
+2007-06-05 17:49  magfr
+
+   * acconfig.h, include/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: building: Remove explicit definitions of items that
+   autoheader also defines
 
 2007-06-05 15:59  dts12
 
    * agent/mibgroup/disman/event/mteEvent.c:
-     CHANGES: snmpd: PATCHES: 1729629: Fix memory leak in disman
-     agent.
+
+   CHANGES: snmpd: PATCHES: 1729629: Fix memory leak in disman
+   agent.
+
+2007-06-05 14:52  dts12
+
+   * apps/snmptrapd_handlers.c:
+
+   CHANGES: snmptrapd: Support per-trap format specifications
+
+2007-06-05 06:57  magfr
+
+   * net-snmp-config.in:
+
+   NEWS: misc: Add config rereading support to the subagent
+   generated by net-snmp-config --compile-subagent
+
+2007-06-04 22:29  magfr
+
+   *  acconfig.h, configure, configure.in,   
+      include/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: building: Simplify the detection of libraries needed for
+   gethostbyname
 
 2007-06-04 22:06  magfr
 
    * snmplib/snmp_api.c:
-     NEWS: snmplib: Change snmp_sess_add_ex to consistently close and
-     delete the transport argument on failure, earlier the liveness of
-     the transport argument was undecided.
 
-2007-06-04 15:50  hardaker
-
-   * FAQ, README, configure, configure.in, dist/net-snmp.spec,
-     sedscript.in, snmplib/snmp_version.c:
-     - version tag ( 5.4.1.pre2 )
-
-2007-06-04 15:50  hardaker
-
-   * CHANGES, NEWS:
-     version update
-
-2007-06-04 15:44  hardaker
-
-   * ChangeLog:
-     version update
-
-2007-06-04 15:42  hardaker
-
-   * agent/Makefile.depend:
-     make depend
-
-2007-06-04 15:41  hardaker
-
-   * man/netsnmp_agent.3, man/netsnmp_agent_registry.3,
-     man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,
-     man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,
-     man/netsnmp_cache_handler.3, man/netsnmp_callback.3,
-     man/netsnmp_container.3, man/netsnmp_data_list.3,
-     man/netsnmp_debug.3, man/netsnmp_default_store.3,
-     man/netsnmp_handler.3, man/netsnmp_instance.3,
-     man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,
-     man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,
-     man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,
-     man/netsnmp_multiplexer.3,
-     man/netsnmp_netsnmp_agent_request_info_s.3,
-     man/netsnmp_netsnmp_column_info_t.3,
-     man/netsnmp_netsnmp_data_list_s.3,
-     man/netsnmp_netsnmp_handler_registration_s.3,
-     man/netsnmp_netsnmp_iterator_info_s.3,
-     man/netsnmp_netsnmp_mib_handler_access_methods.3,
-     man/netsnmp_netsnmp_mib_handler_methods.3,
-     man/netsnmp_netsnmp_mib_handler_s.3,
-     man/netsnmp_netsnmp_request_info_s.3,
-     man/netsnmp_netsnmp_table_registration_info_s.3,
-     man/netsnmp_netsnmp_table_request_info_s.3,
-     man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,
-     man/netsnmp_read_config.3, man/netsnmp_read_only.3,
-     man/netsnmp_row_merge.3, man/netsnmp_scalar.3,
-     man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,
-     man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,
-     man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,
-     man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,
-     man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,
-     man/netsnmp_table.3, man/netsnmp_table_array.3,
-     man/netsnmp_table_container.3, man/netsnmp_table_data.3,
-     man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,
-     man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,
-     man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,
-     man/netsnmp_table_rows.3, man/netsnmp_tdata.3,
-     man/netsnmp_util.3, man/netsnmp_utilities.3,
-     man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
-     documentation update
-
-2007-06-04 15:39  hardaker
-
-   * doxygen.conf:
-     - version tag ( 5.4.1.pre2 )
+   NEWS: snmplib: Change snmp_sess_add_ex to consistently close and
+   delete the transport argument on failure, earlier the liveness of
+   the transport argument was undecided.
 
 2007-06-04 14:36  hardaker
 
-   * Makefile.in, testing/RUNTESTS:
-     CHANGES: test: support a -n flag to RUNTESTS to print the test
-     number found in the test file as opposed to the numerical count
+   * Makefile.in, dist/makerelease, testing/RUNTESTS:
+
+   CHANGES: test: support a -n flag to RUNTESTS to print the test
+   number found in the test file as opposed to the numerical count
 
 2007-06-04 13:09  tanders
 
    * snmplib/snmpUDPDomain.c:
-     CHANGES: build: PATCH: 1728237: from mitsuru_chinen: Move
-     variable declaration at the top of netsnmp_udp_sendto
+
+   CHANGES: build: PATCH: 1728237: from mitsuru_chinen: Move
+   variable declaration at the top of netsnmp_udp_sendto
+
+2007-06-04 12:52  tanders
+
+   *  configure, configure.in, include/net-snmp/net-snmp-config.h.in,   
+      include/net-snmp/types.h:
+
+   CHANGES: build: PATCH: 1728233: from mitsuru_chinen: make sure
+   type nfds_t is defined
 
 2007-06-04 12:13  tanders
 
-   * agent/mibgroup/disman/ping/pingCtlTable.c, configure,
-     configure.in, include/net-snmp/net-snmp-config.h.in,
-     snmplib/snmpUDPDomain.c, snmplib/snmpUDPIPv6Domain.c:
-     CHANGES: build: PATCH: 1728230: from mitsuru_chinen: add
-     configure check for gai_strerror()
+   *  agent/mibgroup/disman/ping/pingCtlTable.c, configure,   
+      configure.in, include/net-snmp/net-snmp-config.h.in,   
+      snmplib/snmpUDPDomain.c, snmplib/snmpUDPIPv6Domain.c:
+
+   CHANGES: build: PATCH: 1728230: from mitsuru_chinen: add
+   configure check for gai_strerror()
 
 2007-06-04 10:35  tanders
 
    * agent/mibgroup/if-mib/data_access/interface_linux.c:
-     CHANGES: build: PATCH: 1728226: from mitsuru_chinen: make sure
-     IF_NAMESIZE is defined
+
+   CHANGES: build: PATCH: 1728226: from mitsuru_chinen: make sure
+   IF_NAMESIZE is defined
+
+2007-06-04 10:28  tanders
+
+   *  agent/mibgroup/ip-mib/data_access/defaultrouter_linux.c,   
+      agent/mibgroup/ip-mib/data_access/ipaddress_linux.c, configure,   
+      configure.in, include/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: build: PATCH: 1728223: from mitsuru_chinen: add
+   configure check for netlink socket
 
 2007-06-04 09:47  tanders
 
    * testing/tests/T160snmpnetstat:
-     also skip this test on IRIX64
+
+   also skip this test on IRIX64
+
+2007-06-02 16:13  magfr
+
+   * configure, configure.in:
+
+   CHANGES: building: Fix compilation on IRIX
 
 2007-06-02 08:24  magfr
 
-   * acconfig.h, configure, configure.in,
-     include/net-snmp/net-snmp-config.h.in,
-     include/net-snmp/system/dynix.h,
-     include/net-snmp/system/mingw32.h, snmplib/snmp_api.c,
-     win32/config.h.borland, win32/net-snmp/net-snmp-config.h,
-     win32/net-snmp/net-snmp-config.h.in:
-     CHANGES: snmpapi: Do not use getservbyname to find default port
-     numbers, just hardcode them and let the user override them if
-     needed.
+   *  acconfig.h, configure, configure.in,   
+      include/net-snmp/net-snmp-config.h.in,   
+      include/net-snmp/system/dynix.h,   
+      include/net-snmp/system/mingw32.h, snmplib/snmp_api.c,   
+      win32/config.h.borland, win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: snmpapi: Do not use getservbyname to find default port
+   numbers, just hardcode them and let the user override them if
+   needed.
 
 2007-06-01 22:55  tanders
 
    * configure, configure.in:
-     CHANGES: build: Link libdl against libnetsnmpmibs instead of
-     snmpd.
-     Fixes the build on (some) Solaris systems.
 
-2007-06-01 21:36  dts12
+   CHANGES: build: Link libdl against libnetsnmpmibs instead of
+   snmpd.
+   Fixes the build on (some) Solaris systems.
 
-   * snmplib/read_config.c:
-     CHANGES: snmplib: FEATURES: 1041888: Check directory paths for
-     config files.
-     Backport from main development trunk of bug fix.
+2007-06-01 22:34  tanders
 
-2007-06-01 21:23  dts12
+   * configure, configure.in:
 
-   * snmplib/snmp_api.c:
-     CHANGES: snmplib: FEATURES: 851887: Report range information for
-     invalid SET requests.
-     Backport from main trunk of bug fix.
+   fix NETSNMP_IFNET_NEEDS_KERNEL configure check on IRIX
+   (regression from r16451)
+
+2007-06-01 14:33  dts12
+
+   * apps/snmptrapd.c:
+
+   NEWS: snmptrapd: Withdraw deprecated options.
+   (Three and a half years' warning should be enough for anyone!)
 
 2007-05-31 23:51  tanders
 
-   * agent/Makefile.in, apps/Makefile.in, configure, configure.in,
-     net-snmp-config.in:
-     CHANGES: build: Link libkvm and libwrap to libnetsnmpagent
-     instead of snmpd.
-     Fixes test #44 (Perl subagent) on systems using one of those
-     libraries.
+   *  agent/Makefile.in, apps/Makefile.in, configure, configure.in,   
+      net-snmp-config.in:
+
+   CHANGES: build: Link libkvm and libwrap to libnetsnmpagent
+   instead of snmpd.
+   Fixes test #44 (Perl subagent) on systems using one of those
+   libraries.
+
+2007-05-31 23:42  magfr
+
+   *  README.agent-mibs, agent/mibgroup/mibII/sysORTable.c,   
+      agent/mibgroup/mibII/system_mib.c,   
+      agent/mibgroup/mibII/system_mib.h:
+
+   CHANGES: snmpd: Move sysORLastChange from mibII/system_mib to
+   mibII/sysORTable in order to keep the data and the use together.
 
 2007-05-31 14:39  dts12
 
    * apps/snmptrapd_log.c:
-     Fix logging of authentication information.
+
+   Fix logging of authentication information.
 
 2007-05-31 10:10  dts12
 
    * apps/snmptrapd_log.c:
-     Remove bogus debug output.
+
+   Remove bogus debug output.
+
+2007-05-31 09:48  dts12
+
+   * apps/snmptrapd_handlers.c:
+
+   Remove redundant code.
+
+2007-05-31 09:43  dts12
+
+   * apps/snmptrapd_handlers.c:
+
+   CHANGES: snmptrapd: FEATURE: 1159947: Allow control of traphandle
+   data format
 
 2007-05-30 22:53  tanders
 
-   * configure, configure.in, perl/ASN/Makefile.PL,
-     perl/OID/Makefile.PL, perl/SNMP/Makefile.PL,
-     perl/TrapReceiver/Makefile.PL, perl/agent/Makefile.PL,
-     perl/default_store/Makefile.PL:
-     CHANGES: AIX: build fixes for embedded Perl
+   *  configure, configure.in, perl/ASN/Makefile.PL,   
+      perl/OID/Makefile.PL, perl/SNMP/Makefile.PL,   
+      perl/TrapReceiver/Makefile.PL, perl/agent/Makefile.PL,   
+      perl/default_store/Makefile.PL:
+
+   CHANGES: AIX: build fixes for embedded Perl
+
+2007-05-30 22:34  tanders
+
+   * configure, configure.in:
+
+   HP-UX 11.x and IRIX 6.5 build fix (regression introduced by
+   r16451)
+
+2007-05-29 23:04  tanders
+
+   * configure, configure.in:
+
+   CHANGES: build: make use of AC_PROG_SED/AC_PROG_GREP and / to
+   further minimize sed/grep problems
 
 2007-05-29 22:42  magfr
 
    * snmplib/snmpUDPIPv6Domain.c:
-     CHANGES: snmplib: Use the default_target argument if it is
-     non-NULL, not if it is NULL.
+
+   CHANGES: snmplib: Use the default_target argument if it is
+   non-NULL, not if it is NULL.
+
+2007-05-29 10:30  tanders
+
+   * win32/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: building: Remove more net-snmp specials in the configure
+   scripts to ease maintenance.
+   Also change recently added STRUCT_SOCKADDR_STORAGE_HAS_SS_FAMILY.
 
 2007-05-29 10:27  tanders
 
    * README.agent-mibs:
-     add recent mfd rewrites
+
+   add recent mfd rewrites
+
+2007-05-29 10:22  tanders
+
+   * win32/net-snmp/net-snmp-config.h:
+
+   CHANGES: building: Remove more net-snmp specials in the configure
+   scripts to ease maintenance.
+   Also change win32/net-snmp/net-snmp-config.h for consistency.
+
+2007-05-28 23:30  magfr
+
+   *  PORTING, acconfig.h, acinclude.m4,   
+      agent/mibgroup/host/hr_filesys.c,   
+      agent/mibgroup/host/hr_storage.c, agent/mibgroup/host_res.h,   
+      agent/mibgroup/ip-forward-mib/data_access/route_ioctl.c,   
+      agent/mibgroup/mibII/at.c, agent/mibgroup/mibII/interfaces.c,   
+      agent/mibgroup/mibII/ipAddr.c, agent/mibgroup/mibII/ipv6.c,   
+      agent/mibgroup/mibII/mibII_common.h,   
+      agent/mibgroup/mibII/route_headers.h,   
+      agent/mibgroup/mibII/route_write.c, agent/mibgroup/mibII/tcp.c,   
+      agent/mibgroup/mibII/udp.c, agent/mibgroup/mibII/var_route.c,   
+      agent/mibgroup/ucd-snmp/disk.c,   
+      agent/mibgroup/ucd-snmp/pass_persist.c, configure, configure.in,  
+       include/net-snmp/net-snmp-config.h.in,   
+      include/net-snmp/system/freebsd5.h,   
+      include/net-snmp/system/irix.h, include/net-snmp/system/svr5.h,   
+      snmplib/scapi.c, snmplib/snmp-tc.c, snmplib/snmpUDPIPv6Domain.c,  
+       snmplib/system.c:
+
+   CHANGES: building: Remove more net-snmp specials in the configure
+   scripts to ease maintenance.
+
+2007-05-28 16:31  dts12
+
+   * man/snmp.conf.5.def, man/snmpcmd.1.def, snmplib/mib.c:
+
+   CHANGES: library: FEATURES: 1407476: Rename 'strictCommentTerm'
+   to reflect the actual behaviour.
+
+2007-05-28 15:25  dts12
+
+   * snmplib/read_config.c:
+
+   CHANGES: library: FEATURES: 1041888: Check directory paths for
+   config files.
+
+2007-05-28 13:13  dts12
+
+   * snmplib/snmp_api.c:
+
+   CHANGES: library: FEATURES: 851887: Report range information for
+   invalid SET requests.
+
+2007-05-28 12:08  tanders
+
+   *  agent/mibgroup/ip-mib/data_access/ipaddress_solaris2.c,   
+      agent/mibgroup/ip-mib/data_access/systemstats_solaris2.c:
+
+   NEWS: Solaris: PATCH: 1719730: from apersson: support for
+   ipSystemStatsTable and ipAddressTable
+   Part 2 (Solaris-specific new files)
+
+2007-05-28 12:02  tanders
+
+   * include/net-snmp/data_access/defaultrouter.h:
+
+   NEWS: Linux: PATCH: 1724602: from mitsuru_chinen: mfd-based
+   ipDefaultRouterTable implementation
+
+2007-05-28 12:00  tanders
+
+   *  agent/mibgroup/ip-mib/data_access/defaultrouter.h,   
+      agent/mibgroup/ip-mib/data_access/defaultrouter_common.c,   
+      agent/mibgroup/ip-mib/data_access/defaultrouter_linux.c,   
+      agent/mibgroup/ip-mib/ipDefaultRouterTable,   
+      agent/mibgroup/ip-mib/ipDefaultRouterTable.h,   
+      agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable.c,
+        
+      agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable.h,
+        
+      agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable_data_access.c,
+        
+      agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable_data_access.h,
+        
+      agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable_data_get.c,
+        
+      agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable_data_get.h,
+        
+      agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable_enums.h,
+        
+      agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable_interface.c,
+        
+      agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable_interface.h,
+        
+      agent/mibgroup/ip-mib/ipDefaultRouterTable/ipDefaultRouterTable_oids.h:
+
+   NEWS: Linux: PATCH: 1724602: from mitsuru_chinen: mfd-based
+   ipDefaultRouterTable implementation
+
+2007-05-28 11:59  tanders
+
+   *  agent/mibgroup/mibII/ip.c, agent/mibgroup/mibII/ip.h,   
+      agent/mibgroup/mibII/var_route.c,   
+      agent/mibgroup/mibII/var_route.h:
+
+   NEWS: Linux: PATCH: 1724602: from mitsuru_chinen: mfd-based
+   ipDefaultRouterTable implementation
+
+2007-05-28 10:09  dts12
+
+   * apps/snmpwalk.c, man/snmpwalk.1.def:
+
+   Document the -CE option.
 
 2007-05-27 21:42  tanders
 
    * perl/TrapReceiver/Makefile.PL, perl/agent/Makefile.PL:
-     Some lame linkers (e.g. on HP-UX 11.23/IA64) need quite a bit of
-     help to successfully link the Perl modules.
+
+   Some lame linkers (e.g. on HP-UX 11.23/IA64) need quite a bit of
+   help to successfully link the Perl modules.
+
+2007-05-27 21:33  dts12
+
+   * apps/snmpwalk.c:
+
+   CHANGES: snmpwalk: PATCH: 1723620: Specify an explicit end-point
+   for the walk.
+   An alternative (more flexible) approach to the proposed patch,
+   but one that
+   provides equivalent functionality. Also addresses Feature Request
+   #722784.
 
 2007-05-27 20:52  tanders
 
    * configure, configure.in, include/net-snmp/net-snmp-config.h.in:
-     Add descriptions to AC_DEFINE; drop obsolete AC_CHECK_LIB(m,
-     asin).
 
-2007-05-27 19:54  dts12
+   Add descriptions to AC_DEFINE; drop obsolete AC_CHECK_LIB(m,
+   asin).
 
-   * snmplib/parse.c:
-     CHANGES: library: FEATURES: 454028: Detect and handle empty MIB
-     index files.
+2007-05-27 19:28  dts12
+
+   * snmplib/mib.c:
+
+   CHANGES: library: FEATURES: 454028: Detect empty MIB index files.
+
+2007-05-27 19:06  dts12
+
+   *  agent/snmpd.c, configure, configure.in,   
+      include/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: snmpd: FEATURES: 1019429: Set supplementary groups via
+   initgroups(3)
+
+2007-05-27 06:27  tanders
+
+   *  agent/mibgroup/if-mib/data_access/interface_solaris2.c,   
+      agent/mibgroup/ip-mib/data_access/ipaddress.h,   
+      agent/mibgroup/ip-mib/data_access/systemstats.h,   
+      agent/mibgroup/kernel_sunos5.c, agent/mibgroup/kernel_sunos5.h,   
+      agent/mibgroup/mibII.h, configure, configure.in,   
+      include/net-snmp/system/solaris.h:
+
+   NEWS: Solaris: PATCH: 1719730: from apersson: support for
+   ipSystemStatsTable and ipAddressTable
 
 2007-05-27 06:20  tanders
 
    * README.aix:
-     grammar fix
+
+   grammar fix
 
 2007-05-26 16:41  alex_b
 
-   * README.win32, win32/Configure, win32/build.pl,
-     win32/net-snmp/net-snmp-config.h,
-     win32/net-snmp/net-snmp-config.h.in:
-     Win32 IPv6 build fixes. IPv6 now requires PSDK.
+   *  README.win32, win32/Configure, win32/build.pl,   
+      win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
 
-2007-05-26 15:14  alex_b
+   Win32 IPv6 build fixes. IPv6 now requires PSDK.
 
-   * README.win32, win32/net-snmp/net-snmp-config.h,
-     win32/net-snmp/net-snmp-config.h.in:
-     IPv6 build fixes for build.bat, Configure and README.win32.
+2007-05-26 15:16  alex_b
+
+   *  README.win32, win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   IPv6 build fixes for build.bat, Configure and README.win32.
 
 2007-05-25 23:03  tanders
 
    * README.aix, README.solaris, README.tru64:
-     Documentation update w.r.t. recent changes (mibII/ipv6 and AIX
-     shared library building).
+
+   Documentation update w.r.t. recent changes (mibII/ipv6 and AIX
+   shared library building).
+
+2007-05-25 18:54  rstory
+
+   * dist/cvsshow:
+
+   update for new url format in svn entries
 
 2007-05-25 15:28  tanders
 
    * perl/default_store/Makefile.PL:
-     Some systems (e.g. HP-UX 11.23/IA64) currently still need
-     "net-snmp-config --libs" (instead of just --netsnmp-libs) for
-     linking
-     libnetsnmp to a Perl module.
+
+   Some systems (e.g. HP-UX 11.23/IA64) currently still need
+   "net-snmp-config --libs" (instead of just --netsnmp-libs) for
+   linking
+   libnetsnmp to a Perl module.
 
 2007-05-24 23:55  tanders
 
    * agent/mibgroup/mibII.h, configure, configure.in:
-     CHANGES: build: only enable mibII/ipv6 through --enable-ipv6 on
-     systems it builds properly on (Linux and *BSD)
+
+   CHANGES: build: only enable mibII/ipv6 through --enable-ipv6 on
+   systems it builds properly on (Linux and *BSD)
 
 2007-05-24 23:15  tanders
 
    * perl/agent/default_store/Makefile.PL:
-     Some systems (e.g. HP-UX 11.23/IA64) currently still need
-     "net-snmp-config --libs" (instead of just --netsnmp-libs) for
-     linking libsnmpagent to a Perl module.
+
+   Some systems (e.g. HP-UX 11.23/IA64) currently still need
+   "net-snmp-config --libs" (instead of just --netsnmp-libs) for
+   linking libsnmpagent to a Perl module.
 
 2007-05-24 22:01  magfr
 
    * agent/mibgroup/mibII/ipv6.c:
-     Correct obviously broken use of the KLOOKUP macro to be
-     consistent at least
+
+   Correct obviously broken use of the KLOOKUP macro to be
+   consistent at least
 
 2007-05-24 20:51  tanders
 
    * include/net-snmp/system/freebsd7.h:
-     CHANGES: FreeBSD: add initial support for upcoming FreeBSD 7
+
+   CHANGES: FreeBSD: add initial support for upcoming FreeBSD 7
+
+2007-05-24 14:06  rstory
+
+   * Makefile.top:
+
+   bump libcurrent to 20 to leave space for 5.4.x releases
 
 2007-05-24 12:48  tanders
 
    * agent/Makefile.in, apps/Makefile.in:
-     fix library linking on HP-UX 11.23/IA64
 
-2007-05-24 08:36  tanders
-
-   * Makefile.top:
-     CHANGES: snmplib: increment "current" and "age" according to
-     libtool
-     versioning policy, since interfaces have been added since 5.4.
-     We now build libnetsnmp.so.15.1.0.
-     5.4.1.pre1 was broken in this regard.
+   fix library linking on HP-UX 11.23/IA64
 
 2007-05-23 19:05  tanders
 
-   * Makefile.in, Makefile.rules, agent/Makefile.in,
-     agent/helpers/Makefile.in, apps/Makefile.in, configure,
-     configure.in, perl/TrapReceiver/Makefile.PL,
-     perl/agent/Makefile.PL, perl/agent/default_store/Makefile.PL,
-     perl/default_store/Makefile.PL, snmplib/Makefile.in:
-     NEWS: snmplib: BUG: 1619827: link net-snmp libraries and binaries
-     against the net-snmp libraries they really depend on
-     - reflect library interdependencies at link time
-     - fix dependencies on libcrypto, libpkcs11 and libkstat
-     - install libraries in correct order (important for libtool
-     relinking)
-     NEWS: Perl: link Perl modules against the exact set of libraries
-     they depend on
+   *  Makefile.in, Makefile.rules, agent/Makefile.in,   
+      agent/helpers/Makefile.in, apps/Makefile.in, configure,   
+      configure.in, perl/TrapReceiver/Makefile.PL,   
+      perl/agent/Makefile.PL, perl/agent/default_store/Makefile.PL,   
+      perl/default_store/Makefile.PL, snmplib/Makefile.in:
 
-2007-05-22 14:40  hardaker
+   NEWS: snmplib: BUG: 1619827: link net-snmp libraries and binaries
+   against the net-snmp libraries they really depend on
+   - reflect library interdependencies at link time
+   - fix dependencies on libcrypto, libpkcs11 and libkstat
+   - install libraries in correct order (important for libtool
+   relinking)
+   NEWS: Perl: link Perl modules against the exact set of libraries
+   they depend on
 
-   * FAQ, README, configure, configure.in, dist/net-snmp.spec,
-     perl/ASN/ASN.pm, perl/AnyData_SNMP/Storage.pm, perl/OID/OID.pm,
-     perl/SNMP/SNMP.pm, perl/TrapReceiver/TrapReceiver.pm,
-     perl/agent/Support/Support.pm, perl/agent/agent.pm,
-     perl/agent/default_store/default_store.pm,
-     perl/default_store/default_store.pm, sedscript.in,
-     snmplib/snmp_version.c:
-     version stamp 5.4.1.pre1
+2007-05-22 16:26  hardaker
 
-2007-05-22 00:24  hardaker
+   * dist/makerelease:
 
-   * CHANGES, NEWS:
-     version update
-
-2007-05-22 00:19  hardaker
-
-   * ChangeLog:
-     version update
-
-2007-05-22 00:01  hardaker
-
-   * agent/Makefile.depend, agent/helpers/Makefile.depend,
-     agent/mibgroup/Makefile.depend, apps/Makefile.depend,
-     apps/snmpnetstat/Makefile.depend, snmplib/Makefile.depend:
-     make depend
+   use svn export instead of checkout
 
 2007-05-22 00:00  hardaker
 
    * Makefile.in:
-     ignore winExtDLL in comment check
+
+   ignore winExtDLL in comment check
 
 2007-05-21 23:54  hardaker
 
    * agent/mibgroup/hardware/cpu/cpu_sysinfo.c:
-     // -> C comment
 
-2007-05-21 23:51  hardaker
+   // -> C comment
 
-   * man/netsnmp_agent.3, man/netsnmp_agent_registry.3,
-     man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3,
-     man/netsnmp_baby_steps.3, man/netsnmp_bulk_to_next.3,
-     man/netsnmp_cache_handler.3, man/netsnmp_callback.3,
-     man/netsnmp_container.3, man/netsnmp_data_list.3,
-     man/netsnmp_debug.3, man/netsnmp_default_store.3,
-     man/netsnmp_handler.3, man/netsnmp_instance.3,
-     man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,
-     man/netsnmp_library.3, man/netsnmp_mib_maintenance.3,
-     man/netsnmp_mib_utilities.3, man/netsnmp_mode_end_call.3,
-     man/netsnmp_multiplexer.3,
-     man/netsnmp_netsnmp_agent_request_info_s.3,
-     man/netsnmp_netsnmp_column_info_t.3,
-     man/netsnmp_netsnmp_data_list_s.3,
-     man/netsnmp_netsnmp_handler_registration_s.3,
-     man/netsnmp_netsnmp_iterator_info_s.3,
-     man/netsnmp_netsnmp_mib_handler_access_methods.3,
-     man/netsnmp_netsnmp_mib_handler_methods.3,
-     man/netsnmp_netsnmp_mib_handler_s.3,
-     man/netsnmp_netsnmp_request_info_s.3,
-     man/netsnmp_netsnmp_table_registration_info_s.3,
-     man/netsnmp_netsnmp_table_request_info_s.3,
-     man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,
-     man/netsnmp_read_config.3, man/netsnmp_read_only.3,
-     man/netsnmp_row_merge.3, man/netsnmp_scalar.3,
-     man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3,
-     man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3,
-     man/netsnmp_snmp_client.3, man/netsnmp_snmp_logging.3,
-     man/netsnmp_snmp_pdu.3, man/netsnmp_snmp_session.3,
-     man/netsnmp_stash_cache.3, man/netsnmp_stash_to_next.3,
-     man/netsnmp_table.3, man/netsnmp_table_array.3,
-     man/netsnmp_table_container.3, man/netsnmp_table_data.3,
-     man/netsnmp_table_dataset.3, man/netsnmp_table_generic.3,
-     man/netsnmp_table_indexes.3, man/netsnmp_table_iterator.3,
-     man/netsnmp_table_iterator.h.3, man/netsnmp_table_maintenance.3,
-     man/netsnmp_table_rows.3, man/netsnmp_tdata.3,
-     man/netsnmp_util.3, man/netsnmp_utilities.3,
-     man/netsnmp_variable_list.3, man/netsnmp_watcher.3:
-     documentation update
+2007-05-21 23:33  tanders
+
+   *  include/net-snmp/system/solaris2.10.h,   
+      include/net-snmp/system/solaris2.7.h,   
+      include/net-snmp/system/solaris2.8.h,   
+      include/net-snmp/system/solaris2.9.h:
+
+   sync with 5.4, these are obsolete now
 
 2007-05-21 23:11  magfr
 
    * configure, configure.in:
-     CHANGES: building: Disable inlining on solaris as there are some
-     linking errors that show up if the inline support is left
-     enabled.
-
-2007-05-21 22:46  hardaker
-
-   * doxygen.conf:
-     - version tag ( 5.4.1.pre1 )
-
-2007-05-21 22:22  hardaker
-
-   * Makefile.top:
-     version update
-
-2007-05-21 23:51  hardaker
-
-   documentation update
-
-2007-05-21 23:11  magfr
 
    CHANGES: building: Disable inlining on solaris as there are some
    linking errors that show up if the inline support is left
    enabled.
 
-2007-05-21 22:46  hardaker
+2007-05-21 06:05  magfr
 
-   - version tag ( 5.4.1.pre1 )
+   * configure, configure.in:
 
-2007-05-21 22:22  hardaker
-
-   version update
+   CHANGES: building: At least Sun C 5.7 fails if one tries to
+   access __func__ in a extern inline function, so test for that
+   case.
 
 2007-05-20 21:34  tanders
 
-	* agent/Makefile.in, configure, configure.in:
-	  NEWS: snmplib: BUG: 1619827: link against needed external
-	  libraries at library link time (where they are referenced),
-	  rather than application link time.
-	  Already covers most of libnetsnmpmibs' external dependencies.
-	  Fixes build issues on some platforms (e.g. building with shared
-	  libraries on AIX). Tested on different versions of Linux,
-	  Solaris, HP-UX, AIX and IRIX.
+   * agent/Makefile.in, configure, configure.in:
+
+   NEWS: snmplib: BUG: 1619827: link against needed external
+   libraries at library link time (where they are referenced),
+   rather than application link time.
+   Already covers most of libnetsnmpmibs' external dependencies.
+   Fixes build issues on some platforms (e.g. building with shared
+   libraries on AIX). Tested on different versions of Linux,
+   Solaris, HP-UX, AIX and IRIX.
 
 2007-05-19 15:27  magfr
 
-	* acconfig.h, configure, configure.in,
-	  include/net-snmp/net-snmp-config.h.in:
-	  CHANGES: building: Check for support of static inline functions
-	  instead of nested static inline functions when determining if
-	  static inline functions work
+   *  acconfig.h, configure, configure.in,   
+      include/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: building: Check for support of static inline functions
+   instead of nested static inline functions when determining if
+   static inline functions work
+
+2007-05-19 08:40  magfr
+
+   *  acconfig.h, configure, configure.in,   
+      include/net-snmp/library/snmp_assert.h,   
+      include/net-snmp/library/snmp_debug.h,   
+      include/net-snmp/net-snmp-config.h.in, win32/config.h.borland,   
+      win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: snmplib: Make use of the C99 predefined variable
+   __func__ in addition to the GCC symbol __FUNCTION__ to get the
+   name of the current function
+
+2007-05-18 18:12  hardaker
+
+   * agent/mibgroup/mibII/kernel_linux.h:
+
+   CHANGES: snmpd: patch: 1721096: from mitsuru_chinen: remove
+   unused variable stats from kernel extraction for better
+   portability.
 
 2007-05-18 18:08  hardaker
 
-	* agent/mibgroup/host/hr_filesys.c:
-	  CHANGES: snmpd: patch: 1719254: from "Christan Jung": update
-	  HRFS_ignore list to current linux likelyhoods
+   * agent/mibgroup/host/hr_filesys.c:
+
+   CHANGES: snmpd: patch: 1719254: from "Christan Jung": update
+   HRFS_ignore list to current linux likelyhoods
 
 2007-05-18 18:02  hardaker
 
-	* agent/mibgroup/host/hr_storage.c:
-	  NEWS: snmpd: patch: 1719253: from "Christian Jung": fix
-	  skipNFSInHostResources so it does not break on the second walk of
-	  the table.
+   * agent/mibgroup/host/hr_storage.c:
+
+   NEWS: snmpd: patch: 1719253: from "Christian Jung": fix
+   skipNFSInHostResources so it does not break on the second walk of
+   the table.
+
+2007-05-18 17:55  magfr
+
+   * acconfig.h, include/net-snmp/net-snmp-config.h.in:
+
+   Reran autoheader and adjusted acconfig.h after changes in r16387
+
+2007-05-18 17:54  hardaker
+
+   * agent/mibgroup/mibII/icmp.c:
+
+   CHANGES: snmpd: patch: 1715406: from mitsuru_chinen: registration
+   ordering fixes for icmpStatsTable
+
+2007-05-18 17:46  hardaker
+
+   * agent/mibgroup/mibII/icmp.c:
+
+   CHANGES: snmpd: patch: 1715395: fix icmp table errors in new icmp
+   code
+
+2007-05-18 17:45  hardaker
+
+   * agent/mibgroup/mibII/icmp.c:
+
+   
 
 2007-05-18 15:05  tanders
 
-	* configure, configure.in:
-	  NEWS: AIX: fix default shared library building instead of forcing
-	  static
+   * configure, configure.in:
+
+   NEWS: AIX: fix default shared library building instead of forcing
+   static
+
+2007-05-18 14:18  magfr
+
+   *  acconfig.h, agent/mibgroup/mibII/ip.c, configure, configure.in,   
+      include/net-snmp/net-snmp-config.h.in,   
+      win32/net-snmp/net-snmp-config.h,   
+      win32/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: building: Use AC_CHECK_MEMBERS instead of
+   AC_CHECK_STRUCT_FOR when checking for struct ipstat members in
+   order to make configure.in smaller
 
 2007-05-18 10:22  magfr
 
-	* agent/mibgroup/host/hr_storage.h:
-	  CHANGES: snmpd: Correct the dependency information for
-	  host/hr_storage
+   * agent/mibgroup/host/hr_storage.h:
+
+   CHANGES: snmpd: Correct the dependency information for
+   host/hr_storage
+
+2007-05-18 09:57  magfr
+
+   * testing/RUNTESTS:
+
+   CHANGES: testing: Do not terminate on SIGCHLD since dash and
+   soume bourne shells will exit the main shell when a subshell
+   terminates in that case.
+
+2007-05-18 09:22  tanders
+
+   * apps/snmpusm.c:
+
+   Undoing accidental change committed in r16373.
+
+2007-05-17 23:21  magfr
+
+   * snmplib/snmp_api.c:
+
+   CHANGES: snmplib: PATCH: 1687337: Implement _sess_open in terms
+   of snmp_sess_add
 
 2007-05-17 22:16  magfr
 
-	* agent/agent_trap.c, apps/snmptrap.c, apps/snmptrapd.c,
-	  snmplib/snmpUDPDomain.c, snmplib/snmpUDPIPv6Domain.c,
-	  snmplib/snmp_api.c:
-	  CHANGES: snmpd: PATCH: 1620424: Fix notification sending so that
-	  explicit specification of port 162 should be unnecessary
-	  CHANGES: snmptrapd: PATCH: 1620424: Fix notification reception so
-	  that explicit specification of port 162 should be unnecessary
-	  CHANGES: apps: PATCH: 1620424: Fix notification sending so that
-	  explicit specification of port 162 should be unnecessary
-	  CHANGES: snmplib: PATCH: 1620424: Honor
-	  NETSNMP_DS_LIB_DEFAULT_PORT over the default system
+   *  agent/agent_trap.c, apps/snmptrap.c, apps/snmptrapd.c,   
+      snmplib/snmpUDPDomain.c, snmplib/snmpUDPIPv6Domain.c,   
+      snmplib/snmp_api.c:
+
+   CHANGES: snmpd: PATCH: 1620424: Fix notification sending so that
+   explicit specification of port 162 should be unnecessary
+   CHANGES: snmptrapd: PATCH: 1620424: Fix notification reception so
+   that explicit specification of port 162 should be unnecessary
+   CHANGES: apps: PATCH: 1620424: Fix notification sending so that
+   explicit specification of port 162 should be unnecessary
+   CHANGES: snmplib: PATCH: 1620424: Honor
+   NETSNMP_DS_LIB_DEFAULT_PORT over the default system
 
 2007-05-17 21:53  hardaker
 
-	* agent/mibgroup/ip-forward-mib/data_access/route_linux.c,
-	  agent/mibgroup/ip-mib/data_access/arp_linux.c,
-	  agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c,
-	  agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_data_access.c:
-	  CHANGES: snmpd: patch: 1710632: from mavarley: fix memory leak on
-	  broken container insertions for the ipAddressTable
+   *  agent/mibgroup/ip-forward-mib/data_access/route_linux.c,   
+      agent/mibgroup/ip-mib/data_access/arp_linux.c,   
+      agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c,   
+      agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_data_access.c:
+
+   CHANGES: snmpd: patch: 1710632: from mavarley: fix memory leak on
+   broken container insertions for the ipAddressTable
 
 2007-05-17 18:06  rstory
 
-	* local/mib2c-conf.d/mfd-interactive-setup.m2c:
-	  CHANGES: PATCH: 1719244: fix mfd generating map function
+   * local/mib2c-conf.d/mfd-interactive-setup.m2c:
+
+   CHANGES: PATCH: 1719244: fix mfd generating map function
+
+2007-05-17 17:46  hardaker
+
+   *  agent/mibgroup/mibII/ip.c, agent/mibgroup/mibII/ip.h,   
+      agent/mibgroup/mibII/var_route.c,   
+      agent/mibgroup/mibII/var_route.h:
+
+   NEWS: snmpd: patch: 1708243: from nhorman: implement the
+   ipDefaultRouteTable on linux
 
 2007-05-17 16:31  hardaker
 
-	* configure.in:
-	  NEWS: ports: patch: 1706344: from naylor: fix compilation with
-	  cygwin
+   * configure.in:
+
+   NEWS: ports: patch: 1706344: from naylor: fix compilation with
+   cygwin
 
 2007-05-17 16:22  hardaker
 
-	* agent/mibgroup/ucd-snmp/extensible.c:
-	  NEWS: snmpd: patch: 1700157: from afrika: fixes ordering of exec
-	  tokens in the resulting mib tree
+   * agent/mibgroup/ucd-snmp/extensible.c:
+
+   NEWS: snmpd: patch: 1700157: from afrika: fixes ordering of exec
+   tokens in the resulting mib tree
 
 2007-05-17 15:53  hardaker
 
-	* agent/mibgroup/host/hr_disk.c:
-	  CHANGES: snmpd: patch: 1617255: fix length of the history array
-	  to match code.
+   * agent/mibgroup/host/hr_disk.c:
+
+   CHANGES: snmpd: patch: 1617255: fix length of the history array
+   to match code.
 
 2007-05-17 13:53  hardaker
 
-	* agent/snmpd.c, apps/snmptrapd.c:
-	  CHANGES: snmpd: patch: 1225440: Apply intent of patch: to delay
-	  sighup till it is safe.
-	  CHANGES: snmptrapd: patch: 1225440: Apply intent of patch: to
-	  delay sighup till it is safe.
+   * agent/snmpd.c, apps/snmptrapd.c:
+
+   CHANGES: snmpd: patch: 1225440: Apply intent of patch: to delay
+   sighup till it is safe.
+   CHANGES: snmptrapd: patch: 1225440: Apply intent of patch: to
+   delay sighup till it is safe.
+
+2007-05-17 13:35  magfr
+
+   *  agent/mibgroup/ip-forward-mib/data_access/route.h,   
+      agent/mibgroup/ip-mib/data_access/arp.h,   
+      agent/mibgroup/ip-mib/data_access/ipaddress.h,   
+      agent/mibgroup/ip-mib/data_access/systemstats.h:
+
+   CHANGES: building: Use config_error instead of config_require of
+   a bogus file/#error to generate error messages at configure time.
 
 2007-05-17 04:39  hardaker
 
-	* snmplib/asn1.c:
-	  CHANGES: snmplib: patch: 1645698: fix 64-bit signed integer
-	  encoding
+   * apps/snmpusm.c, snmplib/asn1.c:
+
+   CHANGES: snmplib: patch: 1645698: fix 64-bit signed integer
+   encoding
 
 2007-05-16 23:53  tanders
 
-	* include/net-snmp/system/hpux.h:
-	  CHANGES: HP-UX: HP-UX needs _REENTRANT defined to pick up
-	  strtok_r.
-	  Otherwise, at least for 64-bit code, strtok_r will not work
-	  and will make net-snmp segfault.
+   * include/net-snmp/system/hpux.h:
+
+   CHANGES: HP-UX: HP-UX needs _REENTRANT defined to pick up
+   strtok_r.
+   Otherwise, at least for 64-bit code, strtok_r will not work
+   and will make net-snmp segfault.
+
+2007-05-16 23:39  tanders
+
+   *  agent/mibgroup/mibII/route_headers.h, configure, configure.in,   
+      include/net-snmp/net-snmp-config.h.in:
+
+   fix patch 1625069 (r16365) to not break the build on Solaris
+   2.6/7
+
+2007-05-15 17:33  rstory
+
+   * dist/svnup:
+
+   - add warning if star not available
+   - fix pattern to exclude .svn dirs from tarballs
+
+2007-05-15 15:55  rstory
+
+   * dist/cvsup:
+
+   warn if star not available
 
 2007-05-15 14:36  tanders
 
-	* agent/mibgroup/hardware/memory/memory_solaris.c:
-	  fix typo
+   * agent/mibgroup/hardware/memory/memory_solaris.c:
+
+   fix typo
 
 2007-05-14 21:49  tanders
 
-	* apps/Makefile.in:
-	  add missing CFLAGS to link line
+   * apps/Makefile.in:
+
+   add missing CFLAGS to link line
 
 2007-05-14 21:48  tanders
 
-	* apps/snmpnetstat/Makefile.in:
-	  add missing CFLAGS to link line
+   * apps/snmpnetstat/Makefile.in:
+
+   add missing CFLAGS to link line
+
+2007-05-14 15:57  hardaker
+
+   *  agent/mibgroup/kernel_sunos5.c,   
+      agent/mibgroup/mibII/route_headers.h,   
+      agent/mibgroup/mibII/var_route.c, configure, configure.in,   
+      include/net-snmp/net-snmp-config.h.in:
+
+   CHANGES: snmpd: patch: 1625069: speed improvements for solaris
+   routing table access
 
 2007-05-14 14:50  hardaker
 
-	* agent/snmp_agent.c:
-	  CHANGES: snmpd: patch: 1595568: from cyril_margaria: fix
-	  delegated SET requests from agentx subagents
+   * agent/snmp_agent.c:
+
+   CHANGES: snmpd: patch: 1595568: from cyril_margaria: fix
+   delegated SET requests from agentx subagents
+
+2007-05-14 14:04  hardaker
+
+   * dist/RELEASE-INSTRUCTIONS:
+
+   update to point to wiki and a few more cvs -> svn changes
 
 2007-05-13 14:27  magfr
 
-	* snmplib/snmp_service.c:
-	  CHANGES: snmplib: Read the config parameters defTarget and
-	  defDomain from snmp.conf as well as from <application>.conf
+   * snmplib/snmp_service.c:
+
+   CHANGES: snmplib: Read the config parameters defTarget and
+   defDomain from snmp.conf as well as from <application>.conf
+
+2007-05-12 11:17  magfr
+
+   * snmplib/mib.c:
+
+   CHANGES: snmplib: Deallocate the _mibindexes cache in
+   shutdown_mib to make for a cleaner exit of the library
 
 2007-05-12 11:14  magfr
 
-	* snmplib/mib.c:
-	  CHANGES: snmplib: Deallocate the confmibs and confmibdirs
-	  variables in shutdown_mib to make for a cleaner exit of the
-	  library
+   * snmplib/mib.c:
+
+   CHANGES: snmplib: Deallocate the confmibs and confmibdirs
+   variables in shutdown_mib to make for a cleaner exit of the
+   library
 
 2007-05-11 21:06  magfr
 
-	* agent/mibgroup/agentx/agentx_config.c:
-	  CHANGES: snmpd: PATCH: 1687336: Start using the enhanced
-	  read_config interface
+   * agent/mibgroup/agentx/agentx_config.c:
+
+   CHANGES: snmpd: PATCH: 1687336: Start using the enhanced
+   read_config interface
 
 2007-05-11 20:33  magfr
 
-	* snmplib/read_config.c:
-	  PATCH 1687329: Applied part 2 of the patch - When registering
-	  multiple premib handlers only the last one was registered premib,
-	  the others were registerd at the normal time. This patch puts all
-	  registration in one function that takes the problematic value as
-	  an argument and makes the old functions thin wrappers of the new
-	  one
+   * snmplib/read_config.c:
+
+   PATCH 1687329: Applied part 2 of the patch - When registering
+   multiple premib handlers only the last one was registered premib,
+   the others were registerd at the normal time. This patch puts all
+   registration in one function that takes the problematic value as
+   an argument and makes the old functions thin wrappers of the new
+   one
 
 2007-05-11 20:24  magfr
 
-	* snmplib/read_config.c:
-	  CHANGE: snmplib: PATCH 1687329: Applied part 3 of the patch - use
-	  the same algorithm to determine what to unregister as is used to
-	  determine what to regster
+   * snmplib/read_config.c:
+
+   CHANGE: snmplib: PATCH 1687329: Applied part 3 of the patch - use
+   the same algorithm to determine what to unregister as is used to
+   determine what to regster
 
 2007-05-11 16:32  magfr
 
-	* agent/mibgroup/host/hr_proc.c:
-	  Don't log host/hr_proc events in the snmpd domain
+   * agent/mibgroup/host/hr_proc.c:
+
+   Don't log host/hr_proc events in the snmpd domain
 
 2007-05-11 16:27  magfr
 
-	* agent/helpers/cache_handler.c:
-	  Decorate more debug lines with the tag that controls the log
+   * agent/helpers/cache_handler.c:
+
+   Decorate more debug lines with the tag that controls the log
 
 2007-05-11 15:07  dts12
 
-	* agent/mibgroup/hardware/memory/memory_solaris.c:
-	  CHANGES: snmpd: BUG: 1628613: Restore memTotalFree.0 on Solaris
+   * agent/mibgroup/hardware/memory/memory_solaris.c:
+
+   CHANGES: snmpd: BUG: 1628613: Restore memTotalFree.0 on Solaris
 
 2007-05-10 21:52  tanders
 
-	* Makefile.in, python/setup.py:
-	  NEWS: python: PATCH: 1716114: Let python build in source tree
-	  Patch provided by Jochen Friedrich (Debian patch #38).
+   * Makefile.in, python/setup.py:
+
+   NEWS: python: PATCH: 1716114: Let python build in source tree
+   Patch provided by Jochen Friedrich (Debian patch #38).
 
 2007-05-10 05:18  magfr
 
-	* snmplib/read_config.c:
-	  PATCH 1687329: Applied part 1 of the patch - lessens the scope of
-	  the ltmp2 variable
+   * snmplib/read_config.c:
+
+   PATCH 1687329: Applied part 1 of the patch - lessens the scope of
+   the ltmp2 variable
 
 2007-05-09 23:57  tanders
 
-	* README.irix:
-	  document optimized IRIX cpu stats
+   * README.irix:
+
+   document optimized IRIX cpu stats
 
 2007-05-09 23:49  tanders
 
-	* agent/mibgroup/hardware/cpu.h,
-	  agent/mibgroup/hardware/cpu/cpu_sysinfo.c,
-	  agent/mibgroup/hardware/cpu/cpu_sysinfo.h:
-	  NEWS: irix: PATCH: 1709748: Optimized IRIX cpu stats
+   *  agent/mibgroup/hardware/cpu.h,   
+      agent/mibgroup/hardware/cpu/cpu_sysinfo.c,   
+      agent/mibgroup/hardware/cpu/cpu_sysinfo.h:
 
-2007-05-09 22:16  tanders
+   NEWS: irix: PATCH: 1709748: Optimized IRIX cpu stats
 
-	* agent/mibgroup/agent/extend.c:
-	  Fix problems with single-line extend scripts.
-	  (fix typo in r16332 for 5.4.x)
+2007-05-09 21:23  rstory
 
-2007-05-09 01:10  alex_b
+   * dist/cvsshow:
 
-	* win32/libsnmp_dll/libsnmp.def, win32/libsnmp_dll/libsnmp.def.in:
-	  Win32 build fixes.
+   update to show svn repo too
+
+2007-05-09 15:39  tanders
+
+   * agent/mibgroup/mibII/icmp.c:
+
+   icmpStatsTable is only implemented for Linux
 
 2007-05-08 19:48  magfr
 
-	* agent/snmp_agent.c:
-	  Revert mistakenly committed extra trace logs
+   * agent/snmp_agent.c:
+
+   Revert mistakenly committed extra trace logs
 
 2007-05-07 20:46  hardaker
 
-	* perl/agent/default_store/default_store.pm,
-	  perl/agent/default_store/default_store.xs,
-	  perl/agent/default_store/test.pl:
-	  update agent::default_store perl module for new defs
+   *  perl/agent/default_store/default_store.pm,   
+      perl/agent/default_store/default_store.xs,   
+      perl/agent/default_store/test.pl:
+
+   update agent::default_store perl module for new defs
+
+2007-05-07 20:24  hardaker
+
+   * dist/patme:
+
+   more svn conversion fixes
 
 2007-05-07 20:23  hardaker
 
-	* agent/agent_read_config.c, agent/snmp_agent.c,
-	  include/net-snmp/agent/ds_agent.h, man/snmpd.conf.5.def:
-	  NEWS: snmpd: BUG: 1712988: default and configurable maximum
-	  number of varbinds returnable to a GETBULK request
+   *  agent/agent_read_config.c, agent/snmp_agent.c,   
+      include/net-snmp/agent/ds_agent.h, man/snmpd.conf.5.def:
+
+   NEWS: snmpd: BUG: 1712988: default and configurable maximum
+   number of varbinds returnable to a GETBULK request
+
+2007-05-07 20:05  hardaker
+
+   * dist/patme:
+
+   rename of branch dirs
+
+2007-05-07 16:14  hardaker
+
+   * dist/patme:
+
+   attempted (untested) update
+
+2007-05-07 13:55  rstory
+
+   * dist/svnup:
+
+   don't delete tarball if scp fails
 
 2007-05-04 20:27  tanders
 
-	* perl/SNMP/SNMP.xs:
-	  CHANGES: perl: fix SNMP SET for IP addresses on 64-bit
+   * perl/SNMP/SNMP.xs:
+
+   CHANGES: perl: fix SNMP SET for IP addresses on 64-bit
 
 2007-05-04 10:22  tanders
 
-	* Makefile.in:
-	  install dragonfly.h
+   * Makefile.in:
+
+   install dragonfly.h
 
 2007-05-03 23:01  tanders
 
-	* include/net-snmp/system/dragonfly.h:
-	  CHANGES: BUG: 1710910: initial support for DragonFly BSD
+   * include/net-snmp/system/dragonfly.h:
+
+   CHANGES: BUG: 1710910: initial support for DragonFly BSD
 
 2007-05-03 22:10  tanders
 
-	* perl/SNMP/SNMP.xs:
-	  CHANGES: perl: fix SNMP SET for IP addresses on 64-bit
-	  Patch proposed by Jeff Lange.
+   * perl/SNMP/SNMP.xs:
+
+   CHANGES: perl: fix SNMP SET for IP addresses on 64-bit
+   Patch proposed by Jeff Lange.
+
+2007-05-03 16:00  tanders
+
+   * agent/mibgroup/mibII/icmp.c:
+
+   build fix (e.g. for early AIX): use uint32_t i.s.o. __uint32_t
 
 2007-05-02 13:13  dts12
 
-	* agent/mibgroup/agent/extend.c:
-	  Fix problems with single-line extend scripts.
+   * agent/mibgroup/agent/extend.c:
+
+   Fix problems with single-line extend scripts.
+
+2007-05-01 19:51  rstory
+
+   * agent/mibgroup/ip-mib/data_access/ipaddress_linux.c:
+
+   - test for IFA_F_TEMPORARY before using
+   - remove redundant ifdef
 
 2007-05-01 11:34  dts12
 
-	* apps/snmptrapd_handlers.c:
-	  CHANGES: snmptrapd: Support for forwarding traps by OID subtree.
-	  (Consistent with subtree-based script processing).
+   * apps/snmptrapd_handlers.c:
+
+   CHANGES: snmptrapd: Support for forwarding traps by OID subtree.
+   (Consistent with subtree-based script processing).
+
+2007-04-30 14:51  dts12
+
+   * agent/mibgroup/mibII/kernel_linux.c:
+
+   CHANGES: snmpd: PATCH: 1703004: Consolidate snmp6 handling.
+   Patch supplied by Neil Horman, plus some extra tidying up.
+
+2007-04-30 14:33  dts12
+
+   * agent/mibgroup/mibII/icmp.c, agent/mibgroup/mibII/icmp.h:
+
+   CHANGES: snmpd: PATCH: 1702366: Support for icmpStatsTable
+   Patch provided by Neil Horman
+
+2007-04-30 14:31  dts12
+
+   *  agent/mibgroup/mibII/ipv6.c, agent/mibgroup/mibII/kernel_linux.c, 
+        agent/mibgroup/mibII/kernel_linux.h:
+
+   CHANGES: snmpd: PATCH: 1702361: Read stats from /proc/net/snmp6
+
+2007-04-30 14:14  dts12
+
+   *  agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c,   
+      agent/mibgroup/ip-mib/data_access/ipaddress_linux.c:
+
+   Fix compilation problems when IPv6 support is not enabled.
 
 2007-04-30 13:26  dts12
 
-	* README.agent-mibs, agent/mibgroup/mibII/setSerialNo.c,
-	  agent/mibgroup/mibII/setSerialNo.h:
-	  CHANGES: snmpd: PATCH: 1700737: Tidy up setSerialNo
-	  implementations.
+   *  README.agent-mibs, agent/mibgroup/mibII/setSerialNo.c,   
+      agent/mibgroup/mibII/setSerialNo.h:
+
+   CHANGES: snmpd: PATCH: 1700737: Tidy up setSerialNo
+   implementations.
 
 2007-04-30 13:06  dts12
 
-	* agent/helpers/cache_handler.c:
-	  CHANGES: snmpd: PATCH: 1700732: Fix debug output statements.
+   * agent/helpers/cache_handler.c:
+
+   CHANGES: snmpd: PATCH: 1700732: Fix debug output statements.
 
 2007-04-30 13:02  dts12
 
-	* agent/mibgroup/ucd-snmp/extensible.c:
-	  CHANGES: snmpd: PATCH: 1700730: Remove unused extern declaration.
+   * agent/mibgroup/ucd-snmp/extensible.c:
+
+   CHANGES: snmpd: PATCH: 1700730: Remove unused extern declaration.
 
 2007-04-30 11:32  dts12
 
-	* agent/helpers/instance.c:
-	  CHANGES: snmpd: PATCH: 1698184: Register non-default context
-	  integers as writable.
-	  Patch provided by Mark Naylor.
+   * agent/helpers/instance.c:
+
+   CHANGES: snmpd: PATCH: 1698184: Register non-default context
+   integers as writable.
+   Patch provided by Mark Naylor.
+
+2007-04-30 11:26  dts12
+
+   *  agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c,   
+      agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.h,   
+      agent/mibgroup/ip-mib/data_access/ipaddress_linux.c,   
+      agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c:
+
+   CHANGES: snmpd: PATCH: 169817: Improved RFC 4293 support.
+   Includes non-unicast and randomly chosen IP addresses.
+   Patch provided by Varun Chandramohan
 
 2007-04-30 11:04  dts12
 
-	* agent/mibgroup/ip-mib/data_access/ipaddress_common.c:
-	  CHANGES: snmpd: PATCH: 1692768: Fix copying of non-octet-aligned
-	  IP address prefixes.
+   * agent/mibgroup/ip-mib/data_access/ipaddress_common.c:
+
+   CHANGES: snmpd: PATCH: 1692768: Fix copying of non-octet-aligned
+   IP address prefixes.
+
+2007-04-30 10:50  dts12
+
+   *  agent/mibgroup/tcp-mib/data_access/tcpConn_linux.c,   
+      agent/mibgroup/udp-mib/data_access/udp_endpoint_linux.c,   
+      agent/mibgroup/udp-mib/udpEndpointTable/udpEndpointTable.c,   
+      agent/mibgroup/udp-mib/udpEndpointTable/udpEndpointTable.h,   
+      agent/mibgroup/udp-mib/udpEndpointTable/udpEndpointTable_data_access.c,
+         agent/mibgroup/util_funcs.c, agent/mibgroup/util_funcs.h,   
+      include/net-snmp/data_access/udp_endpoint.h:
+
+   CHANGES: snmpd: PATCH: 1670511: Implement network connection
+   process ID objects.
+   Patch provided by Varun Chandramohan
+
+2007-04-30 10:46  dts12
+
+   * include/net-snmp/library/snmp_api.h:
+
+   Fix declaration of snmp_sess_read_extd()
 
 2007-04-30 10:25  dts12
 
-	* snmplib/fd_event_manager.c:
-	  CHANGES: snmplib: PATCH: 1687325: Fix problem with operator
-	  precedence.
+   * snmplib/fd_event_manager.c:
+
+   CHANGES: snmplib: PATCH: 1687325: Fix problem with operator
+   precedence.
+
+2007-04-30 10:21  dts12
+
+   * include/net-snmp/library/snmp_api.h:
+
+   CHANGES: snmplib: PATCH: 1687319: Declare snmp_sess_read_extd()
+
+2007-04-30 10:14  dts12
+
+   * snmplib/snmp_api.c:
+
+   CHANGES: snmplib: PATCH: 1687318: Make _sess_selpol_info static.
+
+2007-04-30 10:09  dts12
+
+   * snmplib/snmp_api.c:
+
+   CHANGES: snmplib: PATCH: 1687317: Remove an unused local variable
 
 2007-04-30 10:07  dts12
 
-	* snmplib/snmpUnixDomain.c, snmplib/snmp_api.c:
-	  CHANGES: snmplib: PATCH: 1687316: Don't drop const from casts.
+   * snmplib/snmpUnixDomain.c, snmplib/snmp_api.c:
+
+   CHANGES: snmplib: PATCH: 1687316: Don't drop const from casts.
+
+2007-04-27 10:21  dts12
+
+   * agent/mibgroup/ucd-snmp/dlmod.c:
+
+   Bring dynamic module unload processing more into line with
+   "normal" MIB modules. Suggested by Magnus Fromreide.
+   See coders thread "shutdown_foo or deinit_foo".
+
+2007-04-27 10:17  dts12
+
+   * dist/RELEASE-INSTRUCTIONS:
+
+   Update post-release announcement instructions.
 
 2007-04-24 12:35  dts12
 
-	* agent/mibgroup/agent/extend.c:
-	  Fix incomplete OID handling of single-line extend scripts.
-	  Reported by Max on coders list, 7th April. See thread
-	  "... segfault .. when attempting SNMP GET on extend or exec item"
+   * agent/mibgroup/agent/extend.c:
+
+   Fix incomplete OID handling of single-line extend scripts.
+   Reported by Max on coders list, 7th April. See thread
+   "... segfault .. when attempting SNMP GET on extend or exec item"
 
 2007-04-20 08:30  dts12
 
-	* man/snmpd.conf.5.def:
-	  Document the behaviour of a load threshold of 0.
-	  Reported by Fong Tsui.
+   * man/snmpd.conf.5.def:
+
+   Document the behaviour of a load threshold of 0.
+   Reported by Fong Tsui.
 
 2007-04-20 08:21  dts12
 
-	* mibs/UCD-SNMP-MIB.txt:
-	  Long-term load average is calculated over 15 minutes, not 10.
-	  Reported by Fong Tsui
+   * mibs/UCD-SNMP-MIB.txt:
+
+   Long-term load average is calculated over 15 minutes, not 10.
+   Reported by Fong Tsui
+
+2007-04-19 12:53  dts12
+
+   * dist/RELEASE-INSTRUCTIONS:
+
+   Tweak ChangeLog instructions for SVN
 
 2007-04-10 14:16  dts12
 
-	* perl/SNMP/SNMP.xs:
-	  Detect OID retracking (as well as simple repetitions) when
-	  bulkwalking an OID tree.
-	  See users thread "missing indices in bulkwalk result".
+   * perl/SNMP/SNMP.xs:
+
+   Detect OID retracking (as well as simple repetitions) when
+   bulkwalking an OID tree.
+   See users thread "missing indices in bulkwalk result".
 
 2007-04-10 11:49  dts12
 
-	* include/net-snmp/system/mingw32.h:
-	  Clarify copyright status of Win32 API definitions.
+   * include/net-snmp/system/mingw32.h:
+
+   Clarify copyright status of Win32 API definitions.
 
 2007-04-10 11:27  dts12
 
-	* include/net-snmp/system/dynix.h:
-	  Clarify copyright status of BSD-derived TCPTV* definitions.
+   * include/net-snmp/system/dynix.h:
 
-2007-04-03 08:59  tanders
+   Clarify copyright status of BSD-derived TCPTV* definitions.
 
-	* agent/mibgroup/smux/smux.c:
-	  fix syntax error introduced by last patch
+2007-04-09 14:02  rstory
+
+   * dist/svnup:
+
+   - remove debugging
+   - check rc for tar, gzip and scp steps
+
+2007-04-06 18:38  rstory
+
+   * dist/svnup:
+
+   svn equivalent of cvsup
 
 2007-04-03 08:54  dts12
 
-	* man/snmpd.conf.5.def:
-	  Emphasise the use of SNMPv3 in DisMan monitoring.
-	  Fix the syntax of non-existance/value-change tests.
+   * man/snmpd.conf.5.def:
+
+   Emphasise the use of SNMPv3 in DisMan monitoring.
+   Fix the syntax of non-existance/value-change tests.
 
 2007-04-02 14:55  dts12
 
-	* agent/mibgroup/ucd-snmp/disk.c:
-	  CHANGES: snmpd: BUG: 1046327: Reset "includeAllDisks" flag when
-	  reloading.
+   * agent/mibgroup/ucd-snmp/disk.c:
+
+   CHANGES: snmpd: BUG: 1046327: Reset "includeAllDisks" flag when
+   reloading.
 
 2007-04-02 14:45  dts12
 
-	* agent/mibgroup/ucd-snmp/disk.c:
-	  CHANGES: snmpd: BUG: 1602286: Don't let table holes block later
-	  rows.
+   * agent/mibgroup/ucd-snmp/disk.c:
+
+   CHANGES: snmpd: BUG: 1602286: Don't let table holes block later
+   rows.
 
 2007-04-02 13:51  dts12
 
-	* agent/mibgroup/host/hr_swrun.c:
-	  CHANGES: snmpd: BUG: 1073782: Restore PerfStat values for FreeBSD
-	  5.x systems.
-	  It's unclear why the "new" calculation was a) proposed, b)
-	  withdrawn,
-	  and c) what was wrong with the previous calculation (which seems
-	  to
-	  match the output of 'ps')
+   * agent/mibgroup/host/hr_swrun.c:
+
+   CHANGES: snmpd: BUG: 1073782: Restore PerfStat values for FreeBSD
+   5.x systems.
+   It's unclear why the "new" calculation was a) proposed, b)
+   withdrawn,
+   and c) what was wrong with the previous calculation (which seems
+   to
+   match the output of 'ps')
 
 2007-04-02 13:06  dts12
 
-	* agent/mibgroup/smux/smux.c:
-	  CHANGES: snmpd: BUG: 902610: Don't discard pending data following
-	  a TRAP.
+   * agent/mibgroup/smux/smux.c:
+
+   CHANGES: snmpd: BUG: 902610: Don't discard pending data following
+   a TRAP.
 
 2007-04-02 12:56  dts12
 
-	* agent/mibgroup/smux/smux.c:
-	  CHANGES: snmpd: BUG: 902801: Fix ordering of SMUX-registered
-	  subtrees.
+   * agent/mibgroup/smux/smux.c:
+
+   CHANGES: snmpd: BUG: 902801: Fix ordering of SMUX-registered
+   subtrees.
 
 2007-04-02 12:35  dts12
 
-	* agent/mibgroup/mibII/vacm_vars.c:
-	  CHANGES: snmpd: BUG: 1685067: More precise handling of
-	  SNMPv3-admin MIB tables.
-	  This actually fixes three separate problems:
-	  * A GET request for 'vacmGroupName.{group}.0.{anything}' will
-	  succeed
-	  (since the 0 subid acts as a null-terminator for the group name).
-	  * A GET request for 'vacmViewTreeFamilyType."_none".1' will
-	  succeed
-	  (implicitly adding the subid 0 to the incomplete OID index value)
-	  * A GET request for 'vacmAccessStatus."group"."".3.4' will
-	  succeed
-	  (since VACM checks accept the given security level *or*higher*)
+   * agent/mibgroup/mibII/vacm_vars.c:
 
-2007-04-02 12:26  dts12
+   CHANGES: snmpd: BUG: 1685067: More precise handling of
+   SNMPv3-admin MIB tables.
+   This actually fixes three separate problems:
+   *  A GET request for 'vacmAccessStatus."group"."".3.4' will   
+      succeed    (since VACM checks accept the given security level
+      *or*higher*)  2007-04-02 12:26  dts12
 
-	* agent/mibgroup/host/hr_storage.c:
-	  Check that GET requests match a valid OID.
-	  (Otherwise a request for hrStorage{Column}.{index}.{anything}
-	  will ignore the extra subids, and return success)
+
+   * agent/mibgroup/host/hr_storage.c:
+
+   Check that GET requests match a valid OID.
+   (Otherwise a request for hrStorage{Column}.{index}.{anything}
+   will ignore the extra subids, and return success)
 
 2007-04-02 12:21  dts12
 
-	* agent/mibgroup/disman/event/mteObjectsTable.c:
-	  Prevent crash when walking (invalid?) Event-MIB Objects Table.
+   * agent/mibgroup/disman/event/mteObjectsTable.c:
+
+   Prevent crash when walking (invalid?) Event-MIB Objects Table.
 
 2007-04-02 11:30  dts12
 
-	* dist/makerelease:
-	  Fix a couple of typos in the re-worked makerelease script.
+   * dist/makerelease:
+
+   Fix a couple of typos in the re-worked makerelease script.
 
 2007-03-29 12:14  tanders
 
-	* configure, configure.in:
-	  fix syntax error ("==" is bad)
+   * configure, configure.in:
+
+   fix syntax error ("==" is bad)
+
+2007-03-27 08:55  dts12
+
+   * acinclude.m4, configure, configure.in:
+
+   Read user-prompted values from original stdin (not /dev/null)
 
 2007-03-27 08:38  dts12
 
-	* configure, configure.in:
-	  Accept '2c' as a valid response when choosing the default version
+   * configure, configure.in:
+
+   Accept '2c' as a valid response when choosing the default version
 
 2007-03-27 08:29  dts12
 
-	* configure, configure.in:
-	  CHANGES: configure: BUG: 1567324: Clarify prompting for
-	  user-supplied values.
-	  Now only remembers (and uses) previous values when explicitly
-	  told to do so,
-	  e.g. configure -C
+   * configure, configure.in:
 
-2007-03-25 22:32  dts12
+   CHANGES: configure: BUG: 1567324: Clarify prompting for
+   user-supplied values.
+   Now only remembers (and uses) previous values when explicitly
+   told to do so,
+   e.g. configure -C
 
-	* local/mib2c.container.conf, local/mib2c.iterate.conf,
-	  local/mib2c.table_data.conf:
-	  Variable-length string values are more likely than fixed length.
+2007-03-27 08:23  dts12
+
+   * configure, configure.in:
+
+   Fix inconsistency in patch #1627049 - <poll.h> vs <sys/poll.h>
+
+2007-03-25 22:31  dts12
+
+   *  local/mib2c.container.conf, local/mib2c.iterate.conf,   
+      local/mib2c.table_data.conf:
+
+   Variable-length string values are more likely than fixed length.
 
 2007-03-25 22:28  dts12
 
-	* local/mib2c.array-user.conf:
-	  CHANGES: mib2c: BUG: 833673: More focused size checks.
+   * local/mib2c.array-user.conf:
+
+   CHANGES: mib2c: BUG: 833673: More focused size checks.
 
 2007-03-25 21:25  dts12
 
-	* agent/snmp_agent.c:
-	  CHANGES: snmpd: BUG: 1677063: Check for failed malloc calls.
+   * agent/snmp_agent.c:
+
+   CHANGES: snmpd: BUG: 1677063: Check for failed malloc calls.
 
 2007-03-25 19:03  dts12
 
-	* agent/mibgroup/mibII/route_write.c:
-	  Check SET requests against the correct type (IP Address != Octet
-	  Str)
+   * agent/mibgroup/mibII/route_write.c:
 
-2007-03-25 18:58  dts12
+   Check SET requests against the correct type (IP Address != Octet
+   Str)
 
-	* agent/mibgroup/snmpv3/usmUser.c:
-	  CHANGES: snmpd: BUG: 1685081: Check for valid OID on Free/Undo
-	  passes.
+2007-03-25 18:55  dts12
+
+   * agent/mibgroup/snmpv3/usmUser.c:
+
+   CHANGES: snmpd: BUG: 1685081: Check for valid OID on Free/Undo
+   passes.
 
 2007-03-23 09:44  dts12
 
-	* include/net-snmp/library/snmp_api.h:
-	  CHANEGS: snmplib: BUG: 1686384: Document non-use of 'remote_port'
-	  field.
+   * include/net-snmp/library/snmp_api.h:
+
+   CHANEGS: snmplib: BUG: 1686384: Document non-use of 'remote_port'
+   field.
 
 2007-03-23 09:19  dts12
 
-	* local/mib2c-conf.d/mfd-persistence.m2i:
-	  Allow space for external indexes when saving table entries.
-	  (See patch #1642255)
+   * local/mib2c-conf.d/mfd-persistence.m2i:
 
-2007-03-23 09:15  dts12
+   Allow space for external indexes when saving table entries.
+   (See patch #1642255)
 
-	* agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable_interface.c:
-	  CHANGES: snmpd: PATCH: 1642255: Handle saving long
-	  snmpNotifyFilterTable entries.
+2007-03-23 09:14  dts12
+
+   * 
+      agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable_interface.c:
+
+   CHANGES: snmpd: PATCH: 1642255: Handle saving long
+   snmpNotifyFilterTable entries.
+
+2007-03-23 09:09  dts12
+
+   *  agent/agent_read_config.c, agent/mibgroup/mibII/vacm_conf.c,   
+      include/net-snmp/library/callback.h, snmplib/read_config.c:
+
+   CHANGES: snmplib: PATCH: 1681977: Add callbacks prior to reading
+   config.
 
 2007-03-23 09:06  dts12
 
-	* agent/mibgroup/udp-mib/data_access/udp_endpoint_linux.c:
-	  CHANGES: snmpd: PATCH: 1676478: fix udpEndpointRemoteAddress
-	  CHANGES: snmpd: BUG: 1676476: fix udpEndpointRemoteAddress
+   * agent/mibgroup/udp-mib/data_access/udp_endpoint_linux.c:
+
+   CHANGES: snmpd: PATCH: 1676478: fix udpEndpointRemoteAddress
+   CHANGES: snmpd: BUG: 1676476: fix udpEndpointRemoteAddress
 
 2007-03-23 09:01  dts12
 
-	* snmplib/snmp_api.c:
-	  CHANGES: snmplib: PATCH: 1653670: Consistent SNMPv3 behaviour
-	  when opening sessions.
+   * snmplib/snmp_api.c:
+
+   CHANGES: snmplib: PATCH: 1653670: Consistent SNMPv3 behaviour
+   when opening sessions.
+
+2007-03-23 08:57  dts12
+
+   *  configure, configure.in, include/net-snmp/library/snmp_api.h,   
+      include/net-snmp/net-snmp-config.h.in, snmplib/snmp_api.c:
+
+   CHANGES: snmplib: PATCH: 1627049: New API to handle large numbers
+   of file descriptors.
 
 2007-03-22 19:14  dts12
 
-	* snmplib/read_config.c:
-	  CHANGES: snmplib: PATCH: 1681030: Better handling of empty
-	  apptype configs.
+   * snmplib/read_config.c:
+
+   CHANGES: snmplib: PATCH: 1681030: Better handling of empty
+   apptype configs.
 
 2007-03-22 19:12  dts12
 
-	* agent/mibgroup/smux/smux.c, agent/mibgroup/smux/smux.h,
-	  agent/snmpd.c:
-	  CHANGES: snmpd: PATCH: 1678788: Better handling of SMUX socket
-	  descriptors.
+   *  agent/mibgroup/smux/smux.c, agent/mibgroup/smux/smux.h,   
+      agent/snmpd.c:
+
+   CHANGES: snmpd: PATCH: 1678788: Better handling of SMUX socket
+   descriptors.
 
 2007-03-22 19:09  dts12
 
-	* agent/mibgroup/udp-mib/data_access/udp_endpoint_linux.c:
-	  CHANGES: snmpd: PATCH: 1683054: set udpEndpointInstance to
-	  identify different processes.
+   * agent/mibgroup/udp-mib/data_access/udp_endpoint_linux.c:
+
+   CHANGES: snmpd: PATCH: 1683054: set udpEndpointInstance to
+   identify different processes.
 
 2007-03-21 12:35  dts12
 
-	* win32/libsnmp_dll/libsnmp.def, win32/libsnmp_dll/libsnmp.def.in:
-	  Declare OID constants as such (rather than API calls).
-	  Proposed by Alex Burger
+   * win32/libsnmp_dll/libsnmp.def, win32/libsnmp_dll/libsnmp.def.in:
 
-2007-03-20 20:08  rstory
+   Declare OID constants as such (rather than API calls).
+   Proposed by Alex Burger
 
-	* agent/mibgroup/mibII/kernel_linux.c:
-	  NEWS: snmpd: PATCH: 1666737: include ipv6 counts in
-	  udpInDatagrams, udpNoPorts, udpInErrors, udpOutDatagrams
+2007-03-20 20:07  rstory
+
+   * agent/mibgroup/mibII/kernel_linux.c:
+
+   NEWS: snmpd: PATCH: 1666737: include ipv6 counts in
+   udpInDatagrams, udpNoPorts, udpInErrors, udpOutDatagrams
 
 2007-03-19 22:09  tanders
 
-	* agent/mibgroup/hardware/cpu/cpu_pcp.c:
-	  use pmFreeResult() instead of free()
+   * agent/mibgroup/hardware/cpu/cpu_pcp.c:
 
-2007-03-17 00:25  tanders
+   use pmFreeResult() instead of free()
 
-	* agent/mibgroup/agentx/subagent.h,
-	  agent/mibgroup/disman/mteTriggerTable.h,
-	  agent/mibgroup/utilities/iquery.h, configure, configure.in:
-	  CHANGES: build: PATCH: 1681073: #ifdef based config_error instead
-	  of special cases in configure
-	  Backport from MAIN.
+2007-03-19 09:39  tanders
+
+   * agent/mibgroup/ucd-snmp/pass_persist.c:
+
+   get rid of C++ comments
 
 2007-03-16 14:04  dts12
 
-	* dist/changelogfix, dist/makerelease, local/Version-Munge.pl:
-	  Convert build system to SVN version.
+   *  dist/RELEASE-INSTRUCTIONS, dist/changelogfix, dist/makerelease,   
+      local/Version-Munge.pl:
+
+   Convert build system to SVN version.
+
+2007-03-15 10:59  tanders
+
+   *  agent/mibgroup/agentx/subagent.h,   
+      agent/mibgroup/disman/mteTriggerTable.h,   
+      agent/mibgroup/utilities/iquery.h, configure, configure.in:
+
+   CHANGES: build: PATCH: 1681073: #ifdef based config_error instead
+   of special cases in configure
+
+2007-03-15 10:47  tanders
+
+   * agent/mibgroup/ucd-snmp/pass.c:
+
+   get rid of C++ comments
 
 2007-03-14 23:31  tanders
 
-	* README.irix, agent/mibgroup/hardware/cpu.h,
-	  agent/mibgroup/hardware/cpu/cpu_pcp.c,
-	  agent/mibgroup/hardware/cpu/cpu_pcp.h:
-	  NEWS: IRIX: PATCH: 1675869: from bbice: CPU statistics for IRIX
-	  based on PCP
+   *  README.irix, agent/mibgroup/hardware/cpu.h,   
+      agent/mibgroup/hardware/cpu/cpu_pcp.c,   
+      agent/mibgroup/hardware/cpu/cpu_pcp.h:
+
+   NEWS: IRIX: PATCH: 1675869: from bbice: CPU statistics for IRIX
+   based on PCP
+
+2007-03-14 22:09  tanders
+
+   *  agent/helpers/all_helpers.c, agent/helpers/bulk_to_next.c,   
+      agent/helpers/cache_handler.c, agent/helpers/debug_handler.c,   
+      agent/helpers/instance.c, agent/helpers/null.c,   
+      agent/helpers/old_api.c, agent/helpers/read_only.c,   
+      agent/helpers/row_merge.c, agent/helpers/scalar.c,   
+      agent/helpers/scalar_group.c, agent/helpers/serialize.c,   
+      agent/helpers/stash_cache.c, agent/helpers/stash_to_next.c,   
+      agent/helpers/table.c, agent/helpers/table_array.c,   
+      agent/helpers/table_container.c, agent/helpers/table_data.c,   
+      agent/helpers/table_dataset.c, agent/helpers/table_iterator.c,   
+      agent/helpers/table_tdata.c, agent/helpers/watcher.c:
+
+   CHANGES: snmpd: PATCH: 1681043: from magfr: clean up helper
+   includes
+
+2007-03-14 21:54  tanders
+
+   * net-snmp-config.in:
+
+   CHANGES: PATCH: 1681035: from magfr: improve net-snmp-config
+   /bin/sh compatibility
+
+2007-03-14 18:31  tanders
+
+   * net-snmp-config.in:
+
+   CHANGES: build: PATCH: 1678300: from magfr: compile-subagent
+   doesn't call shutdown_ methods
 
 2007-03-14 16:12  dts12
 
-	* agent/mibgroup/target/target.c:
-	  CHANGES: snmpd: PATCHES: 1644280: Don't automatically probe for
-	  v3 EngineIDs.
+   * agent/mibgroup/target/target.c:
+
+   CHANGES: snmpd: PATCHES: 1644280: Don't automatically probe for
+   v3 EngineIDs.
 
 2007-03-13 10:26  dts12
 
-	* agent/mibgroup/ucd-snmp/disk.c:
-	  Check for zero-size pseudo-filesystems. Report them as empty
-	  rather than full, so they won't be treated as an error.
+   * agent/mibgroup/ucd-snmp/disk.c:
 
-2007-03-13 09:11  tanders
-
-	* snmplib/mib.c:
-	  Back out changes to branches done in SVN 15953 (patch 1678302)
-	  because they are only appropriate for MAIN
+   Check for zero-size pseudo-filesystems. Report them as empty
+   rather than full, so they won't be treated as an error.
 
 2007-03-13 05:59  tanders
 
-	* agent/mibgroup/hardware/cpu/cpu.h:
-	  CHANGES: PATCH: 1678305: from magfr: Deallocate the cache in
-	  hardware/cpu/cpu on shutdown (header part)
+   * agent/mibgroup/hardware/cpu/cpu.h:
+
+   CHANGES: PATCH: 1678305: from magfr: Deallocate the cache in
+   hardware/cpu/cpu on shutdown (header part)
 
 2007-03-12 23:09  tanders
 
-	* agent/mibgroup/notification-log-mib/notification_log.c,
-	  agent/mibgroup/notification-log-mib/notification_log.h:
-	  CHANGES: PATCH: 1678306: from magfr: Deallocate the log in
-	  notification-log-mib/notification_log
+   *  agent/mibgroup/notification-log-mib/notification_log.c,   
+      agent/mibgroup/notification-log-mib/notification_log.h:
+
+   CHANGES: PATCH: 1678306: from magfr: Deallocate the log in
+   notification-log-mib/notification_log
 
 2007-03-12 23:04  tanders
 
-	* agent/mibgroup/hardware/cpu/cpu.c:
-	  CHANGES: PATCH: 1678305: from magfr: Deallocate the cache in
-	  hardware/cpu/cpu on shutdown
+   * agent/mibgroup/hardware/cpu/cpu.c:
+
+   CHANGES: PATCH: 1678305: from magfr: Deallocate the cache in
+   hardware/cpu/cpu on shutdown
 
 2007-03-12 22:57  tanders
 
-	* snmplib/mib.c:
-	  CHANGES: PATCH: 1678302: from magfr: netsnmp_mibindex_load leaks
-	  memory
+   * snmplib/mib.c:
+
+   CHANGES: PATCH: 1678302: from magfr: netsnmp_mibindex_load leaks
+   memory
 
 2007-03-12 22:50  tanders
 
-	* snmplib/snmp_api.c:
-	  CHANGES: PATCH: 1678301: from magfr: deallocate domain registry
-	  at shutdown
+   * snmplib/snmp_api.c:
+
+   CHANGES: PATCH: 1678301: from magfr: deallocate domain registry
+   at shutdown
 
 2007-03-12 22:31  tanders
 
-	* net-snmp-config.in:
-	  CHANGES: PATCH: 1678298: from magfr: compile-subagent checks for
-	  bad HAVE_SIGNAL_H
+   * net-snmp-config.in:
+
+   CHANGES: PATCH: 1678298: from magfr: compile-subagent checks for
+   bad HAVE_SIGNAL_H
+
+2007-03-12 21:47  dts12
+
+   * agent/mibgroup/if-mib/data_access/interface_linux.c:
+
+   CHANGES: snmpd: PATCHES: 1669048: Add support for
+   ipv6InterfaceIdentifier
 
 2007-03-12 21:37  dts12
 
-	* agent/helpers/table.c:
-	  CHANGES: snmpd: BUG: 1413728: Reference index values in debug
-	  output correctly.
+   * agent/helpers/table.c:
+
+   CHANGES: snmpd: BUG: 1413728: Reference index values in debug
+   output correctly.
 
 2007-03-12 21:34  dts12
 
-	* agent/mibgroup/ucd-snmp/disk.c:
-	  CHANGES: snmpd: BUG: 1102058: Skip non-mounted disks (e.g. swap
-	  partitions)
+   * agent/mibgroup/ucd-snmp/disk.c:
+
+   CHANGES: snmpd: BUG: 1102058: Skip non-mounted disks (e.g. swap
+   partitions)
 
 2007-03-12 21:30  dts12
 
-	* agent/mibgroup/if-mib/data_access/interface_linux.c,
-	  agent/mibgroup/if-mib/data_access/interface_solaris2.c,
-	  agent/mibgroup/if-mib/data_access/interface_sysctl.c:
-	  CHANGES: snmpd: PATCHES: 1668193: Update registration of
-	  ReasmMaxSize support.
+   *  agent/mibgroup/if-mib/data_access/interface_linux.c,   
+      agent/mibgroup/if-mib/data_access/interface_solaris2.c,   
+      agent/mibgroup/if-mib/data_access/interface_sysctl.c:
+
+   CHANGES: snmpd: PATCHES: 1668193: Update registration of
+   ReasmMaxSize support.
 
 2007-03-12 21:28  dts12
 
-	* agent/mibgroup/ip-mib/ipv6InterfaceTable/ipv6InterfaceTable.c:
-	  CHANGES: snmpd: PATCHES: 1668193: Fix check for v6 ReasmMaxSize
-	  support.
+   * agent/mibgroup/ip-mib/ipv6InterfaceTable/ipv6InterfaceTable.c:
+
+   CHANGES: snmpd: PATCHES: 1668193: Fix check for v6 ReasmMaxSize
+   support.
 
 2007-03-12 19:56  dts12
 
-	* agent/mibgroup/ucd-snmp/proc.c:
-	  CHANGES: snmpd: PATCHES: 1668952: Ignore zombie processes.
+   * agent/mibgroup/ucd-snmp/proc.c:
+
+   CHANGES: snmpd: PATCHES: 1668952: Ignore zombie processes.
 
 2007-03-12 19:54  dts12
 
-	* agent/mibgroup/ip-mib/ip_scalars.c:
-	  CHANGES: snmpd: PATCHES: 1665985: Implement ipReasmTimeout
-	  Though this registers an instance, rather than the full scalar
-	  object
+   * agent/mibgroup/ip-mib/ip_scalars.c:
+
+   CHANGES: snmpd: PATCHES: 1665985: Implement ipReasmTimeout
+   Though this registers an instance, rather than the full scalar
+   object
 
 2007-03-12 19:51  dts12
 
-	* agent/mibgroup/mibII/vacm_vars.c, snmplib/vacm.c:
-	  CHANGES: library: PATCHES: 1665543: Handle VACM checks correctly.
-	  CHANGES: snmpd: PATCHES: 1665549: Handle creating VACM entries
-	  correctly.
-	  [Both patches are required for correct operation]
+   * agent/mibgroup/mibII/vacm_vars.c, snmplib/vacm.c:
+
+   CHANGES: library: PATCHES: 1665543: Handle VACM checks correctly.
+   CHANGES: snmpd: PATCHES: 1665549: Handle creating VACM entries
+   correctly.
+   [Both patches are required for correct operation]
 
 2007-03-12 19:47  dts12
 
-	* agent/mibgroup/smux/smux.c:
-	  CHANGES: snmpd: PATCHES: 1659623: Handle SMUX peers with an empty
-	  password.
+   * agent/mibgroup/smux/smux.c:
+
+   CHANGES: snmpd: PATCHES: 1659623: Handle SMUX peers with an empty
+   password.
+
+2007-03-12 19:44  dts12
+
+   *  agent/mibgroup/ucd-snmp/pass.c,   
+      agent/mibgroup/ucd-snmp/pass_persist.c:
+
+   CHANGES: snmpd: PATCHES: 1657741: Handle 64-bit types via pass
+   mechanism.
 
 2007-03-12 19:40  dts12
 
-	* agent/agent_trap.c:
-	  CHANGES: snmpd: PATCHES: 1644280: Use the correct engineID when
-	  sending v3 traps.
+   * agent/agent_trap.c:
+
+   CHANGES: snmpd: PATCHES: 1644280: Use the correct engineID when
+   sending v3 traps.
 
 2007-03-12 19:32  dts12
 
-	* snmplib/snmp_api.c:
-	  CHANGES: library: PATCHES: 1642071: Don't fiddle with the storage
-	  of pre-existing users.
+   * snmplib/snmp_api.c:
+
+   CHANGES: library: PATCHES: 1642071: Don't fiddle with the storage
+   of pre-existing users.
 
 2007-03-12 19:30  dts12
 
-	* agent/mibgroup/notification/snmpNotifyTable.c:
-	  CHANGES: snmpd: PATCHES: 1641865: Don't double check snmpTrapOID
-	  in the filter table.
+   * agent/mibgroup/notification/snmpNotifyTable.c:
+
+   CHANGES: snmpd: PATCHES: 1641865: Don't double check snmpTrapOID
+   in the filter table.
 
 2007-03-12 19:25  dts12
 
-	* agent/mibgroup/ucd-snmp/memory_freebsd2.c,
-	  agent/mibgroup/ucd-snmp/memory_netbsd1.c:
-	  CHANGES: snmpd: PATCHES: 1639726: Report physical memory
-	  correctly on *BSD
+   *  agent/mibgroup/ucd-snmp/memory_freebsd2.c,   
+      agent/mibgroup/ucd-snmp/memory_netbsd1.c:
+
+   CHANGES: snmpd: PATCHES: 1639726: Report physical memory
+   correctly on *BSD
+
+2007-03-09 21:31  tanders
+
+   * snmplib/mib.c:
+
+   CHANGES: PATCH: 1674299: from magfr: Lessen the scope of the zone
+   variable in dump_realloc_oid_to_inetaddress
+
+2007-03-09 21:29  tanders
+
+   * agent/agent_trap.c:
+
+   CHANGES: PATCH: 1674302: from magfr: Lessen the scope of the len
+   variable in convert_v2pdu_to_v1
 
 2007-03-08 15:52  dts12
 
-	* include/net-snmp/system/netbsd.h,
-	  include/net-snmp/system/openbsd.h:
-	  Include Host Resources MIB on NetBSD and OpenBSD
+   *  include/net-snmp/system/netbsd.h,   
+      include/net-snmp/system/openbsd.h:
+
+   Include Host Resources MIB on NetBSD and OpenBSD
+
+2007-03-07 09:43  tanders
+
+   * agent/agent_trap.c:
+
+   CHANGES: PATCH: 1674298: from magfr: Remove unused sinkport
+   variable
 
 2007-03-06 13:51  dts12
 
-	* agent/snmp_agent.c:
-	  CHANGES: snmpd: BUG: 1159908: Fix memory leak
+   * agent/snmp_agent.c:
 
-2007-03-02 22:58  tanders
+   CHANGES: snmpd: BUG: 1159908: Fix memory leak
 
-	* snmplib/MSG00001.bin:
-	  de-mange binary file
+2007-03-02 22:40  tanders
+
+   * snmplib/MSG00001.bin:
+
+   no eol-style for binary files
+
+2007-03-02 22:26  tanders
+
+   * doc/rfc/smiV2/rfc2579.errata~:
+
+   don't ship editor backup copies
+
+2007-03-02 16:20  tanders
+
+   * snmplib/MSG00001.bin:
+
+   flag as binary
 
 2007-03-02 12:44  tanders
 
-	* CodingStyle:
-	  fix typo
+   * CodingStyle:
+
+   fix typo
+
+2007-03-02 09:57  dts12
+
+   * TODO:
+
+   Minor tweak - playing with SVN as much as anything....
+
+2007-03-01 23:57  hardaker
+
+   * NEWS:
+
+   mention that we moved to SVN
 
 2007-02-28 15:27  dts12
 
-	* CHANGES, ChangeLog, NEWS:
-	  Checkpoint summary of CVS changes, preparatory for the SVN
-	  switch.
+   * CHANGES, ChangeLog, NEWS:
 
--------------------------------------------------------------------------------
-
-Changes: V5.4 -> SVN checkpoint (V5-4-patches branch)
+   Checkpoint summary of CVS changes, preparatory for the SVN
+   switch.
 
 2007-02-27 13:36  rstory
 
@@ -8351,17 +18567,12 @@
 
    add header for easier configure --with-mib-module
 
-2007-02-27 12:34  rstory
-
-   * agent/mibgroup/ip-mib/ipAddressPrefixTable.h:
-
-   file ipAddressPrefixTable.h was added on branch V5-4-patches on 2007-02-27 12:34:59 +0000
-
-2007-02-26 14:55  dts12
+2007-02-26 14:54  dts12
 
    * agent/mibgroup/agentx/protocol.c:
 
    Re-correct interpretation of "null OID" in the AgentX specs.
+   (for the last time, I trust!)
 
 2007-02-26 14:37  dts12
 
@@ -8373,15 +18584,15 @@
 
    * perl/: ASN/Makefile.PL, OID/Makefile.PL,
      SNMP/Makefile.PL, TrapReceiver/Makefile.PL,
-     agent/Makefile.PL, agent/default_store/Makefile.PL
-, default_store/Makefile.PL:
+     agent/Makefile.PL, agent/default_store/Makefile.PL,
+     default_store/Makefile.PL:
 
    Prompting for a single directory, not an array.
 
 2007-02-26 11:32  dts12
 
-   * local/: mib2c.container.conf, mib2c.iterate.conf
-, mib2c.table_data.conf:
+   * local/: mib2c.container.conf, mib2c.iterate.conf,
+     mib2c.table_data.conf:
 
    CHANGES: mib2c: BUG: 1429472: Protect against missing instances (and invalid objects)
 
@@ -8399,15 +18610,15 @@
 
 2007-02-23 21:53  tanders
 
-   * configure, configure.in:
+   * configure.in, configure:
 
    add quotes to fix shell syntax error when empty
 
-2007-02-22 22:47  tanders
+2007-02-22 22:35  tanders
 
    * configure, configure.in:
 
-   Last commit broke the build. Now escape backslashes properly. Please remember to use autoconf 2.59 for the patches branches!
+   Last commit broke the build. Now escape backslashes properly.
 
 2007-02-22 15:38  dts12
 
@@ -8452,20 +18663,17 @@
 
    CHANGES: build: BUG: 1096166: Handle --without-logfile correctly.
 
-2007-02-19 16:36  dts12
-
-   * dist/: Makefile, nsb-config, nsb-functions
-, nsb-nightly, nsb-package,
-     nsb-platform, patme, README.build-scripts
-:
-
-   removed dist files only to be distributed in the main CVS branch
-
-2007-02-19 16:30  dts12
+2007-02-19 16:34  dts12
 
    * dist/RELEASE-INSTRUCTIONS:
 
-   Release Instructions only to be distributed in the main CVS branch
+   Mention removal from CVS of deleted files
+
+2007-02-19 15:56  dts12
+
+   * dist/RELEASE-INSTRUCTIONS:
+
+   Rework release instructions to take account of "makerelease" script
 
 2007-02-19 10:49  dts12
 
@@ -8484,7 +18692,7 @@
    * Makefile.in:
 
    Don't invoke 'versiontag' for tagging the CVS tree.
-   It doesn't handle this any more. (Use 'makerelease' instead)
+   It doesn't handle this any more.  (Use 'makerelease' instead)
 
 2007-02-19 10:02  dts12
 
@@ -8545,11 +18753,48 @@
 
    added the flow lable mib, which the tunnel-mib refers to
 
-2007-02-07 17:17  hardaker
+2007-02-05 23:02  tanders
 
-   * mibs/IPV6-FLOW-LABEL-MIB.txt:
+   * dist/nsb-functions:
 
-   file IPV6-FLOW-LABEL-MIB.txt was added on branch V5-4-patches on 2007-02-07 17:19:10 +0000
+   more portability fixes
+
+2007-02-05 22:50  tanders
+
+   * dist/check-api-change:
+
+   use /bin/sh unless bash features are really needed
+
+2007-02-05 21:52  rstory
+
+   * Makefile.top:
+
+   note that current should be bumped by 5 when bumped
+
+2007-02-05 21:49  rstory
+
+   * dist/RELEASE-INSTRUCTIONS:
+
+   - note that current should be bumped by 5 when updated
+   - add pointer to new check-api-changes script
+
+2007-02-05 21:46  rstory
+
+   * dist/check-api-change:
+
+   simplistic new script to help check for api changes between releases
+
+2007-02-05 21:38  rstory
+
+   * agent/mibgroup/struct.h:
+
+   make new struct member conditional, since use is conditional
+
+2007-02-05 21:20  tanders
+
+   * agent/mibgroup/if-mib/ifTable/ifTable_data_access.c:
+
+   move function call out of assert
 
 2007-02-05 15:16  dts12
 
@@ -8558,16 +18803,9 @@
    CHANGES: snmplib: PATCH: 1641895: Extend short view masks (as per RFC specs)
    Patch supplied by Michael Kirkham.
 
-2007-02-05 15:10  rstory
+2007-02-05 14:31  dts12
 
-   * agent/mibgroup/if-mib/ifTable/ifTable_data_access.c:
-
-   move function call out of assert
-
-2007-02-05 14:38  dts12
-
-   * agent/mibgroup/notification/snmpNotifyFilterProfileTable.c
-:
+   * agent/mibgroup/notification/snmpNotifyFilterProfileTable.c:
 
    CHANGES: snmpd: PATCH: 1639360: Fix snmpNotifyFilterProfileTable row creation.
    Patch supplied by Michael Kirkham.
@@ -8579,26 +18817,83 @@
    Fix compilation if LOCK_PER_CALLBACK_SUBID not defined.
    Reported by Emi Yanagi
 
+2007-02-05 09:48  dts12
+
+   * FAQ:
+
+   Spelling correction: 'superceded' -> 'superseded'
+   (Oh, the shame of it!)
+
 2007-01-31 13:51  tanders
 
    * Makefile.top:
 
    CHANGES: build: BUG: 1647976: Cygwin/MinGW Windows build fails due to libtool error
 
-2007-01-30 13:43  tanders
+2007-01-30 13:39  tanders
 
    * agent/mibgroup/if-mib/data_access/interface_linux.c:
 
    CHANGES: build: yet another fix to address build issues with ethtool (on RH9).
    Patch provided by Magnus Fromreide.
 
+2007-01-30 09:10  dts12
+
+   * FAQ:
+
+   Clarify when symlink fix is/isn't appropriate.  Synch with Wiki.
+
+2007-01-29 11:12  dts12
+
+   * FAQ:
+
+   Authenticated SNMPv3 requests still need a username.  (Synch with Wiki)
+
 2007-01-29 11:03  tanders
 
-   * python/netsnmp/client_intf.c:
+   * python/netsnmp/client_intf.c, agent/helpers/table.c
+:
 
    get rid of C++ comments
 
-2007-01-25 22:45  tanders
+2007-01-28 13:36  tanders
+
+   * dist/nsb-functions:
+
+   fix bad test
+
+2007-01-28 13:06  tanders
+
+   * dist/nsb-functions:
+
+   rename variable to resolve name clash and to unbreak nightly builds on Solaris
+
+2007-01-28 12:52  tanders
+
+   * agent/helpers/table_tdata.c:
+
+   get rid of C++ comments
+
+2007-01-27 14:40  tanders
+
+   * dist/nsb-nightly:
+
+   fix typo
+
+2007-01-27 14:23  tanders
+
+   * agent/helpers/table_data.c:
+
+   get rid of C++ comments
+
+2007-01-26 11:15  tanders
+
+   * dist/: nsb-config, nsb-functions, nsb-nightly
+, nsb-package:
+
+   more Bourne shell compatibility fixes
+
+2007-01-25 22:41  tanders
 
    * configure, configure.in:
 
@@ -8612,6 +18907,7 @@
 
 2007-01-25 22:05  tanders
 
+   *
      agent/mibgroup/ip-mib/ipv4InterfaceTable/ipv4InterfaceTable_subagent.c
 , local/mib2c-conf.d/subagent.m2c:
 
@@ -8629,12 +18925,70 @@
 
    CHANGES: snmpd: PATCH: 1644714: from "Leland Wallace": replace last remaining instance of deprecated copy_word by copy_nword
 
+2007-01-25 15:30  tanders
+
+   * dist/: nsb-config, nsb-functions, nsb-nightly
+, nsb-package, nsb-platform:
+
+   many Bourne shell portability fixes
+
+2007-01-24 16:39  dts12
+
+   * dist/: nsb-config, nsb-functions, nsb-nightly
+, nsb-package, nsb-platform:
+
+   Pre-Posix Bourne shell compatability.
+
 2007-01-24 14:02  dts12
 
    * agent/mibgroup/ucd-snmp/disk.c:
 
    Tweak debug output
 
+2007-01-24 13:58  dts12
+
+   * local/mib2c-update:
+
+   Shellscript portability.  (Everything has /bin/sh)
+
+2007-01-24 13:49  dts12
+
+   * dist/: cvsshow, cvsup, nsb-config,
+     nsb-functions, nsb-nightly, nsb-package,
+     nsb-platform:
+
+   Improve shell-script portability. (Everything has /bin/sh!)
+
+2007-01-24 13:40  dts12
+
+   * snmplib/: snmpUDPDomain.c, snmp_client.c:
+
+   Extra debugging output
+
+2007-01-24 13:38  dts12
+
+   * agent/helpers/table.c, agent/helpers/table_container.c
+, agent/helpers/table_data.c,
+     agent/helpers/table_tdata.c, include/net-snmp/agent/table.h
+, include/net-snmp/agent/table_container.h,
+     include/net-snmp/agent/table_tdata.h:
+
+   Preliminary table unregistration API.
+
+2007-01-24 13:11  dts12
+
+   * apps/snmptrapd_log.c:
+
+   Move hostname translation into the transport-specific library routines.
+   (Where it belongs!)
+
+2007-01-24 13:04  dts12
+
+   * include/net-snmp/library/snmp_transport.h,
+     snmplib/snmpUDPDomain.c:
+
+   Basic framework for transport-specific translation of hostnames.
+
 2007-01-24 12:27  dts12
 
    * apps/snmptrapd_log.c:
@@ -8651,8 +19005,7 @@
 
    * agent/mibgroup/:
      ip-mib/inetNetToMediaTable/inetNetToMediaTable_interface.c
-, ip-mib/ipAddressTable/ipAddressTable_interface.c
-,
+, ip-mib/ipAddressTable/ipAddressTable_interface.c,
      ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable_interface.c
 ,
      ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable_interface.c
@@ -8702,6 +19055,7 @@
 
    CHANGES: snmptrapd: BUG: 1638225: Fix interpretation of transport address data.
    (Keep this consistent with snmpUDPDomain.c)
+   This does not feel the right way to handle this!
 
 2007-01-23 14:10  dts12
 
@@ -8730,8 +19084,7 @@
 
 2007-01-22 16:16  dts12
 
-   * agent/mibgroup/agentx/: master_admin.c, master.c
-:
+   * agent/mibgroup/agentx/: master.c, master_admin.c:
 
    CHANGES: snmpd: PATCH: 1641685: Handle unresponsive AgentX subagents more reliably.
    Fix provided by Josef Moellers
@@ -8758,7 +19111,14 @@
    CHANGES: FreeBSD: BUG: 1633483: Support CPU HAL on FreeBSD4.x
    (before CPU definitions were moved to <sys/resource.h>)
 
-2007-01-19 14:22  tanders
+2007-01-19 16:15  dts12
+
+   * apps/snmptrapd.c:
+
+   library layering improvements: *move* (rather than copy) global variables
+   from snmptrapd to libnetsnmptrapd
+
+2007-01-19 14:18  tanders
 
    * configure, configure.in,
      agent/mibgroup/if-mib/data_access/interface_linux.c:
@@ -8768,13 +19128,26 @@
 
 2007-01-19 11:25  tanders
 
-   * configure, configure.in,
+   * configure.in, configure,
      include/net-snmp/net-snmp-config.h.in,
      agent/mibgroup/host/hr_filesys.c,
      agent/mibgroup/host/hr_storage.c:
 
    CHANGES: build: add configure check for hasmntopt to fix the build on systems that lack it
 
+2007-01-18 12:50  tanders
+
+   * apps/snmptrapd_handlers.c:
+
+   library layering improvements: move global variables from snmptrapd to libnetsnmptrapd
+
+2007-01-18 11:13  tanders
+
+   * apps/snmptrapd.c, apps/snmptrapd_handlers.c,
+     man/snmptrapd.8.def, man/snmptrapd.conf.5.def:
+
+   drop "-e"/printEventNumbers support for snmptrapd (obsolete, deprecated and breaks library layering)
+
 2007-01-16 10:04  dts12
 
    * agent/mibgroup/notification/snmpNotifyTable.c:
@@ -8795,6 +19168,12 @@
 
    Don't hardcode the size of counter64 structure (may be wrong on 64-bit boxes)
 
+2007-01-16 09:00  dts12
+
+   * agent/agent_trap.c:
+
+   Extra debugging output.
+
 2007-01-11 22:13  tanders
 
    * agent/mibgroup/util_funcs.c,
@@ -8804,10 +19183,16 @@
 
    CHANGES: snmplib: library layering improvements: introduce netsnmp_mktemp to prevent libnetsnmpagent from depending on libnetsnmpmibs
 
+2007-01-11 21:35  hardaker
+
+   * configure.in:
+
+   changed autoconf req to 2.61
+
 2007-01-11 21:28  hardaker
 
-   * snmplib/: snmpAAL5PVCDomain.c, snmpIPXDomain.c
-, snmpSTDDomain.c, snmpTCPDomain.c,
+   * snmplib/: snmpAAL5PVCDomain.c, snmpIPXDomain.c,
+     snmpSTDDomain.c, snmpTCPDomain.c,
      snmpTCPIPv6Domain.c, snmpUDPDomain.c,
      snmpUDPIPv6Domain.c, snmp_service.c,
      snmp_transport.c:
@@ -8832,6 +19217,12 @@
 
    CHANGES: Solaris: IF-MIB fix: add missing return at end of get_if_stats
 
+2007-01-08 08:30  tanders
+
+   * agent/Makefile.in:
+
+   CHANGES: build: library layering improvements: build libraries in the correct order (libnetsnmpagent before libnetsnmphelpers before libnetsnmpmibs)
+
 2007-01-07 19:47  tanders
 
    * include/net-snmp/library/snmp_service.h:
@@ -8845,7 +19236,7 @@
    CHANGES: Solaris: BUG: 1626153: no hrSWRun informations on Solaris zones
    Patch provided by Klaus Muehlfeld
 
-2007-01-06 00:34  tanders
+2007-01-06 00:30  tanders
 
    * perl/agent/agent.xs:
 
@@ -8857,12 +19248,17 @@
 
    get rid of C++ comments
 
-2007-01-03 22:23  tanders
+2007-01-02 23:33  tanders
 
-   * perl/SNMP/: SNMP.xs, t/conf.t:
+   * agent/agent_registry.c:
 
-   clean up compile and fix tests.
-   Backport from 5.5.dev
+   BUG: Coverity #173: remove superfluous NULL check (already dereferenced earlier anyway)
+
+2007-01-02 23:08  tanders
+
+   * snmplib/system.c:
+
+   only log a message when the mib_indexes directory is *really* created
 
 2007-01-02 22:53  tanders
 
@@ -8876,6 +19272,62 @@
 
    BUG: Coverity #193: properly initialize session pointer before use
 
+2007-01-02 20:13  tanders
+
+   * agent/agent_registry.c:
+
+   back out previous bad change to agent registry
+
+2007-01-02 19:52  tanders
+
+   * agent/snmp_agent.c:
+
+   CHANGES: snmpd: PATCH: 1601453: from "Robert Wilcox": Dynamic Memory failure handling improvements
+
+2007-01-02 19:52  tanders
+
+   * snmplib/default_store.c, snmplib/read_config.c,
+     agent/agent_registry.c, agent/helpers/null.c,
+     agent/helpers/old_api.c, agent/helpers/stash_cache.c
+, agent/helpers/table.c, agent/helpers/table_array.c
+, agent/helpers/table_dataset.c,
+     snmplib/snmpCallbackDomain.c, snmplib/snmpusm.c,
+     agent/helpers/table_iterator.c, agent/helpers/watcher.c
+, agent/mibgroup/header_complex.c,
+     agent/mibgroup/testhandler.c,
+     agent/mibgroup/disman/mteObjectsTable.c,
+     agent/mibgroup/mibII/interfaces.c,
+     agent/mibgroup/notification/snmpNotifyFilterProfileTable.c,
+     agent/mibgroup/notification/snmpNotifyTable.c,
+     agent/mibgroup/utilities/override.c:
+
+   CHANGES: PATCH: 1601453: from "Robert Wilcox": Dynamic Memory failure handling improvements
+
+2007-01-02 17:56  tanders
+
+   * Makefile.in:
+
+   remove LD_RUN_PATH comment for python
+
+2007-01-02 17:38  tanders
+
+   * Makefile.top, configure, net-snmp-config.in
+:
+
+   CHANGES: build: update to autoconf 2.61
+
+2007-01-02 17:23  tanders
+
+   * Makefile.in, include/net-snmp/system/kfreebsd.h:
+
+   NEWS: Ports: PATCH: 1623874: from "Petr Salinger": add GNU/kFreeBSD support
+
+2007-01-02 17:17  tanders
+
+   * agent/mibgroup/ucd-snmp/disk.c:
+
+   CHANGES: build: add workaround for AC_FUNC_GETMNTENT() bug in autoconf 2.60b and 2.61 (see Debian bugs #403243, #403079)
+
 2007-01-02 16:48  dts12
 
    * local/mib2c:
@@ -8885,8 +19337,8 @@
 
 2007-01-02 16:00  dts12
 
-   * snmplib/: snmpUDPDomain.c, snmpUDPIPv6Domain.c
-, snmpUnixDomain.c:
+   * snmplib/: snmpUDPDomain.c, snmpUDPIPv6Domain.c,
+     snmpUnixDomain.c:
 
    CHANGES: snmplib: BUG: 1600171: Support longer community strings in VACM config.
    Patch provided by Robert Wilcox
@@ -8898,20 +19350,27 @@
    CHANGES: snmpd: BUG: 1546817: Fix snmpEnterprise varbind when forwarding v1 traps.
    Patch provided by Pablo Passera.
 
-2007-01-02 10:38  dts12
+2007-01-02 10:34  dts12
 
    * configure, configure.in:
 
    CHANGES: build: PATCH: 1625135: configure location of python interpreter
    Provided by Andrew Langmead
 
-2007-01-02 10:38  dts12
+2007-01-02 10:34  dts12
 
    * Makefile.in, Makefile.top:
 
    NEWS: configure: PATCH 1625135: configure location of python interpreter
    Provided by Andrew Langmead
 
+2007-01-02 10:22  dts12
+
+   * configure.in, configure:
+
+   CHANGES: build: PATCH: 1624406: option to hardcode location of mount table
+   Submitted by Jochen
+
 2007-01-01 17:44  dts12
 
    * agent/mibgroup/util_funcs.c:
@@ -8919,12 +19378,33 @@
    CHANGES: snmpd: PATCH: 1601188, BUG: 1600432: Handle signals properly when restarting the agent.
    Fix provided by Loic Domaigne.
 
-2007-01-01 16:12  dts12
+2007-01-01 17:35  dts12
 
-   * snmplib/snmp_client.c:
+   * snmplib/mib.c:
+
+   Handle non-writable MIB indexes (e.g. run as non-privileged user)
+
+2007-01-01 16:09  dts12
+
+   * include/net-snmp/library/snmp_api.h, snmplib/snmp_client.c
+:
 
    NEWS: snmplib: PATCHES 1592706: Fix memory leak when cloning varbinds.
-   Patch by Steven Dorigotti.
+   Based on a suggestion by Steven Dorigotti.
+
+2007-01-01 16:09  dts12
+
+   * snmplib/snmp_api.c:
+
+   CHANGES: snmplib: PATCH: 1592706: Fix memory leak when cloning varbinds.
+   Based on a suggestion by Steven Dorigotti.
+
+2007-01-01 15:48  dts12
+
+   * agent/mibgroup/ucd-snmp/: pass.c, pass_persist.c:
+
+   NEWS: agent: PATCH 1585146: Extend range of available error codes
+   Submitted by Anthony Novatsis.
 
 2007-01-01 15:29  dts12
 
@@ -8935,8 +19415,8 @@
 
 2007-01-01 15:16  dts12
 
-   * apps/: snmpdf.c, snmpget.c, snmpgetnext.c
-, snmpset.c:
+   * apps/: snmpdf.c, snmpget.c, snmpgetnext.c,
+     snmpset.c:
 
    Move global 'failures' variable closer to where it is used.
    CHANGES: apps: PATCH: 1529523: Close SNMP session on failure.
@@ -8948,6 +19428,16 @@
    Protect against potential double delete.
    Patch provided by Magnus Fromreide.
 
+2007-01-01 14:22  dts12
+
+   * include/net-snmp/library/mib.h, snmplib/mib.c,
+     snmplib/parse.c:
+
+   Maintain MIB directory index files under /var/net-snmp
+   (in line with File Hierarchy Standard specifications)
+   See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=389434
+   and discussion "MIBs in net-snmp" on coders list (Oct 2006)
+
 2007-01-01 11:28  dts12
 
    * agent/mibgroup/agentx/master_admin.c:
@@ -8955,6 +19445,12 @@
    Ensure sysORDescriptions are null-terminated, so they can be
    safely passed to 'strdup()'.  Reported by Wolfgang Pedot.
 
+2006-12-29 17:25  dts12
+
+   * FAQ:
+
+   Synchronise with Wiki version.
+
 2006-12-28 23:29  tanders
 
    * snmplib/snmpUDPDomain.c:
@@ -8984,10 +19480,9 @@
 
 2006-12-17 18:01  alex_b
 
-   * win32/: Makefile-apps.in, libsnmp_dll/Makefile.in
-, snmpd/Makefile.in, snmpdsdk/Makefile.in
-, snmpnetstat/Makefile.in,
-     snmptrapd/Makefile.in:
+   * win32/: Makefile-apps.in, libsnmp_dll/Makefile.in,
+     snmpd/Makefile.in, snmpdsdk/Makefile.in,
+     snmpnetstat/Makefile.in, snmptrapd/Makefile.in:
 
    Add gdi32.lib to fix linking problem when using the static version of the
    SSL libraries.  Thanks to Simon Edwards for the fix.
@@ -9000,15 +19495,15 @@
 
 2006-12-12 23:53  tanders
 
-   * agent/mibgroup/host/: hr_filesys.c, hr_storage.c
-, hr_swinst.c:
+   * agent/mibgroup/host/: hr_filesys.c, hr_storage.c,
+     hr_swinst.c:
 
    CHANGES: Linux: PATCH: 1581294: from "Michael Tatarinov": host-resources improvements
 
 2006-12-12 21:27  tanders
 
-   * win32/net-snmp/: net-snmp-config.h,
-     net-snmp-config.h.in:
+   * win32/net-snmp/: net-snmp-config.h, net-snmp-config.h.in
+:
 
    re-add UDP_ADDRESSES_IN_HOST_ORDER
 
@@ -9024,7 +19519,7 @@
 
    CHANGES: Win32: fix win32/Configure --with-ipv6
 
-2006-12-12 18:21  tanders
+2006-12-12 18:10  tanders
 
    * win32/net-snmp/net-snmp-config.h:
 
@@ -9036,13 +19531,88 @@
 
    Add version to FAQ.html.
 
-2006-12-09 00:16  tanders
+2006-12-09 17:11  alex_b
 
-   * include/net-snmp/system/: darwin8.h, darwin9.h
+   * man/: Makefile.in, make_index.pl, man_sections.txt
 :
 
+   -Create html pages for ALL man pages.
+   -Improve error message when creating the index.html file.
+
+2006-12-09 17:06  alex_b
+
+   * local/: html-add-header-footer.pl, html-textfile-fix.pl
+:
+
+   Add tidy command line option and add missing README files.
+
+2006-12-09 00:16  tanders
+
+   * include/net-snmp/system/: darwin8.h, darwin9.h:
+
    CHANGES: MacOSX: PATCH: 1600453: from "Chris Jalbert": OS X compile-time endian determination
 
+2006-12-08 22:47  tanders
+
+   * dist/RELEASE-INSTRUCTIONS:
+
+   document some more post-release tasks
+
+2006-12-08 22:26  tanders
+
+   * man/netsnmp_agent.3, man/netsnmp_agent_registry.3,
+     man/netsnmp_agent_trap.3, man/netsnmp_asn1_packet_parse.3
+, man/netsnmp_baby_steps.3,
+     man/netsnmp_bulk_to_next.3, man/netsnmp_cache_handler.3
+, man/netsnmp_callback.3, man/netsnmp_container.3
+, man/netsnmp_data_list.3, man/netsnmp_debug.3
+, man/netsnmp_default_store.3, man/netsnmp_handler.3
+, man/netsnmp_instance.3,
+     man/netsnmp_iterator_info_s.3, man/netsnmp_leaf.3,
+     man/netsnmp_library.3, man/netsnmp_mib_maintenance.3
+, man/netsnmp_mib_utilities.3,
+     man/netsnmp_mode_end_call.3, man/netsnmp_multiplexer.3
+, man/netsnmp_netsnmp_agent_request_info_s.3,
+     man/netsnmp_netsnmp_column_info_t.3,
+     man/netsnmp_netsnmp_data_list_s.3,
+     man/netsnmp_netsnmp_handler_registration_s.3,
+     man/netsnmp_netsnmp_iterator_info_s.3,
+     man/netsnmp_netsnmp_mib_handler_access_methods.3,
+     man/netsnmp_netsnmp_mib_handler_methods.3,
+     man/netsnmp_netsnmp_mib_handler_s.3,
+     man/netsnmp_netsnmp_request_info_s.3,
+     man/netsnmp_netsnmp_table_registration_info_s.3,
+     man/netsnmp_netsnmp_table_request_info_s.3,
+     man/netsnmp_oid_stash.3, man/netsnmp_old_api.3,
+     man/netsnmp_read_config.3, man/netsnmp_read_only.3,
+     man/netsnmp_row_merge.3, man/netsnmp_scalar.3,
+     man/netsnmp_scalar_group_group.3, man/netsnmp_serialize.3
+, man/netsnmp_snmp_agent.3, man/netsnmp_snmp_alarm.3
+, man/netsnmp_snmp_client.3,
+     man/netsnmp_snmp_logging.3, man/netsnmp_snmp_pdu.3,
+     man/netsnmp_snmp_session.3, man/netsnmp_stash_cache.3
+, man/netsnmp_stash_to_next.3, man/netsnmp_table.3
+, man/netsnmp_table_array.3,
+     man/netsnmp_table_container.3, man/netsnmp_table_data.3
+, man/netsnmp_table_dataset.3,
+     man/netsnmp_table_generic.3, man/netsnmp_table_indexes.3
+, man/netsnmp_table_iterator.3,
+     man/netsnmp_table_iterator.h.3,
+     man/netsnmp_table_maintenance.3, man/netsnmp_table_rows.3
+, man/netsnmp_tdata.3, man/netsnmp_util.3,
+     man/netsnmp_utilities.3, man/netsnmp_variable_list.3
+, man/netsnmp_watcher.3, perl/ASN/ASN.pm,
+     perl/AnyData_SNMP/Storage.pm, perl/OID/OID.pm,
+     perl/SNMP/SNMP.pm, perl/TrapReceiver/TrapReceiver.pm
+, perl/agent/agent.pm, perl/agent/Support/Support.pm
+, perl/agent/default_store/default_store.pm,
+     perl/default_store/default_store.pm, configure,
+     configure.in, doxygen.conf, sedscript.in,
+     dist/Makefile, dist/net-snmp.spec,
+     snmplib/snmp_version.c, FAQ, README:
+
+   - version tag ( 5.5.dev )
+
 2006-12-08 22:20  tanders
 
    * local/Version-Munge.pl:
@@ -9055,31 +19625,44 @@
 
    NEWS: BUG: 1611524: fix tcp connection table fd leak
 
-2006-12-07 15:56  tanders
+2006-12-08 13:17  marz
 
-   * agent/mibgroup/hardware/: cpu.h, cpu/cpu_mach.c
-, cpu/cpu_mach.h:
+   * perl/SNMP/: Makefile.PL, SNMP.pm:
+
+   revert uninformed version change
+
+2006-12-07 21:50  uid39039
+
+   * perl/SNMP/: Makefile.PL, SNMP.pm, SNMP.xs,
+     t/conf.t:
+
+   clean up compile and fix tests
+
+2006-12-07 16:48  marz
+
+   * perl/SNMP/SNMP.pm:
+
+   comment fix
+
+2006-12-07 15:52  tanders
+
+   * agent/mibgroup/hardware/: cpu.h, cpu/cpu_mach.c,
+     cpu/cpu_mach.h:
 
    NEWS: MacOSX: PATCH: 1600522: from "Bill Fenner": CPU HAL implementation for mach/darwin
 
-2006-12-07 15:54  tanders
-
-   * agent/mibgroup/hardware/cpu/cpu_mach.c:
-
-   file cpu_mach.c was added on branch V5-4-patches on 2006-12-07 15:56:38 +0000
-
-2006-12-07 15:54  tanders
-
-   * agent/mibgroup/hardware/cpu/cpu_mach.h:
-
-   file cpu_mach.h was added on branch V5-4-patches on 2006-12-07 15:56:38 +0000
-
 2006-12-07 13:10  tanders
 
    * perl/SNMP/SNMP.pm:
 
    CHANGES: documentation: PATCH: 1604580: SNMP(3) manual page corrections (spotted by tek-ops)
 
+2006-12-06 20:30  hardaker
+
+   * dist/RELEASE-INSTRUCTIONS:
+
+   document various aspects of post-release things to do
+
 2006-12-06 15:34  rstory
 
    * agent/mibgroup/tunnel/tunnel.c:
@@ -9118,6 +19701,39 @@
 
    CHANGES: BUG: 1600093: autoconf 2.60 breaks the build
 
+2006-12-04 17:49  hardaker
+
+   * COPYING:
+
+   change top text to remove history section which was out of date
+
+2006-12-03 23:20  alex_b
+
+   * win32/: dist/README.build.win32.txt,
+     netsnmpmibssdk/netsnmpmibssdk.dsp:
+
+   Win32:  Workspace compile fix, build instructions update.
+
+2006-11-24 17:53  hardaker
+
+   * FAQ, README, configure, configure.in
+, sedscript.in, snmplib/snmp_version.c,
+     dist/net-snmp.spec:
+
+   - version tag ( 5.4 )
+
+2006-11-24 17:52  hardaker
+
+   * CHANGES, NEWS:
+
+   version update
+
+2006-11-24 17:48  hardaker
+
+   * ChangeLog:
+
+   version update
+
 -------------------------------------------------------------------------------
 
 Changes: V5.4.rc3 -> V5.4
@@ -12943,6 +23559,7 @@
 
 2006-08-17 07:50  rstory
 
+   *
      agent/mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable_interface.c
 , local/mib2c-conf.d/mfd-interface.m2c:
 
@@ -13945,6 +24562,7 @@
 
 2006-06-12 13:05  rstory
 
+   *
      agent/mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable.c
 :
 
@@ -15937,6 +26555,7 @@
 
 2006-01-10 03:07  tanders
 
+   *
      agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable_data_access.c
 :
 
@@ -15944,6 +26563,7 @@
 
 2006-01-09 17:41  tanders
 
+   *
      agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable_data_access.c
 :
 
@@ -16955,6 +27575,7 @@
 
 2005-12-09 20:58  rstory
 
+   *
      agent/mibgroup/ip-mib/ipv4InterfaceTable/ipv4InterfaceTable_data_access.c
 :
 
@@ -16977,6 +27598,7 @@
 
 2005-12-09 20:57  rstory
 
+   *
      agent/mibgroup/ip-mib/ipv6InterfaceTable/ipv6InterfaceTable_interface.c
 :
 
@@ -18257,6 +28879,7 @@
 
 2005-11-16 15:18  rstory
 
+   *
      agent/mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable_interface.c
 :
 
@@ -18396,6 +29019,7 @@
 
 2005-11-15 21:14  rstory
 
+   *
      agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable_interface.c
 :
 
@@ -18409,6 +29033,7 @@
 
 2005-11-15 21:08  rstory
 
+   *
      agent/mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable.c
 :
 
@@ -18438,6 +29063,7 @@
 
 2005-11-15 19:24  rstory
 
+   *
      agent/mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable_data_access.c
 :
 
@@ -18554,6 +29180,7 @@
 
 2005-11-14 17:28  rstory
 
+   *
      agent/mibgroup/ip-mib/ipAddressPrefixTable/ipAddressPrefixTable_data_access.c
 :
 
@@ -19835,6 +30462,7 @@
 
 2005-10-28 23:27  rstory
 
+   *
      agent/mibgroup/ip-mib/ipv4InterfaceTable/ipv4InterfaceTable_interface.h
 :
 
@@ -19842,6 +30470,7 @@
 
 2005-10-28 23:26  rstory
 
+   *
      agent/mibgroup/ip-mib/ipv4InterfaceTable/ipv4InterfaceTable_interface.c
 :
 
@@ -21910,6 +32539,7 @@
 
 2005-09-27 19:25  rstory
 
+   *
      agent/mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable.c
 :
 
@@ -22622,6 +33252,7 @@
 
 2005-09-06 19:17  tanders
 
+   *
      agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable/.cvsignore
 :
 
@@ -22734,6 +33365,7 @@
 
 2005-08-30 08:06  rstory
 
+   *
      agent/mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable_constants.h
 :
 
@@ -25570,6 +36202,7 @@
 
 2005-03-28 14:29  rstory
 
+   *
      agent/mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable_data_access.c
 :
 
@@ -25610,6 +36243,7 @@
 
 2005-03-24 16:48  rstory
 
+   *
      agent/mibgroup/snmp-usm-dh-objects-mib/usmDHUserKeyTable/usmDHUserKeyTable_data_access.c
 :
 
@@ -26347,6 +36981,7 @@
 
 2005-01-27 22:52  rstory
 
+   *
      agent/mibgroup/snmp-usm-dh-objects-mib/usmDHUserKeyTable/usmDHUserKeyTable_data_access.c
 :
 
@@ -28102,6 +38737,7 @@
 
 2004-10-17 20:56  rstory
 
+   *
      agent/mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable_data_access.c
 :
 
@@ -28522,6 +39158,7 @@
 
 2004-10-14 18:15  rstory
 
+   *
      agent/mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable.h
 :
 
@@ -28870,6 +39507,7 @@
 
 2004-10-08 19:27  rstory
 
+   *
      agent/mibgroup/snmp-usm-dh-objects-mib/usmDHUserKeyTable/usmDHUserKeyTable_interface.c
 :
 
@@ -28877,6 +39515,7 @@
 
 2004-10-08 19:25  rstory
 
+   *
      agent/mibgroup/snmp-usm-dh-objects-mib/usmDHUserKeyTable/usmDHUserKeyTable_interface.c
 :
 
@@ -29930,6 +40569,7 @@
 
 2004-09-24 09:15  rstory
 
+   *
      agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access.c
 :
 
@@ -29989,6 +40629,7 @@
 
 2004-09-23 13:24  rstory
 
+   *
      agent/mibgroup/snmp-usm-dh-objects-mib/usmDHUserKeyTable/usmDHUserKeyTable_data_set.c
 :
 
@@ -30165,6 +40806,7 @@
 
 2004-09-21 06:43  hardaker
 
+   *
      agent/mibgroup/snmp-usm-dh-objects-mib/usmDHUserKeyTable/usmDHUserKeyTable_data_get.c
 :
 
@@ -31357,6 +41999,7 @@
 
 2004-08-27 23:22  rstory
 
+   *
      agent/mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable_data_access.c
 :
 
@@ -32217,6 +42860,7 @@
 
 2004-07-10 19:51  rstory
 
+   *
      agent/mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable_data_access.c
 :
 
@@ -32301,6 +42945,7 @@
 
 2004-07-09 22:58  hardaker
 
+   *
      agent/mibgroup/snmp-usm-dh-objects-mib/usmDHUserKeyTable/usmDHUserKeyTable_data_set.c
 :
 
@@ -32379,6 +43024,7 @@
 
 2004-07-09 09:57  hardaker
 
+   *
      agent/mibgroup/snmp-usm-dh-objects-mib/usmDHUserKeyTable/.cvsignore
 :
 
@@ -32522,6 +43168,7 @@
 
 2004-07-07 13:41  rstory
 
+   *
      agent/mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable_interface.c
 :
 
@@ -33349,6 +43996,7 @@
 
 2004-06-28 15:11  rstory
 
+   *
      agent/mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable_constants.h
 :
 
@@ -36019,6 +46667,7 @@
 
 2004-04-13 11:44  rstory
 
+   *
      agent/mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable_interface.c
 :
 
@@ -36026,6 +46675,7 @@
 
 2004-04-13 11:43  rstory
 
+   *
      agent/mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable.c
 :
 
@@ -53198,7 +63848,7 @@
 
    * agent/helpers/instance.c:
 
-   Report non-existent subinstances as 'noSuchInstance' rather than 'noSuchObject'.
+   Report non-exitent subinstances as 'noSuchInstance' rather than 'noSuchObject'.
    "snmpget .... .1.3.6.1.6.3.12.1.5.0.99" now responds correctly.
    (though "snmpget .... .1.3.6.1.6.3.12.1.5.1" still returns 'noSuchObject')
    
diff --git a/FAQ b/FAQ
index f4f7755..0f06b58 100644
--- a/FAQ
+++ b/FAQ
@@ -1,7 +1,7 @@
       Frequently Asked Questions (FAQ) for the UCD/Net-SNMP package
       =============================================================
 		       FAQ Author: Dave Shield
-	        Net-SNMP Version: 5.4.4 SVN branch
+			Net-SNMP Version: 5.5.2
 	    Net-SNMP/UCD-SNMP Project Leader: Wes Hardaker
 	     Email: net-snmp-coders@lists.sourceforge.net
 
@@ -2158,6 +2158,15 @@
   output is returned in a fixed format, and it is up to the receiving
   application to interpret this appropriately.
 
+  Note that the "relocatable" form of the 'exec' directive ('exec OID ....')
+  produces MIB output that is not strictly valid. For this reason, support
+  for this has been deprecated in favour of 'extend OID ...', which produces
+  well-formed MIB results (as well as providing fuller functionality).
+  The most recent releases of the agent don't include support for "relocatable
+  exec" by default. This needs to be explicitly included when the agent is
+  first compiled, by including the module 'ucd-snmp/extensible' instead of
+  'agent/extend'.
+
 
   'pass' is a more general mechanism for implementing arbitrary MIB
   objects.  The specified command will be invoked for any request within
@@ -2594,7 +2603,7 @@
 
 
 Why does the agent complain about 'no access control information'?
-------------------------------------------------------------------
+-----------------------------------------------------------------
 
   Although an SNMP agent may support a wide range of management
   information, it is not necessarily appropriate to report the whole
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..cd8c1fa
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1 @@
+ACLOCAL_AMFLAGS = -I m4
diff --git a/Makefile.in b/Makefile.in
index 0ea41aa..542f4ab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,19 +16,19 @@
 INSTALLHEADERS=version.h
 INCLUDESUBDIR=system
 INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h \
-	darwin.h darwin7.h darwin8.h darwin9.h dynix.h \
+	darwin.h darwin7.h darwin8.h darwin9.h dragonfly.h dynix.h \
 	freebsd2.h freebsd3.h freebsd4.h freebsd5.h freebsd6.h \
 	freebsd7.h freebsd8.h freebsd9.h freebsd10.h freebsd11.h \
 	freebsd12.h freebsd.h \
-        generic.h hpux.h \
-	irix.h linux.h mingw32.h mips.h netbsd.h osf5.h \
+        generic.h \
+	hpux.h irix.h linux.h mingw32.h mips.h netbsd.h osf5.h \
 	openbsd.h openbsd5.h openbsd4.h \
 	solaris2.3.h solaris2.4.h solaris2.5.h solaris2.6.h \
-	solaris.h sunos.h svr5.h sysv.h ultrix4.h dragonfly.h
+	solaris.h sunos.h svr5.h sysv.h ultrix4.h
 INCLUDESUBDIR2=machine
 INCLUDESUBDIRHEADERS2=generic.h
 INSTALLBUILTHEADERS=include/net-snmp/net-snmp-config.h
-INSTALLBINSCRIPTS=net-snmp-config
+INSTALLBINSCRIPTS=net-snmp-config net-snmp-create-v3-user
 INSTALLUCDHEADERS=ucd-snmp-config.h version.h mib_module_config.h
 
 #
@@ -60,7 +60,7 @@
 #
 # targets
 #
-all:    sedscript EXAMPLE.conf standardall net-snmp-config-x @PERLTARGS@ @PYTHONTARGS@
+all:    sedscript EXAMPLE.conf standardall net-snmp-config-x net-snmp-create-v3-user @PERLTARGS@ @PYTHONTARGS@
 
 start-flag:
 	@touch build-in-progress-flag
@@ -98,6 +98,7 @@
 #
 sedscript: sedscript.in include/net-snmp/net-snmp-config.h $(srcdir)/agent/mibgroup/mibdefs.h
 	$(CPP) $(srcdir)/sedscript.in | egrep '^s[/#]' | sed 's/REMOVEME//g;s# */#/#g;s/ *#/#/g;s#/ *#/#g;s/# g/#g/;' > sedscript
+	echo 's/VERSIONINFO/$(VERSION)/g' >> sedscript
 	echo 's#DATADIR#$(datadir)#g' >> sedscript
 	echo 's#LIBDIR#$(libdir)#g' >> sedscript
 	echo 's#BINDIR#$(bindir)#g' >> sedscript
@@ -112,7 +113,7 @@
 docsdir: docsdox
 
 docsdox: doxygen.conf
-	srcdir=$(srcdir) doxygen $(srcdir)/doxygen.conf
+	srcdir=$(srcdir) VERSION=$(VERSION) doxygen $(srcdir)/doxygen.conf
 	-rm docs/man/man3/todo.3
 	-rm docs/man/man3/deprecated.3
 
@@ -125,6 +126,10 @@
 	chmod a+x net-snmp-config
 	touch net-snmp-config-x
 
+net-snmp-create-v3-user-x: net-snmp-create-v3-user
+	chmod a+x net-snmp-create-v3-user
+	touch net-snmp-create-v3-user-x
+
 #
 # extra install rules
 #
@@ -247,7 +252,8 @@
 configclean: makefileclean
 	rm -f config.cache config.status config.log \
 		libtool include/net-snmp/net-snmp-config.h \
-		net-snmp-config net-snmp-config-x configure-summary
+		net-snmp-config net-snmp-config-x configure-summary \
+		net-snmp-create-v3-user net-snmp-create-v3-user-x
 	rm -f mibs/.index
 	rm -f include/net-snmp/agent/mib_module_config.h		\
 		include/net-snmp/agent/agent_module_config.h		\
@@ -281,8 +287,28 @@
 	    echo "WARNING: not running config.status"; \
 	fi
 
+configure_ac = configure.ac \
+	configure.d/config_modules_agent \
+	configure.d/config_modules_lib \
+	configure.d/config_os_functions \
+	configure.d/config_os_headers \
+	configure.d/config_os_libs1 \
+	configure.d/config_os_libs2 \
+	configure.d/config_os_misc1 \
+	configure.d/config_os_misc2 \
+	configure.d/config_os_misc3 \
+	configure.d/config_os_misc4 \
+	configure.d/config_os_progs \
+	configure.d/config_os_struct_members \
+	configure.d/config_project_ipv6_types \
+	configure.d/config_project_manual \
+	configure.d/config_project_paths \
+	configure.d/config_project_perl_python \
+	configure.d/config_project_types \
+	configure.d/config_project_with_enable
+
 $(srcdir)/include/net-snmp/net-snmp-config.h.in: stamp-h.in
-$(srcdir)/stamp-h.in: configure.in acconfig.h
+$(srcdir)/stamp-h.in: $(configure_ac) acconfig.h
 	@if test "x$(NOAUTODEPS)" = "x" -a "x$(AUTOHEADER)" != "x:"; then \
 	    cd ${srcdir} && LC_COLLATE=C $(AUTOHEADER); \
 	    echo timestamp > ${srcdir}/stamp-h.in; \
@@ -301,7 +327,7 @@
 	    echo "WARNING: not running config.status"; \
 	fi
 
-$(srcdir)/configure: configure.in aclocal.m4
+$(srcdir)/configure: $(configure_ac) aclocal.m4
 	@if test "x$(NOAUTODEPS)" = "x" -a "x$(AUTOCONF)" != "x:"; then \
 	    cd ${srcdir} && $(AUTOCONF); \
 	    echo "Please run configure now."; \
diff --git a/Makefile.top b/Makefile.top
index c4c44ee..f4fa4a8 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -1,7 +1,7 @@
 #
 # Minimum environment and virtual path setup
 #
-SHELL		= /bin/sh
+SHELL		= @SHELL@
 srcdir		= @srcdir@
 top_srcdir	= @top_srcdir@
 VERSION		= @VERSION@
@@ -15,6 +15,7 @@
 bindir		= @bindir@
 sbindir		= @sbindir@
 libdir		= @libdir@
+datarootdir	= @datarootdir@
 datadir		= @datadir@
 includedir	= @includedir@/net-snmp
 ucdincludedir	= @includedir@/ucd-snmp
@@ -61,7 +62,7 @@
 # The (slightly clarified) rules:
 #
 # - If any interfaces/structures have been removed or changed since the
-#   last update, increment current, and set age and revision to 0. Stop.
+#   last update, increment current (+5), and set age and revision to 0. Stop.
 #
 # - If any interfaces have been added since the last public release, then
 #   increment current and age, and set revision to 0. Stop.
@@ -76,9 +77,9 @@
 # 5.3 was at 10, 5.4 is at 15, ...  This leaves some room for needed
 # changes for past releases if absolutely necessary.
 # 
-LIBCURRENT  = 16
-LIBAGE      = 1
-LIBREVISION = 3
+LIBCURRENT  = 20
+LIBAGE      = 0
+LIBREVISION = 2
 
 LIB_LD_CMD      = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o
 LIB_EXTENSION   = la
diff --git a/NEWS b/NEWS
index 38b62cf..a6713fc 100644
--- a/NEWS
+++ b/NEWS
@@ -3,106 +3,137 @@
 that have been fixed/applied, and the ChangeLog file for a comprehensive
 listing of all changes made to the code.
 
-*5.4.4*
 
-    snmplib:
-      - [BUG 3171878]: Using SNMPv3 context does not work
+* 5.5.2 *
 
     snmpd:
-      - Various 64-bit fixes
+      - [PATCH 3198781]: Fix compilation of disman/{ping,traceroute} modules
+      - [BUG 3526549]: CVE-2012-2141 Array index error leading to crash
+      - [BUG 3532090]: Fix high ifIndex values crashing hrDeviceDescr
+             Note that this will affect the indexing of *all* entries in
+             the hrDeviceTable.  Assumptions as to what index a given device
+             will use, are no longer valid.
+
+    building:
+      - [PATCH 2091156]: Fix parallel builds (using 'make -j <N>')
+
+* 5.5.1 *
+
+    snmpd:
+      - Fix handling of multiple matching VACM entries.
+        (Use the "best" match, rather than the first one).
+	Note that this could potentially affect the behaviour
+	of existing access control configurations.
 
     FreeBSD,NetBSD,OpenBSD:
         Incorporate fixes from these O/S patch archives
 
+* 5.5 *
 
-*5.4.3*
+    All applications:
+      - Added the ability to "alias" transports to a more simple name
+         (see the "alias" keyword in the snmp.conf manual page)
+      - The -t (timeout) switch will accept floating point numbers (eg: .1)
 
     snmpd:
-      - Change default AgentX target from 0.0.0.0:705 to localhost:705
-      - Fix CVE-2008-4309 (GETBULK issue reported by Oscar Mira-Sanchez)
-      - Fix handling of multiple matching VACM entries
-        (Use the "best" match, rather than the first one).
-            Note that this could potentially affect the behaviour of
-            existing access control configurations.
-      - Latch large-disk statistics at 2Tb (rather than wrapping)
+      - [BUG 1712988]: default/configurable max # varbinds returned by GETBULK
+      - [PATCH 1585146]: Extend range of available error codes
+      - [PATCH 1654424]: Handle row deletion issues in dataset tables
+      - [PATCH 1666737]: Include IPv6 traffic in various UDP counters
+      - [PATCH 1700157]: Fix ordering of exec tokens in MIB output
+      - [PATCH 1719253]: fix skipNFSInHostResources for multiple walks
+      - [PATCH 1723611]: New implementation of the RMON alarmTable
+      - [PATCH 1737439]: automatic link up/down traps on a walk
+      - [PATCH 1806501]: Add API for sending traps with a snmpv3 context
+      - [PATCH 1882621]: Add LVM support to the partition table
+      - [PATCH 1893468]: fixed registration of OIDs with ranges
+      - [PATCH 1901764]: Support date-based logwatch files
+      - [PATCH 1909813]: fix table_iterator handling of SORTED hint
+      - [PATCH 1916840]: new config option to set SNMPv1 trap agent address
+      - [PATCH 2103492]: implement RMON-MIB::etherStatsJabbers
+      - [PATCH 2449210]: add 64-bit usage statistics to UCD-SNMP-MIB::dskTable
+      - Add support for a user provided length variable
+	   and C string values to the watcher helper.
+      - Automatically reregister sysORTable entries from AgentX subagents.
+      - Fix various memory leaks
+      - Implement ipAddressSpinLock
+      - Implement ipNetToPhysicalLastUpdated
+      - Suppress annoying "registration != duplicate" warning for root oids
 
-    Linux:
-      - Fix build on modern distributions (using rpm-4.6)
+    snmptrapd:
+      - [PATCH 1908288]: Run perl END block on termination
+      - Add trap handler for logging traps to a mysql database
+      - Withdraw deprecated options.
 
-    Windows:
-      - Fix various builds (recent MSVC, MinGW, IPv6, winExtDLL)
+    snmpnetstat:
+      - [PATCH 2564538]: Support GETBULK in v2c+ snmp versions
 
-
-*5.4.2*
+    snmpusm:
+      - [PATCH 1591355]: Allow cloning to arbitrary engineIDs
 
     snmplib:
-      - [PATCH 1921861]: Avoid endless loop after truncating 64bit int
-      - Better handling of CONTAINER_INSERT failures with multiple indices
+      - [BUG 1619827]: Improve handling of link dependencies
+      - [PATCH  700681]: limited support for UDPv4 broadcast addresses
+      - [PATCH 1882069]: Add token for specifying an exact SNMPv3 engineID
+      - Fix assorted memory leaks
+      - Implemented RFC5343 contextEngineID probing.
+      - Support for the TSM security model for use with tunneling
 
-    snmpd:
-      - [PATCH 2023633]: add SCTP-MIB implementation (Linux only)
-      - suppress annoying "registration != duplicate" warning for root oids
+    misc:
+      - Add config reread support to "net-snmp-config --compile-subagent" code
+      - Preliminary (alpha) support for SNMP over SSH and DTLS/UDP.
+      - Preliminary (alpha) support for the TSM security model
+      - Separate user management into new net-snmp-create-v3-user script
 
-    build:
-      - [BUG 2023803]: Compilation problems on HP-UX 11.31
-      - Update to libtool 1.5.26
-
-    AIX:
-      - Add support for AIX 6.x.
-
-
-*5.4.1*
-
-    snmplib:
-      - [BUG 1619827]: link libraries against needed external libraries
-      - [PATCH 1616912]: fix memory leak in UDP transport code
-      - [PATCH 1592706]: fix memory leak when cloning varbinds
-      - Change snmp_sess_add_ex to consistently close and delete the
-        transport argument on failure, earlier the liveness of the
-        transport argument was undecided.
-
-    snmpd:
-      - [BUG 1558823]: fix ipAddressTable memory leak
-      - [BUG 1596638]: fix memory leak in ipCidrRouteTable, inetCidrRouteTable
-      - [BUG 1611524]: fix tcp connection table file descriptor leak
-      - handle row deletion issues in dataset tables
-      - [BUG 1712988]: default and configurable maximum number of
-        varbinds returnable to a GETBULK request.
-      - [PATCH 1666737]: include ipv6 counts in
-	udpInDatagrams, udpNoPorts, udpInErrors, udpOutDatagrams
-      - [PATCH 1700157]: fixes ordering of exec tokens in the resulting mib tree
-      - [PATCH 1719253]: fix skipNFSInHostResources so it does not break on the
-	second walk of the table.
+    building:
+      - Improved cross-compilation support
+      - Improved library layering & dependency handling when linking apps
+      - Improved RPM spec files, for consistency with vendor-provided packages.
+      - Mechanism for selecting build environment based on version
+      - New test scripts to test Net-SNMP transport functionality
+      - Restructure configure template
+      - Update to autoconf 2.63 & libtool 2.2.6
 
     perl:
-      - link Perl modules against the exact set of libraries needed
-      - [BUG 1619827]: properly link against libperl when configured with
-	--enable-as-needed
-      - [PATCH 1725049]: fix bulkwalk in cases of non-repeater
-
-    build:
-      - update to libtool 1.5.24 (from 1.5.22)
+      - [BUG 1619827]: improve handling of link dependencies
+      - [PATCH 1956193]: beta threadable perl module code for SNMPv1/2c usage.
 
     python:
-      - [PATCH 1716114]: Let python build in the Net-SNMP source tree
+      - [PATCH 1716114]: Let python build in source tree (Debian patch #38)
 
-    MacOSX:
-      - [PATCH 1600522]: CPU Hardware Abstraction Layer (HAL)
-        implementation for mach/darwin
-      - IF-MIB rewrite now enabled by default
-
-    Win32:
-      - fix AES support
-      - [PATCH 1706344]: fix compilation with cygwin
-
-    IRIX:
-      - [PATCH 1709748]: Optimized IRIX cpu stats
+    Linux:
+      - [PATCH 1704105]: Add IPv6 support to the inetNetToMediaTable
+      - [PATCH 1705594]: Various fixes to ipAddressPrefixTable reporting
+      - [PATCH 1708243]: Implement ipDefaultRouteTable
+      - [PATCH 1715405]: Implement ipv6ScopeZoneIndexTable
+      - [PATCH 1724602]: MfD-based ipDefaultRouterTable implementation
+      - [PATCH 1828602]: Support ipDefaultTTL and ipForwarding SETs
+      - [PATCH 1927751]: Implement icmpMsgStatsTable
+      - [PATCH 2023633]: Implement SCTP-MIB
+      - [PATCH 2053273]: Implement EtherLike MIB
 
     AIX:
-      - Fix default shared library building instead of forcing static use
+      - Add support for AIX 6.x
+      - Fix default shared library building instead of forcing static
 
     FreeBSD:
       - [BUG 1633483]: Support CPU HAL on FreeBSD4.x
+      - [PATCH 1623874]: add GNU/kFreeBSD support
+
+    IRIX:
+      - [PATCH 1709748]: Optimized IRIX cpu stats
+      - [PATCH 1675869]: CPU statistics for IRIX based on PCP
+
+    MacOSX:
+      - [PATCH 1600522]: CPU HAL implementation for mach/darwin
+
+    Solaris:
+      - [PATCH 1719730]: support for ipSystemStatsTable and ipAddressTable
+
+    Win32:
+      - [PATCH 2686248]: Fix several winExtDLL bugs.
+      - [PATCH 1706344]: Fix compilation with cygwin
+      - Fix AES support
 
 
 *5.4*
diff --git a/PORTING b/PORTING
index dacb15a..01e0954 100644
--- a/PORTING
+++ b/PORTING
@@ -75,17 +75,13 @@
 --- STRUCTURE MEMBER CHECKS
 
 In configure.in:
-  AC_CHECK_STRUCT_FOR([
+  AC_CHECK_MEMBERS([struct STRUCTURE.MEMBER],,,[[
 #include lines
-], STRUCTURE, MEMBER)
-   ^^^^^^^^^  ^^^^^^  (change)
-
-In acconfig.h:
-  #undef STRUCT_STRUCTURE_HAS_MEMBER
-                ^^^^^^^^^     ^^^^^^  (change)
+]])
+                           ^^^^^^^^^ ^^^^^^  (change)
 
 In source code:
-  #ifdef STRUCT_STRUCTURE_HAS_MEMBER
+  #ifdef HAVE_STRUCT_STRUCTURE_MEMBER
     /* use it */
   #endif
 
diff --git a/README b/README
index 629af31..d279ce2 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-	       README file for net-snmp Version: 5.4.4
+	       README file for net-snmp Version: 5.5.2
 
 DISCLAIMER
 
@@ -256,7 +256,7 @@
     Dan A. Dickey <ddickey@transition.com>
     Dave Shield <D.T.Shield@csc.liv.ac.uk>
     Giovanni S. Marzot <gmarzot@nortelnetworks.com>
-    Niels Baggesen <recnba@mediator.uni-c.dk>
+    Niels Baggesen <nba@users.sourceforge.net>
     Simon Leinen <simon@limmat.switch.ch>
     David T. Perkins <dperkins@dsperkins.com>
     Mike Perik <mikep@crt.com>
diff --git a/README.agent-mibs b/README.agent-mibs
index 8716f8d..428024f 100644
--- a/README.agent-mibs
+++ b/README.agent-mibs
@@ -40,6 +40,7 @@
   G  scalar group helper
   W  watched scalar 
   M  mfd
+  C  container table
 
 Platform Keys
 ------------------
@@ -63,9 +64,10 @@
  table/object group           OS       Rel   Styl File
 ==============================================================================
 SNMPv2-MIB
- system.*.0                   A         3.2     O mibII/system_mib.c
- sysORTable                   A         3.4     O mibII/sysORTable.c
- snmp.*.0                     A         3.2     O mibII/snmp_mib.c
+ system.?.0                   A         5.5     W mibII/system_mib.c
+ .sysORLastChange.0           A         5.5     W mibII/sysORTable.c
+ sysORTable                   A         5.5     C mibII/sysORTable.c
+ snmp.*.0                     A         5.5     G mibII/snmp_mib_5_5.c
  setSerialNo.0                A         5.0     W mibII/setSerialNo.c
 
 ------------------------------------------------------------------------------
@@ -74,15 +76,15 @@
 
 ------------------------------------------------------------------------------
 SNMP-MPD-MIB
- snmpMPDStats.*.0             A         ~4.0?   O snmpv3/snmpMPDStats.c
+ snmpMPDStats.*.0             A         ~4.0?   G snmpv3/snmpMPDStats_5_5.c
 
 ------------------------------------------------------------------------------
 SNMP-TARGET-MIB
  snmpTargetSpinLock.0         A         3.6     O target/snmpTargetAddrEntry.c
  snmpTargetAddrTable          A         3.6     O target/snmpTargetAddrEntry.c
  snmpTargetParamsTable        A         3.6     O target/snmpTargetParamsEntry.c
- snmpUnavailableContexts.0    A         5.0     O target/target_counters.c
- snmpUnknownContexts.0        A         5.0     O target/target_counters.c
+ snmpUnavailableContexts.0    A         5.5     G target/target_counters_5_5.c
+ snmpUnknownContexts.0        A         5.5     G target/target_counters_5_5.c
 
 ------------------------------------------------------------------------------
 SNMP-NOTIFICATION-MIB
@@ -103,6 +105,7 @@
 ------------------------------------------------------------------------------
 SNMP-USER-BASED-SM-MIB
  usmStats.*.0                 A         ~4.0    O snmpv3/usmStats.c
+ usmStats.*.0                 A         5.5     G snmpv3/usmStats_5_5.c
  usmUserTable                 A         ~4.0?   O snmpv3/usmUser.c
 
 ------------------------------------------------------------------------------
@@ -151,19 +154,21 @@
  icmp.*.0                     U $2      ~3.2    G mibII/icmp.c
 
  ipSystemStatsTable           L         5.2     M ip-mib/=/*
+ ipSystemStatsTable            S        5.5     M ip-mib/=/*
  ipIfStatsTableLastChange.0   ---
- ipIfStatsTable               ---
+ ipIfStatsTable               L--       5.5     M ip-mib/=/*
 
  ipAddrTable (D)              U $2      4.2     O mibII/ipAddr.c
- ipAddressSpinLock.0          ---
+ ipAddressSpinLock.0          A         5.5     O mibII/ipAddr.c
  ipAddressTable               L         5.2     M ip-mib/=/*
+ ipAddressTable                S        5.5     M ip-mib/=/*
  ipAddressPrefixTable         L         5.3     M ip-mib/=/*
 
  ipRouteTable (D)             U $2      ~3.5    O mibII/*route*.c
  ipNetToMediaTable (D)        U $2      ~3.5    O mibII/at.c
  ipNetToPhysicalTable         (implemented as inetNetToMediaTable)
  inetNetToMediaTable          L         5.2     M ip-mib/=/*
- ipDefaultRouterTable         ---
+ ipDefaultRouterTable         L         5.5     M ip-mib/=/*
 
  icmpStatsTable               ---
  icmpMsgStatsTable            ---
@@ -179,6 +184,9 @@
  ipv6RouterAdvertSpinLock.0   ---
  ipv6ScopeZoneIndexTable      ---
 
+ ipForwarding.0               L          5.4    S ip-mib/ip_scalars.c
+ ipDefaultTTL.0               L          5.4    S ip-mib/ip_scalars.c
+
 ------------------------------------------------------------------------------
 IPV6-MIB
  ipv6MIBObjects.?.0           U         4.1     O mibII/ipv6.c
@@ -236,6 +244,7 @@
 ------------------------------------------------------------------------------
 RMON-MIB
  etherStatsTable              U         5.0     O Rmon/statistics.c
+ .etherStatsJabbers           L3        5.5     M rmon-mib/=/*
  etherHistoryControlTable     U         5.0     O Rmon/history.c
  etherHistoryTable            U         5.0     O Rmon/history.c
  alarmTable                   U         3.2     O Rmon/alarm.c
@@ -323,7 +332,7 @@
 
 ------------------------------------------------------------------------------
 EtherLike-MIB
- *                            ---
+ dot3StatsTable               L        5.5      M etherlike-mib/=
 
 ------------------------------------------------------------------------------
 AGENTX-MIB
@@ -408,16 +417,16 @@
 
 ------------------------------------------------------------------------------
 SCTP-MIB
- sctpStats                    L         5.4.2   S sctp-mib/sctpScalars*
- sctpParameters               L         5.4.2   S sctp-mib/sctpScalars*
- sctpAssocTable               L         5.4.2   C sctp-mib/=
- sctpAssocLocalAddrTable      L         5.4.2   C sctp-mib/=
- sctpAssocRemAddrTable        L         5.4.2   C sctp-mib/=
- sctpLookupLocalPortTable     L         5.4.2   C sctp-mib/=
- sctpLookupRemPortTable       L         5.4.2   C sctp-mib/=
- sctpLookupRemHostNameTable   L         5.4.2   C sctp-mib/=
- sctpLookupRemPrimIPAddrTable L         5.4.2   C sctp-mib/=
- sctpLookupRemIPAddrTable     L         5.4.2   C sctp-mib/=
+ sctpStats                    L         5.5     S sctp-mib/sctpScalars*
+ sctpParameters               L         5.5     S sctp-mib/sctpScalars*
+ sctpAssocTable               L         5.5     C sctp-mib/=
+ sctpAssocLocalAddrTable      L         5.5     C sctp-mib/=
+ sctpAssocRemAddrTable        L         5.5     C sctp-mib/=
+ sctpLookupLocalPortTable     L         5.5     C sctp-mib/=
+ sctpLookupRemPortTable       L         5.5     C sctp-mib/=
+ sctpLookupRemHostNameTable   L         5.5     C sctp-mib/=
+ sctpLookupRemPrimIPAddrTable L         5.5     C sctp-mib/=
+ sctpLookupRemIPAddrTable     L         5.5     C sctp-mib/=
 
 ==============================================================================
 
@@ -425,6 +434,7 @@
 ----------
  1: available for systems using KAME ipv6
  2: with platform SDK. See README.win32
+ 3: works only with Intel and Broadcom network cards and must run as root only
 
 Other feature info
 ------------------
diff --git a/README.aix b/README.aix
index 16f725e..e25e9b6 100644
--- a/README.aix
+++ b/README.aix
@@ -6,7 +6,6 @@
 
 There are the following known problems on AIX:
 
-
 1) Shared libraries / embedded perl
 
 Up to (and including) net-snmp 5.4, configure forced a static build
@@ -14,11 +13,10 @@
 
 Starting with net-snmp 5.4.1, we build shared libraries by default on AIX
 (like on any other platform) using run-time linking. configure forces the
-use of the required "-brtl" linker flag. We also recommend
+use of the required "-brtl" linker flag.
 
-   ./configure --enable-as-needed ...
-
-for proper libperl linking.
+With net-snmp 5.5 the shared library build is broken again but the there is
+no forced static build - use --disable-shared when building.
 
 2) "grep: capacity exceeded" or "sed: Command line is too long" during configure
 
diff --git a/README.irix b/README.irix
index 79bf7ec..c7977e9 100644
--- a/README.irix
+++ b/README.irix
@@ -34,17 +34,7 @@
   http://sf.net/support/tracker.php?aid=1675869
 
 
-3. Perl
--------
-
-When compiling with Perl support, it's recommended to specify
-
-  ./configure --enable-as-needed
-
-for proper libperl linking.
-
-
-4. Known Issues
+3. Known Issues
 ---------------
 
 Accessing certain MIB objects on IRIX64 machines (i.e. when running a 64-bit 
@@ -56,7 +46,7 @@
    ./configure --without-kmem-usage ...
 
 
-5. Feedback
+3. Feedback
 -----------
 
 Please also see README and PORTING.
diff --git a/README.osX b/README.osX
index b15afa7..49b58e7 100644
--- a/README.osX
+++ b/README.osX
@@ -7,10 +7,6 @@
 
   - ALL
 
-    - Test 44 (Perl AgentX Subagent) fails.
-
-       - configure with --enable-as-needed for proper libperl linking
-
     - nlist doesn't support icmpstat
 
        - disable the icmp module during configure by specifying
@@ -19,7 +15,7 @@
 
 
   - 10.4.7 (Universal) and Leopard with 5.4 sources:
-        [Supplied by Chris Jalbert, slightly updated]
+        [Supplied by Chris Jalbert]
 
        - build using gcc 4.0 (see below) and configure using:
                         --with-persistent-directory=/var/db/net-snmp \
@@ -27,7 +23,6 @@
                         --without-rpm \
                         --with-mib-modules="host ucd-snmp/diskio" \
                         --with-out-mib-modules="mibII/icmp host/hr_swrun" \
-                        --enable-as-needed \
                         --without-kmem-usage
 
        The first line sets up persistent storage in the OS X standard location.
@@ -64,20 +59,3 @@
                    --prefix=/usr --with-persistent-directory=/var/db/ucd-snmp
                    --with-mib-modules=host
 
--------------------------------------
-
-With Mac OS X 10.5.2, and Net-SNMP 5.4.2, the default configuration
-seems to build and run successfully.   The main tweak needed to get
-things working was to disable "embedded perl" (which is active by
-default in 5.4 and above).
-
-  The issue here is that enabling embedded perl will try to use the
-same CFLAGS used for compiling perl, when compiling the Net-SNMP code
-(which is probably reasonable).  Unfortunately, the default perl binary
-that comes with Mac OS/X 10.5 (at least) is a "universal binary",
-so the CFLAGS that it uses include "-arch i386 -arch ppc".  This
-dual-architecture option confuses the configure script, and means
-that it cannot detect the characteristics of the host system correctly.
-
-Dave
-June 2008
diff --git a/README.solaris b/README.solaris
index aebce6f..625aae2 100644
--- a/README.solaris
+++ b/README.solaris
@@ -994,10 +994,8 @@
 
    ./configure -enable-embedded-perl ...
 
-It's recommended to add --enable-as-needed for proper libperl linking.
-
-Enabling Perl support should only be done if you are sure you really 
-need Perl, for the following reasons:
+This should only be done if you are sure you really need Perl, 
+for the following reasons:
 
 Solaris 8 and later ship with a version of Perl compiled using Sun's cc. 
 
diff --git a/README.sql b/README.sql
new file mode 100644
index 0000000..e2f7038
--- /dev/null
+++ b/README.sql
@@ -0,0 +1,29 @@
+snmptrapd MySQL Logging
+-----------------------
+
+A trap handler for logging traps to a MySQL database was added
+in release 5.5.0.
+
+The MySQL database location and password must be configured in
+/root/.my.cnf:
+
+	[snmptrapd]
+	host=localhost
+	password=sql
+
+User may also be configured, if using a MySQL user besides root.
+
+snmptrapd.conf must be configured to for the queue size and
+periodic flush interval:
+
+	# maximum number of traps to queue before forced flush
+	sqlMaxQueue 140
+
+	# seconds between periodic queue flushes
+	sqlSaveInterval 9
+
+A value of 0 for sqlSaveInterval will completely disable MySQL
+logging of traps.
+
+The schema must be loaded into MySQL before running snmptrapd.
+The schema can be found in dist/schema-snmptrapd.sql
diff --git a/README.win32 b/README.win32
index d942b8a..e954aea 100644
--- a/README.win32
+++ b/README.win32
@@ -46,15 +46,13 @@
 All applications build with Microsoft Visual C++ 6.0, Microsoft Development
 Environment 2003 (MSVC 7.0/7.1), gcc under Cygwin, and gcc under MinGW.  
 
-  -  All of the applications work
-     (snmpwalk, snmpget, snmpset, snmptrap, etc...).
-  -  The system, snmp, ip, tcp, udp, icmp mibgroups function
-         (when agent is built using the snmpdsdk project).
+  -  All of the applications work (snmpwalk, snmpget, snmpset, snmptrap, ...).
+  -  The system, snmp, ip, tcp, udp and icmp MIB-groups work (requires the
+     Platform SDK).
   -  The Net-SNMP agent runs as an AgentX master agent or as subagent.
   -  smux is working.
   -  The target, notification, disman/mte groups compile but are not tested.
   -  The TCP/IPv6 and UDP/IPv6 transports compile but are not tested.
-         
   -  Extending the agent to support enterprise-specific MIBs works.
   -  Running the agent on a non-standard UDP or TCP port works.
   -  Snmpd can be registered as a Windows NT/2000/XP service.
@@ -78,8 +76,8 @@
   -  All Debug and Release targets linked with libsnmp project targets
      build without errors, and are fully functional.
 
-  -  Both the Workspace graphical environment and command line nmake is 
-     supported for building under MSVC.
+  -  Both building via the interactive development environment and via the
+     command line (nmake) is supported.
 
 
 ***************************************************************************
@@ -405,33 +403,22 @@
 *
 ***************************************************************************
 
-If you are compiling using Microsoft Visual C++ 6.0, it is recommended that
-you install the Core Platform SDK (PSDK).  Without the PSDK, some functionality
-will be disabled such as the core elements of the mibII group of the agent 
-which use the "IP Helper API" (IPHLPAPI).
+If you are using Microsoft Visual Studio 6.0, you will have to install the
+Platform SDK (PSDK) first.
 
-To determine what code is disabled when the PSDK is not used, search the
-source code for HAVE_WIN32_PLATFORM_SDK.
+The Windows Server 2003 Platform SDK can be downloaded via the following URL
+(this is the most recent version of the PSDK that is still compatible with
+MSVC 6.0): http://www.microsoft.com/downloads/details.aspx?FamilyId=A55B6B43-E24F-4EA3-A93E-40C0EC4F68E5&displaylang=en
 
-The PSDK can be downloaded from the MSDN site.  Go to http://msdn.microsoft.com 
-and do a search for 'psdk download' (without the quotes).  You should find both
-a web install and a full install.  
+Once the PSDK has been installed, select the following action from the Start
+Menu: Programs / Microsoft Windows SDK / Visual Studio Registration / Windows
+SDK Configuration Tool.
 
-When installing the SDK, all that is required is the 'Core'.
-
-Once this package has installed, from the Start Menu run 
-  "Programs ->Microsoft Platform SDK... -> 
-   Visual Studio Registration ->
-   Register PSDK Directories with Visual Studio"
-
-If you are compiling using any of the following systems, the PSDK download
-is not necessary, as the required parts of the PSDK are included with the 
-installation of the compiler:
-
-    - Microsoft Development Environment 2002 (MSVC 7.0)
-    - Microsoft Development Environment 2003 (MSVC 7.1)
-    - Cygwin (gcc)
-    - MinGW (gcc)
+If you are using any of the following environments, the PSDK download is not
+necessary as the required parts of the PSDK are included:
+    - Microsoft Visual Studio 2002 or later.
+    - Cygwin.
+    - MinGW.
 
 In order for the process part of the host resources MIB to work under Windows
 NT you will need to obtain PSAPI.DLL. This is available under the download 
@@ -451,12 +438,13 @@
 
 There are two ways to build Net-SNMP using Microsoft Visual C++.  The first
 and easiest method is using Configure and nmake on the command line, and the 
-second is using the Workspace files with the graphical interface.
+second is using the Workspace files inside the interactive development
+environment.
 
 To use nmake on the command line, the Configure script is run first to create
-the various make files.  Once they are created, nmake is used to build the 
-applications.  Perl is required to use this method, as the Configure script
-is written in Perl.  ActiveState ActivePerl is available at:
+the various makefiles.  Once these have been created, nmake is used to build
+the applications.  Perl is required to use this method, as the Configure
+script is written in Perl.  ActiveState ActivePerl is available at:
 
         http://www.activestate.com/Products/ActivePerl/
 
@@ -465,35 +453,26 @@
 recommended that you read and understand how the workspaces are configured
 even if you will only be using the command line Configure / nmake system.
 
-For the graphical interface, there are two main Win32 workspaces 
-('win32.dsw' and 'win32sdk.dsw'), containing more or less the same set 
-of projects, plus 'libdll.dsw' which contains a minimal set of projects 
-for use with the Perl module only.  
-
-Win32.dsw is for developers who have not installed the Platform SDK from 
-Microsoft's MSDN SDK Update site when using Microsoft Visual Studio 6.0.
-Win32sdk.dsw is for those who have or who are using the Microsoft Development 
-Environment 2002/2003 (MSVC 7.0/7.1), Cygwin (gcc) or MinGW (gcc).
-
-Libdll.dsw compiles a DLL version of snmplib (netsnmp.dll).
+For building via the interactive development environment, there are the Win32
+workspaces win32.dsw and libdll.dsw. The last workspace allows to build a DLL
+version of snmplib (netsnmp.dll).
 
 There is one core development library ('libsnmp'), together with a number 
 of utility projects for the individual executable commands ('snmpget', 
 'snmpwalk', etc...).  All of these projects require the .lib created by 
 the libsnmp project.
 
-The agent requires the core library plus the other three library projects 
-('libagent', libhelpers' and either 'netsnmpmibs' or 'netsnmpmibssdk' 
-depending on which workspace is being used) together with the main agent 
-project (either 'snmpd' or 'snmpdsdk').
+The agent requires the core library plus the other three library projects
+('libagent', libhelpers' and 'netsnmpmibs') together with the main agent
+project ('snmpd').
 
 The final application project is the trap handler 'snmptrapd'.  This also
 requires the agent libraries ('libagent', 'libhelpers' and 'netsnmpmibs')
 as well as the core development library.
 
-There is a Debug version and Release version for each subproject.
-This is so the Debug and Release versions of an application can be built and 
-tested separately.
+There is a Debug version and Release version for each subproject.  This is so
+the Debug and Release versions of an application can be built and tested
+separately.
 
 Both VC++ 6.0 and 7.1 have been tested.  Building with earlier Microsoft
 compiler versions is no longer supported.
@@ -508,9 +487,9 @@
 
 Since the MSVC build environment does not natively use "configure" nor "make"
 to generate the various pathnames that the programs require, the header files 
-need to be manually modified when using the graphical build system, and an 
-install script is provided.  When using the Perl Configure / nmake system, 
-the header files are automatically modified and require no manual editing.
+need to be manually modified when using the IDE, and an install script is
+provided.  When using the Perl Configure / nmake system, the header files are
+automatically modified and require no manual editing.
 
 The projects are arranged so that ALL of the usable products, the .exe files,
 are written to the win32\bin directory.  The win32\lib directory is used only 
@@ -715,19 +694,20 @@
 *
 ***************************************************************************
 
-The win32sdk.dsw workspace will build the agent that provides mib-II objects
-for network interface layers, and the IP, ICMP, TCP and UDP tables.  This
-workspace requires the Platform SDK to be installed.  Use the win32.dsw 
-workspace if you don't have or don't need these features.  Note:  Other 
-features may be disabled if the Platform SDK is not used.  See the section
-'Installing Platform SDK' for more information.
+The win32.dsw workspace allows to build the agent that provides mib-II objects
+for network interface layers, and the IP, ICMP, TCP and UDP tables. Proceed as
+follows:
 
-1. If SNMPv3 encryption capabilities or SHA authentication is required,
+1. Update the version stamp in win32\net-snmp\net-snmp-config.h.  The current
+   version can be found in the Unix configure script (top level folder) by 
+   looking for the PACKAGE_VERSION variable.
+
+2. If SNMPv3 encryption capabilities or SHA authentication is required,
    install the OpenSSL DLL and library file as described in the section 
    'Microsoft Visual C++ - Building with OpenSSL" and then continue with 
    step 2.
 
-2. The default installation path is c:\usr.  This folder will contain all
+3. The default installation path is c:\usr.  This folder will contain all
    the binaries, MIB files, configuration files etc.  To change the location,
    the win32\net-snmp\net-snmp-config.h file needs to be modified by changing
    the INSTALL_BASE variable. 
@@ -739,15 +719,6 @@
 
      For example: #define INSTALL_BASE "c:/usr".  
 
-3. If you are using win32sdk, the Platform SDK must be enabled.  Edit the 
-   the win32\net-snmp\net-snmp-config.h file and *change*:
-
-        /* #undef HAVE_WIN32_PLATFORM_SDK */
-
-   to:
-
-        #define HAVE_WIN32_PLATFORM_SDK 1
-
 4. Build the applications
 
    Static build (does not use NetSNMP.DLL)
@@ -755,7 +726,7 @@
 
    MS VC++ 6.0:
    ------------
-   a. Open win32.dsw or win32sdk.dsw.
+   a. Open win32.dsw.
    b. Click "Build->Batch Build..."  
    c. Set Release and/or Debug in 'Project configurations' to suit.
    d. Click "ReBuild All".
@@ -765,7 +736,7 @@
 
    MS VC++ 7.0+:
    -------------
-   a.  Open win32.dsw or win32sdk.dsw.
+   a.  Open win32.dsw.
    b.  Click "Yes to All" to convert the workspace
    c.  Click "Build->Configuration Manager" and select either Release or Debug for 
        'Active Solution Configuration' and click "Close"
@@ -792,7 +763,7 @@
 
    MS VC++ 6.0:
    ------------
-   a. Open win32.dsw or win32sdk.dsw.
+   a. Open win32.dsw.
    b. Click "Build->Batch Build..."  
    c. Set Release and/or Debug in 'Project configurations' to suit for the 
       applications.  Make sure the following are NOT selected:
@@ -810,7 +781,7 @@
 
    MS VC++ 7.0+:
    -------------
-   a. Open win32.dsw or win32sdk.dsw.
+   a. Open win32.dsw.
    b. Click "Yes to All" to convert the workspace
    c. Click "Build->Configuration Manager" and select either Release or Debug for 
       'Active Solution Configuration' and click "Close"
@@ -829,7 +800,7 @@
       save to a text file if there is some information to share.
    h. Click "File->Close Solution".
   
-5.  If the Perl modules are required, continue with the next section:
+6.  If the Perl modules are required, continue with the next section:
     'Microsoft Visual C++ - Building the Perl SNMP modules'.
 
     Otherwise, continue with the section: 
@@ -842,15 +813,19 @@
 *
 ***************************************************************************
 
-1.  Optional: Make a backup of the existing net-snmp-config.h which contains 
+1.  Update the version stamp in win32\net-snmp\net-snmp-config.h.  The current
+    version can be found in the Unix configure script (top level folder) by 
+    looking for the PACKAGE_VERSION variable.
+
+2.  Optional: Make a backup of the existing net-snmp-config.h which contains 
     settings for a static build of Net-SNMP:
 
     Copy win32\net-snmp\net-snmp-config.h to 
     win32\net-snmp\static-config.h.
 
-2.  Open win32\net-snmp\net-snmp-config.h using a text editor.
+3.  Open win32\net-snmp\net-snmp-config.h using a text editor.
 
-3.  *Change* the following line which is located near the top of the file:
+4.  *Change* the following line which is located near the top of the file:
 
         /* #undef NETSNMP_USE_DLL */
 
@@ -858,13 +833,13 @@
 
         #define NETSNMP_USE_DLL 1
 
-4.  Optional: Make a backup of the new net-snmp-config.h which contains 
+5.  Optional: Make a backup of the new net-snmp-config.h which contains 
     settings for a DLL build of Net-SNMP:
 
     Copy win32\net-snmp\net-snmp-config.h to 
     win32\net-snmp\dll-config.h.
 
-5. Build the DLL
+6. Build the DLL and the applications
 
    MS VC++ 6.0:
    ------------
@@ -880,7 +855,7 @@
 
    MS VC++ 7.0+:
    -------------
-   a. Open libsdll.dsw.
+   a. Open win32dll.dsw.
    b. Click "Yes to All" to convert the workspace
    c. Click "Build->Batch Build..." 
    d. Set Release and/or Debug in 'Project configurations' to suit.
@@ -1277,15 +1252,16 @@
 The following configure options creates a working set of programs:
 
 ./configure \
+	--disable-shared \
 	--with-mib-modules="host agentx disman/event-mib examples/example" \
 	--with-out-mib-modules=host/hr_network \
         --disable-embedded-perl --without-perl-modules \
 
-If you want to use SNMPv3 auth and privacy features, add:
-	--with-openssl="/usr" \
+If you want to disable SNMPv3 auth and privacy features, add:
+	--without-openssl \
 
 If you want to use IPv6 transports, add:
-	--enable-ipv6 --with-transports="TCPIPv6 UDPIPv6"
+	--enable-ipv6
 
 Note:  The source code should *not* be in a folder that contains a space.  For
        example, compiling in your 'My Documents' or your Desktop (usually
@@ -1320,17 +1296,16 @@
 MinGW tools with the MSyS environment. MinGW, MSyS and the associated
 documentation can be downloaded from: http://www.mingw.org.
 
-Compiling net-snmp with MinGW requires GNU regex. A GNU regex package that
-builds under MinGW with MSyS is available at: 
+Compiling net-snmp with MinGW requires GNU regex and libintl. Binaries and
+developer header files for these libraries are available at: 
 
-        http://www.boedog.com/net-snmp/gnu_regex/regex-0-12-mingw-r2.tar.gz
+        http://gnuwin32.sourceforge.net/packages/regex.htm
+        http://gnuwin32.sourceforge.net/packages/libintl.htm
 
-Note:  The source code should *not* be in a folder that contains a space.  For
-       example, compiling in your 'My Documents' or your Desktop (usually
-       c:\Documents and Settings\xxxx\Desktop) is not supported.
-       
-1.  Build and install GNU regex following the instructions in the 
-    regex-0-12-mingw-r2 README.
+Proceed as follows to build Net-SNMP:
+
+1.  Install GNU regex and GNU libintl binaries and developer files in the
+    MinGW tree.
 
 2.  If SNMPv3 encryption capabilities or SHA authentication is required,
     install the OpenSSL DLL and library file as described in the section 
@@ -1357,7 +1332,7 @@
 
 	./configure --prefix="$BASEDIR" \
 		--with-mibdirs="$BASEDIR/share/snmp/mibs" \
-	--with-mib-modules="agentx disman/event-mib examples/example" \
+	--with-mib-modules="agentx disman/event-mib winExtDLL examples/example"\
         --disable-embedded-perl --without-perl-modules \
 
     Note: while the Net-SNMP implementation of the host resources MIB is not
diff --git a/TODO b/TODO
index 2210b6e..49d913e 100644
--- a/TODO
+++ b/TODO
@@ -24,8 +24,8 @@
   Tunnel
   WWW-MIB
   Hardware Abstraction Layer:
-    HostRes	(convert to use HAL and clean up)
-    UCDavis	(convert to use HAL and update structures)
+    HostRes	(convert to use HAL and clean up - in progress)
+    UCDavis	(convert to use HAL and update structures - in progress)
 
 Extensibility:
   AgentX	(reasonably stable now)
diff --git a/acconfig.h b/acconfig.h
index 0ed06b9..5491941 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -23,236 +23,7 @@
  */
 #ifndef NETSNMP_NO_AUTOCONF_DEFINITIONS
 
-/* define if you have type int32_t */
-#undef HAVE_INT32_T
 
-/* define if you have type uint32_t */
-#undef HAVE_UINT32_T
-
-/* define if you have type u_int32_t */
-#undef HAVE_U_INT32_T
-
-/* define if you have type int64_t */
-#undef HAVE_INT64_T
-
-/* define if you have type uint64_t */
-#undef HAVE_UINT64_T
-
-/* define if you have type u_int64_t */
-#undef HAVE_U_INT64_T
-
-/* define if you have type intptr_t */
-#undef HAVE_INTPTR_T
-
-/* define if you have type uintptr_t */
-#undef HAVE_UINTPTR_T
-
-/* got socklen_t? */
-#undef HAVE_SOCKLEN_T
-
-/* got in_addr_t? */
-#undef HAVE_IN_ADDR_T
-
-/* define if you have getdevs() */
-#undef HAVE_GETDEVS
-
-/* define if you have devstat_getdevs() */
-#undef HAVE_DEVSTAT_GETDEVS
-
-/* define if you have <netinet/in_pcb.h> */
-#undef HAVE_NETINET_IN_PCB_H
-
-/* define if you have <sys/disklabel.h> */
-#undef HAVE_SYS_DISKLABEL_H
-
-/* define if your compiler (processor) defines __FUNCTION__ for you */
-#undef HAVE_CPP_UNDERBAR_FUNCTION_DEFINED
-
-/* on aix, if you have perfstat */
-#undef HAVE_PERFSTAT
-
-/* define if you have libdb, libnm or librpm, respectively */
-#undef HAVE_LIBDB
-#undef HAVE_LIBNM
-#undef HAVE_LIBRPM
-
-/* define if you have pkginfo */
-#undef HAVE_PKGINFO
-
-/* define if you have gethostbyname */
-#undef HAVE_GETHOSTBYNAME
-
-/* define if you have the perl_eval_pv() function */
-#undef HAVE_PERL_EVAL_PV_LC
-
-/* define if you have the Perl_eval_pv() function */
-#undef HAVE_PERL_EVAL_PV_UC
-
-/* printing system */
-#undef HAVE_LPSTAT
-#undef LPSTAT_PATH
-#undef HAVE_PRINTCAP
-/* Use dmalloc to do malloc debugging? */
-#undef HAVE_DMALLOC_H
-
-/* location of UNIX kernel */
-#define KERNEL_LOC "/vmunix"
-
-/* location of mount table list */
-#define ETC_MNTTAB "/etc/mnttab"
-
-/* location of swap device (ok if not found) */
-#undef DMEM_LOC
-
-/* Command to generate ps output, the final column must be the process
-   name withOUT arguments */
-#define PSCMD "/bin/ps"
-
-/* Where is the uname command */
-#define UNAMEPROG "/bin/uname"
-
-/* define if you are using linux and /proc/net/dev has the compressed
-   field, which exists in linux kernels 2.2 and greater. */
-#undef PROC_NET_DEV_HAS_COMPRESSED
-
-/* define rtentry to ortentry on SYSV machines (alphas) */
-#undef RTENTRY
-
-/* Use BSD 4.4 routing table entries? */
-#undef RTENTRY_4_4
-
-/* Does struct sigaction have a sa_sigaction field? */
-#undef STRUCT_SIGACTION_HAS_SA_SIGACTION
-
-/* Does struct tm have a tm_gmtoff field? */
-#undef STRUCT_TM_HAS_TM_GMTOFFF
-
-/* Does struct sockaddr have a sa_len field? */
-#undef STRUCT_SOCKADDR_HAS_SA_LEN
-
-/* Does struct sockaddr have a sa_family2 field? */
-#undef STRUCT_SOCKADDR_HAS_SA_UNION_SA_GENERIC_SA_FAMILY2
-
-/* Does struct sockaddr_storage have a ss_family field? */
-#undef STRUCT_SOCKADDR_STORAGE_HAS_SS_FAMILY
-
-/* Does struct sockaddr_storage have a __ss_family field? */
-#undef STRUCT_SOCKADDR_STORAGE_HAS___SS_FAMILY
-
-/* Does struct in6_addr have a s6_un.sa6_ladd field? */
-#undef STRUCT_IN6_ADDR_HAS_S6_UN_SA6_LADDR
-
-/* rtentry structure tests */
-#undef RTENTRY_RT_NEXT
-#undef STRUCT_RTENTRY_HAS_RT_DST
-#undef STRUCT_RTENTRY_HAS_RT_UNIT
-#undef STRUCT_RTENTRY_HAS_RT_USE
-#undef STRUCT_RTENTRY_HAS_RT_REFCNT
-#undef STRUCT_RTENTRY_HAS_RT_HASH
-
-/* ifnet structure tests */
-#undef STRUCT_IFNET_HAS_IF_BAUDRATE
-#undef STRUCT_IFNET_HAS_IF_BAUDRATE_IFS_VALUE
-#undef STRUCT_IFNET_HAS_IF_SPEED
-#undef STRUCT_IFNET_HAS_IF_TYPE
-#undef STRUCT_IFNET_HAS_IF_IMCASTS
-#undef STRUCT_IFNET_HAS_IF_IQDROPS
-#undef STRUCT_IFNET_HAS_IF_LASTCHANGE_TV_SEC
-#undef STRUCT_IFNET_HAS_IF_LASTCHANGE_TV_NSEC
-#undef STRUCT_IFNET_HAS_IF_NOPROTO
-#undef STRUCT_IFNET_HAS_IF_OMCASTS
-#undef STRUCT_IFNET_HAS_IF_XNAME
-#undef STRUCT_IFNET_HAS_IF_OBYTES
-#undef STRUCT_IFNET_HAS_IF_IBYTES
-#undef STRUCT_IFNET_HAS_IF_ADDRLIST
-
-/* tcpstat.tcps_rcvmemdrop */
-#undef STRUCT_TCPSTAT_HAS_TCPS_RCVMEMDROP
-
-/* udpstat.udps_discard */
-#undef STRUCT_UDPSTAT_HAS_UDPS_DISCARD
-
-/* udpstat.udps_discard */
-#undef STRUCT_UDPSTAT_HAS_UDPS_NOPORT
-
-/* udpstat.udps_discard */
-#undef STRUCT_UDPSTAT_HAS_UDPS_NOPORTBCAST
-
-/* udpstat.udps_discard */
-#undef STRUCT_UDPSTAT_HAS_UDPS_FULLSOCK
-
-/* arphd.at_next */
-#undef STRUCT_ARPHD_HAS_AT_NEXT
-
-/* ifaddr.ifa_next */
-#undef STRUCT_IFADDR_HAS_IFA_NEXT
-
-/* ifnet.if_mtu */
-#undef STRUCT_IFNET_HAS_IF_MTU
-
-/* swdevt.sw_nblksenabled */
-#undef STRUCT_SWDEVT_HAS_SW_NBLKSENABLED
-
-/* nlist.n_value */
-#undef STRUCT_NLIST_HAS_N_VALUE
-
-/* nlist64.n_value */
-#undef STRUCT_NLIST64_HAS_N_VALUE
-
-/* ipstat structure tests */
-#undef STRUCT_IPSTAT_HAS_IPS_CANTFORWARD
-#undef STRUCT_IPSTAT_HAS_IPS_CANTFRAG
-#undef STRUCT_IPSTAT_HAS_IPS_DELIVERED
-#undef STRUCT_IPSTAT_HAS_IPS_FRAGDROPPED
-#undef STRUCT_IPSTAT_HAS_IPS_FRAGTIMEOUT
-#undef STRUCT_IPSTAT_HAS_IPS_LOCALOUT
-#undef STRUCT_IPSTAT_HAS_IPS_NOPROTO
-#undef STRUCT_IPSTAT_HAS_IPS_NOROUTE
-#undef STRUCT_IPSTAT_HAS_IPS_ODROPPED
-#undef STRUCT_IPSTAT_HAS_IPS_OFRAGMENTS
-#undef STRUCT_IPSTAT_HAS_IPS_REASSEMBLED
-
-/* vfsstat.f_frsize */
-#undef STRUCT_STATVFS_HAS_F_FRSIZE
-
-/* vfsstat.f_files */
-#undef STRUCT_STATVFS_HAS_F_FILES
-
-/* statfs inode structure tests*/
-#undef STRUCT_STATFS_HAS_F_FILES
-#undef STRUCT_STATFS_HAS_F_FFREE
-#undef STRUCT_STATFS_HAS_F_FAVAIL
-
-/* des_ks_struct.weak_key */
-#undef STRUCT_DES_KS_STRUCT_HAS_WEAK_KEY
-
-/* ifnet needs to have _KERNEL defined */
-#undef IFNET_NEEDS_KERNEL
-
-/* sysctl works to get boottime, etc... */
-#undef NETSNMP_CAN_USE_SYSCTL
-
-/* define if SIOCGIFADDR exists in sys/ioctl.h */
-#undef SYS_IOCTL_H_HAS_SIOCGIFADDR
-
-/* Define if statfs takes 2 args and the second argument has
-   type struct fs_data. [Ultrix] */
-#undef STAT_STATFS_FS_DATA
-
-/* Define if the TCP timer constants in <netinet/tcp_timer.h>
-   depend on the integer variable `hz'.  [FreeBSD 4.x] */
-#undef TCPTV_NEEDS_HZ
-
-/* Not-to-be-compiled macros for use by configure only */
-#define config_require(x)
-#define config_exclude(x)
-#define config_arch_require(x,y)
-#define config_parse_dot_conf(w,x,y,z)
-#define config_add_mib(x)
-#define config_belongs_in(x)
-#define config_error(x)
-#define config_warning(x)
-  
 #if defined (WIN32) || defined (mingw32) || defined (cygwin)
 #define ENV_SEPARATOR ";"
 #define ENV_SEPARATOR_CHAR ';'
@@ -267,47 +38,6 @@
 
 /* end of definitions added by configure on-the-fly */
 
-#ifndef HAVE_STRCHR
-#ifdef HAVE_INDEX
-# define strchr index
-# define strrchr rindex
-#endif
-#endif
-
-#ifndef HAVE_INDEX
-#ifdef HAVE_STRCHR
-#ifdef mingw32
-# define index(a,b) strchr(a,b)
-# define rindex(a,b) strrchr(a,b)
-#else
-# define index strchr
-# define rindex strrchr
-#endif
-#endif
-#endif
-
-#ifndef HAVE_MEMCPY
-#ifdef HAVE_BCOPY
-# define memcpy(d, s, n) bcopy ((s), (d), (n))
-# define memmove(d, s, n) bcopy ((s), (d), (n))
-# define memcmp bcmp
-#endif
-#endif
-
-#ifndef HAVE_MEMMOVE
-#ifdef HAVE_MEMCPY
-# define memmove memcpy
-#endif
-#endif
-
-#ifndef HAVE_BCOPY
-#ifdef HAVE_MEMCPY
-# define bcopy(s, d, n) memcpy ((d), (s), (n))
-# define bzero(p,n) memset((p),(0),(n))
-# define bcmp memcmp
-#endif
-#endif
-
 /* If you have openssl 0.9.7 or above, you likely have AES support. */
 #undef NETSNMP_USE_OPENSSL
 #if defined(NETSNMP_USE_OPENSSL) && defined(HAVE_OPENSSL_AES_H) && defined(HAVE_AES_CFB128_ENCRYPT)
@@ -364,27 +94,6 @@
 /* default list of mibs to load */
 #define NETSNMP_DEFAULT_MIBS "IP-MIB:IF-MIB:TCP-MIB:UDP-MIB:SNMPv2-MIB:RFC1213-MIB"
 
-/* default location to look for mibs to load using the above tokens
-   and/or those in the MIBS envrionment variable*/
-#undef NETSNMP_DEFAULT_MIBDIRS
-
-/* default mib files to load, specified by path. */
-#undef NETSNMP_DEFAULT_MIBFILES
-
-/* should we compile to use special opaque types: float, double,
-   counter64, i64, ui64, union? */
-#undef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES
-
-/* define if you want to compile support for both authentication and
-   privacy support. */
-#undef NETSNMP_ENABLE_SCAPI_AUTHPRIV
-
-/* define if you are using the MD5 code ...*/
-#undef NETSNMP_USE_INTERNAL_MD5
-
-/* define if you are using the codeS11 library ...*/
-#undef NETSNMP_USE_PKCS11
-
 /* debugging stuff */
 /* if defined, we optimize the code to exclude all debugging calls. */
 #undef NETSNMP_NO_DEBUGGING
@@ -400,9 +109,6 @@
    lines: PERSISTENT_DIRECTORY/NAME.persistent.conf */
 #define NETSNMP_PERSISTENT_DIRECTORY "/var/snmp"
 
-/* PERSISTENT_MASK: the umask permissions to set up persistent files with */
-#define NETSNMP_PERSISTENT_MASK 077
-
 /* AGENT_DIRECTORY_MODE: the mode the agents should use to create
    directories with. Since the data stored here is probably sensitive, it
    probably should be read-only by root/administrator. */
@@ -447,19 +153,6 @@
 /* Use libwrap to handle allow/deny hosts? */
 #undef NETSNMP_USE_LIBWRAP
 
-/* testing code sections. */
-#undef NETSNMP_ENABLE_TESTING_CODE 
-
-/* If you don't have root access don't exit upon kmem errors */
-#undef NETSNMP_NO_ROOT_ACCESS
-
-/* If we don't want to use kmem. */
-#undef NETSNMP_NO_KMEM_USAGE
-
-/* If you don't want the agent to report on variables it doesn't have data for */
-#undef NETSNMP_NO_DUMMY_VALUES
-
-
 /* Mib-2 tree Info */
 /* These are the system information variables. */
 
@@ -654,9 +347,6 @@
 /* internal define */
 #define NETSNMP_LASTFIELD -1
 
-/* configure options specified */
-#define NETSNMP_CONFIGURE_OPTIONS ""
-
 /*  Pluggable transports.  */
 
 /*  This is defined if support for the UDP/IP transport domain is
@@ -691,10 +381,22 @@
     available.  */
 #undef NETSNMP_TRANSPORT_TCPIPV6_DOMAIN
 
-/*  This is defined if support for the UDP/IP transport domain is
+/*  This is defined if support for the TLS transport domain is
     available.   */
 #undef NETSNMP_TRANSPORT_TLS_DOMAIN
 
+/*  This is defined if support for the Alias transport domain is
+    available.   */
+#undef NETSNMP_TRANSPORT_ALIAS_DOMAIN
+
+/*  This is defined if support for the SSH transport domain is
+    available.   */
+#undef NETSNMP_TRANSPORT_SSH_DOMAIN
+
+/*  This is defined if support for the DTLS/UDP transport domain is
+    available.   */
+#undef NETSNMP_TRANSPORT_DTLSUDP_DOMAIN
+
 /*  This is defined if support for stdin/out transport domain is available.   */
 #undef NETSNMP_TRANSPORT_STD_DOMAIN
 
@@ -707,18 +409,9 @@
 /* define this if the local security module is available */
 #undef NETSNMP_SECMOD_LOCALSM
 
-/* define if you want to build with reentrant/threaded code (incomplete)*/
-#undef NETSNMP_REENTRANT
-
 /* define if configured as a "mini-agent" */
 #undef NETSNMP_MINI_AGENT
 
-/* define if you are embedding perl in the main agent */
-#undef NETSNMP_EMBEDDED_PERL
-
-/* define if you want to build MFD module rewrites*/
-#undef NETSNMP_ENABLE_MFD_REWRITES
-
 /* this is the location of the net-snmp mib tree.  It shouldn't be
    changed, as the places it is used are expected to be constant
    values or are directly tied to the UCD-SNMP-MIB. */
@@ -786,24 +479,6 @@
 #  define NETSNMP_IMPORT extern
 #endif
 
-/* define if you want to enable IPv6 support */
-#undef NETSNMP_ENABLE_IPV6
-
-/* define if you want to restrict SMUX connections to localhost by default */
-#undef NETSNMP_ENABLE_LOCAL_SMUX
-
-/* define if agentx transport is to use domain sockets only */
-#undef NETSNMP_AGENTX_DOM_SOCK_ONLY
-
-/* define if you do not want snmptrapd to register as an AgentX subagent */
-#undef NETSNMP_SNMPTRAPD_DISABLE_AGENTX
-
-/* define this if we're using the new MIT crypto API */
-#undef NETSNMP_USE_KERBEROS_MIT
-
-/* define this if you're using Heimdal Kerberos */
-#undef NETSNMP_USE_KERBEROS_HEIMDAL
-
 /* comment the next line if you are compiling with libsnmp.h 
    and are not using the UC-Davis SNMP library. */
 #define UCD_SNMP_LIBRARY 1
@@ -812,7 +487,7 @@
 #undef CMU_COMPATIBLE
 
 /* final conclusion on nlist usage */
-#if defined(HAVE_NLIST) && defined(STRUCT_NLIST_HAS_N_VALUE) && !defined(NETSNMP_DONT_USE_NLIST) && !defined(NETSNMP_NO_KMEM_USAGE)
+#if defined(HAVE_NLIST) && defined(HAVE_STRUCT_NLIST_N_VALUE) && !defined(NETSNMP_DONT_USE_NLIST) && !defined(NETSNMP_NO_KMEM_USAGE)
 #define NETSNMP_CAN_USE_NLIST
 #endif
 
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 5c12980..0000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,200 +0,0 @@
-dnl @synopsis AC_PROMPT_USER_NO_DEFINE(VARIABLENAME,QUESTION,[DEFAULT])
-dnl
-dnl Asks a QUESTION and puts the results in VARIABLENAME with an optional
-dnl DEFAULT value if the user merely hits return.
-dnl
-dnl @version 1.15
-dnl @author Wes Hardaker <hardaker@users.sourceforge.net>
-dnl
-AC_DEFUN([AC_PROMPT_USER_NO_DEFINE],
-dnl changequote(<<, >>) dnl
-dnl <<
-[
-if test "x$defaults" = "xno"; then
-echo $ECHO_N "$2 ($3): $ECHO_C"
-read tmpinput
-if test "$tmpinput" = "" -a "$3" != ""; then
-  tmpinput="$3"
-fi
-eval $1=\"$tmpinput\"
-else
-tmpinput="$3"
-eval $1=\"$tmpinput\"
-fi
-]
-dnl >>
-dnl changequote([, ])
-) dnl done AC_PROMPT_USER
-
-dnl @synopsis AC_PROMPT_USER(VARIABLENAME,QUESTION,[DEFAULT],QUOTED)
-dnl
-dnl Asks a QUESTION and puts the results in VARIABLENAME with an optional
-dnl DEFAULT value if the user merely hits return.  Also calls 
-dnl AC_DEFINE_UNQUOTED() on the VARIABLENAME for VARIABLENAMEs that should
-dnl be entered into the config.h file as well.  If QUOTED is "quoted" then
-dnl the result will be defined within quotes.
-dnl
-dnl @version 1.15
-dnl @author Wes Hardaker <hardaker@users.sourceforge.net>
-dnl
-AC_DEFUN([AC_PROMPT_USER],
-[
-MSG_CHECK=`echo "$2" | tail -1`
-AC_CACHE_CHECK($MSG_CHECK, ac_cv_user_prompt_$1,
-[echo "" >&AC_FD_MSG
-AC_PROMPT_USER_NO_DEFINE($1,[$2],$3)
-eval ac_cv_user_prompt_$1=\$$1
-echo $ECHO_N "setting $MSG_CHECK to...  $ECHO_C" >&AC_FD_MSG
-])
-if test "$ac_cv_user_prompt_$1" != "none"; then
-  if test "x$4" = "xquoted" -o "x$4" = "xQUOTED"; then
-    AC_DEFINE_UNQUOTED($1,"$ac_cv_user_prompt_$1")
-  else
-    AC_DEFINE_UNQUOTED($1,$ac_cv_user_prompt_$1)
-  fi
-fi
-]) dnl
-
-dnl @synopsis AC_CHECK_STRUCT_FOR(INCLUDES,STRUCT,MEMBER,DEFINE,[no])
-dnl
-dnl Checks STRUCT for MEMBER and defines DEFINE if found.
-dnl
-dnl @version 1.15
-dnl @author Wes Hardaker <hardaker@users.sourceforge.net>
-dnl
-AC_DEFUN([AC_CHECK_STRUCT_FOR],[
-
-ac_safe_struct=`echo "$2" | sed 'y%./+-%__p_%'`
-ac_safe_member=`echo "$3" | sed 'y%./+-%__p_%'`
-ac_safe_all="ac_cv_struct_${ac_safe_struct}_has_${ac_safe_member}"
-changequote(, )dnl
-  ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-changequote([, ])dnl
-
-AC_MSG_CHECKING([for $2.$3])
-AC_CACHE_VAL($ac_safe_all,
-[
-if test "x$4" = "x"; then
-  defineit="= 0"
-elif test "x$4" = "xno"; then
-  defineit=""
-else
-  defineit="$4"
-fi
-AC_TRY_COMPILE([
-$1
-],[
-struct $2 testit; 
-testit.$3 $defineit;
-], eval "${ac_safe_all}=yes", eval "${ac_safe_all}=no" )
-])
-
-if eval "test \"x$`echo ${ac_safe_all}`\" = \"xyes\""; then
-  AC_MSG_RESULT(yes)
-  AC_DEFINE_UNQUOTED($ac_uc_define)
-else
-  AC_MSG_RESULT(no)
-fi
-
-])
-
-dnl AC_CHECK_IFNET_FOR(SUBSTRUCT,[no])
-AC_DEFUN([AC_CHECK_IFNET_FOR],[
-dnl check for $1 in struct ifnet
-AC_CHECK_STRUCT_FOR([
-#ifdef IFNET_NEEDS_KERNEL
-#define _KERNEL 1
-#endif
-#include <sys/types.h>
-#include <sys/socket.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <net/if.h>
-#ifdef HAVE_NET_IF_VAR_H
-#include <net/if_var.h>
-#endif
-#ifdef HAVE_SYS_QUEUE_H
-#include <sys/queue.h>
-#endif
-#ifdef linux
-struct ifnet {
-	char	*if_name;		/* name, e.g. "en" or "lo" */
-	short	if_unit;		/* sub-unit for lower level driver */
-	short	if_mtu;			/* maximum transmission unit */
-	short	if_flags;		/* up/down, broadcast, etc. */
-	int	if_metric;		/* routing metric (external only) */
-	char    if_hwaddr [6];		/* ethernet address */
-	int	if_type;		/* interface type: 1=generic,
-					   28=slip, ether=6, loopback=24 */
-	int	if_speed;		/* interface speed: in bits/sec */
-
-	struct sockaddr if_addr;	/* interface's address */
-	struct sockaddr ifu_broadaddr;	/* broadcast address */
-	struct sockaddr ia_subnetmask; 	/* interface's mask */
-
-	struct	ifqueue {
-		int	ifq_len;
-		int	ifq_drops;
-	} if_snd;			/* output queue */
-	int	if_ibytes;		/* octets received on interface */
-	int	if_ipackets;		/* packets received on interface */
-	int	if_ierrors;		/* input errors on interface */
-        int     if_iqdrops;             /* input queue overruns */
-	int	if_obytes;		/* octets sent on interface */
-	int	if_opackets;		/* packets sent on interface */
-	int	if_oerrors;		/* output errors on interface */
-	int	if_collisions;		/* collisions on csma interfaces */
-/* end statistics */
-	struct	ifnet *if_next;
-};
-#endif
-], ifnet, $1, $2)
-])
-
-dnl
-dnl Add a search path to the LIBS and CFLAGS variables
-dnl
-AC_DEFUN([AC_ADD_SEARCH_PATH],[
-  if test "x$1" != x -a -d $1; then
-     if test -d $1/lib; then
-       LDFLAGS="-L$1/lib $LDFLAGS"
-     fi
-     if test -d $1/include; then
-	CPPFLAGS="-I$1/include $CPPFLAGS"
-     fi
-  fi
-])
-
-dnl
-dnl Store information for displaying later.
-dnl
-AC_DEFUN([AC_MSG_CACHE_INIT],[
-  rm -f configure-summary
-])
-
-AC_DEFUN([AC_MSG_CACHE_ADD],[
-  cat >> configure-summary << EOF
-  $1
-EOF
-])
-
-AC_DEFUN([AC_MSG_CACHE_DISPLAY],[
-  echo ""
-  echo "---------------------------------------------------------"
-  echo "            Net-SNMP configuration summary:"
-  echo "---------------------------------------------------------"
-  echo ""
-  cat configure-summary
-  echo ""
-  echo "---------------------------------------------------------"
-  echo ""
-])
-
-AC_DEFUN([AC_MSG_MODULE_DBG],
-[
-  if test $module_debug = 1; then
-    echo $1 $2 $3 $4
-  fi
-]
-)
diff --git a/aclocal.m4 b/aclocal.m4
index 441c752..de594b8 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -11,6640 +11,14 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
-# serial 52 AC_PROG_LIBTOOL
-
-
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
-         [],
-         [m4_define([AC_PROVIDE_IFELSE],
-	         [m4_ifdef([AC_PROVIDE_$1],
-		           [$2], [$3])])])
-
-
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-  ])])
-dnl And a similar setup for Fortran 77 support
-  AC_PROVIDE_IFELSE([AC_PROG_F77],
-    [AC_LIBTOOL_F77],
-    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-      [AC_LIBTOOL_GCJ],
-      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	[AC_LIBTOOL_GCJ],
-      [ifdef([AC_PROG_GCJ],
-	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([A][M_PROG_GCJ],
-	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([LT_AC_PROG_GCJ],
-	     [define([LT_AC_PROG_GCJ],
-		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
-
-
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
-
-
-# AC_LIBTOOL_SETUP
-# ----------------
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
-
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-
-# Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-_LT_REQUIRED_DARWIN_CHECKS
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-enable_win32_dll=yes, enable_win32_dll=no)
-
-AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-AC_ARG_WITH([pic],
-    [AC_HELP_STRING([--with-pic],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
-    [pic_mode=default])
-test -z "$pic_mode" && pic_mode=default
-
-# Use C for the default configuration in the libtool script
-tagname=
-AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
-])# AC_LIBTOOL_SETUP
-
-
-# _LT_AC_SYS_COMPILER
-# -------------------
-AC_DEFUN([_LT_AC_SYS_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_AC_SYS_COMPILER
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-AC_DEFUN([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# --------------------------
-# Check for some things on darwin
-AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-   # By default we will add the -single_module flag. You can override
-   # by either setting the environment variable LT_MULTI_MODULE
-   # non-empty at configure time, or by adding -multi_module to the
-   # link flags.
-   echo "int foo(void){return 1;}" > conftest.c
-   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-     -dynamiclib ${wl}-single_module conftest.c
-   if test -f libconftest.dylib; then
-     lt_cv_apple_cc_single_mod=yes
-     rm -rf libconftest.dylib*
-   fi
-   rm conftest.c
-      fi])
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-   [lt_cv_ld_exported_symbols_list=yes],
-   [lt_cv_ld_exported_symbols_list=no])
-   LDFLAGS="$save_LDFLAGS"
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[0123]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*)
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-   10.[[012]]*)
-     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-   10.*)
-     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-    fi
-    if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil="~$DSYMUTIL \$lib || :"
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
-
-# _LT_AC_SYS_LIBPATH_AIX
-# ----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_AC_SYS_LIBPATH_AIX
-
-
-# _LT_AC_SHELL_INIT(ARG)
-# ----------------------
-AC_DEFUN([_LT_AC_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-	 [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_AC_SHELL_INIT
-
-
-# _LT_AC_PROG_ECHO_BACKSLASH
-# --------------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-[_LT_AC_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-echo=${ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-[$]*
-EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-    # expected sizes: less than 2kB, 1kB, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "[$]0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(ECHO)
-])])# _LT_AC_PROG_ECHO_BACKSLASH
-
-
-# _LT_AC_LOCK
-# -----------
-AC_DEFUN([_LT_AC_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-   fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *32-bit*)
-      case $host in
-        x86_64-*kfreebsd*-gnu)
-          LD="${LD-ld} -m elf_i386_fbsd"
-          ;;
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      case $host in
-        x86_64-*kfreebsd*-gnu)
-          LD="${LD-ld} -m elf_x86_64_fbsd"
-          ;;
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-  ])
-esac
-
-need_locks="$enable_libtool_lock"
-
-])# _LT_AC_LOCK
-
-
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $rm conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$5], , :, [$5])
-else
-    ifelse([$6], , :, [$6])
-fi
-])# AC_LIBTOOL_COMPILER_OPTION
-
-
-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                          [ACTION-SUCCESS], [ACTION-FAILURE])
-# ------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $rm -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$4], , :, [$4])
-else
-    ifelse([$5], , :, [$5])
-fi
-])# AC_LIBTOOL_LINKER_OPTION
-
-
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
-# --------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-[# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-	       = "XX$teststring") >/dev/null 2>&1 &&
-	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	      lt_cv_sys_max_cmd_len=$new_result &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on massive
-      # amounts of additional arguments before passing them to the linker.
-      # It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-
-
-# _LT_AC_CHECK_DLFCN
-# ------------------
-AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)dnl
-])# _LT_AC_CHECK_DLFCN
-
-
-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ---------------------------------------------------------------------
-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-    exit (status);
-}]
-EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_AC_TRY_DLOPEN_SELF
-
-
-# AC_LIBTOOL_DLOPEN_SELF
-# ----------------------
-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-   ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-    	  lt_cv_dlopen_self_static, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-])# AC_LIBTOOL_DLOPEN_SELF
-
-
-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-# ---------------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler
-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-])
-])# AC_LIBTOOL_PROG_CC_C_O
-
-
-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-# -----------------------------------------
-# Check to see if we can do hard links to lock some files if needed
-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-[AC_REQUIRE([_LT_AC_LOCK])dnl
-
-hard_links="nottested"
-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-
-
-# AC_LIBTOOL_OBJDIR
-# -----------------
-AC_DEFUN([AC_LIBTOOL_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-])# AC_LIBTOOL_OBJDIR
-
-
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-# ----------------------------------------------
-# Check hardcoding attributes.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_AC_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_AC_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-
-
-# AC_LIBTOOL_SYS_LIB_STRIP
-# ------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
-[striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         old_striplib="$STRIP -S"
-         AC_MSG_RESULT([yes])
-       else
-  AC_MSG_RESULT([no])
-fi
-       ;;
-   *)
-  AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-])# AC_LIBTOOL_SYS_LIB_STRIP
-
-
-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-m4_if($1,[],[
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
-  sys_lib_search_path_spec=`echo $lt_search_path_spec`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[[4-9]]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix[[3-9]]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
-[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
-[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
-
-# _LT_AC_TAGCONFIG
-# ----------------
-AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_ARG_WITH([tags],
-    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
-        [include additional configurations @<:@automatic@:>@])],
-    [tagnames="$withval"])
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    AC_MSG_WARN([output file `$ofile' does not exist])
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
-    else
-      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-    fi
-  fi
-  if test -z "$LTCFLAGS"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-  fi
-
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
-    IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
-    "") ;;
-    *)  AC_MSG_ERROR([invalid tag name: $tagname])
-	;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      AC_MSG_ERROR([tag name \"$tagname\" already exists])
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      case $tagname in
-      CXX)
-	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-	    (test "X$CXX" != "Xg++"))) ; then
-	  AC_LIBTOOL_LANG_CXX_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-	  AC_LIBTOOL_LANG_F77_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      GCJ)
-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-	  AC_LIBTOOL_LANG_GCJ_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      RC)
-	AC_LIBTOOL_LANG_RC_CONFIG
-	;;
-
-      *)
-	AC_MSG_ERROR([Unsupported tag name: $tagname])
-	;;
-      esac
-
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    AC_MSG_ERROR([unable to update list of available tagged configurations.])
-  fi
-fi
-])# _LT_AC_TAGCONFIG
-
-
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_DLOPEN
-
-
-# AC_LIBTOOL_WIN32_DLL
-# --------------------
-# declare package support for building win32 DLLs
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_WIN32_DLL
-
-
-# AC_ENABLE_SHARED([DEFAULT])
-# ---------------------------
-# implement the --enable-shared flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([shared],
-    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-])# AC_ENABLE_SHARED
-
-
-# AC_DISABLE_SHARED
-# -----------------
-# set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)
-])# AC_DISABLE_SHARED
-
-
-# AC_ENABLE_STATIC([DEFAULT])
-# ---------------------------
-# implement the --enable-static flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([static],
-    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-])# AC_ENABLE_STATIC
-
-
-# AC_DISABLE_STATIC
-# -----------------
-# set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)
-])# AC_DISABLE_STATIC
-
-
-# AC_ENABLE_FAST_INSTALL([DEFAULT])
-# ---------------------------------
-# implement the --enable-fast-install flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([fast-install],
-    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-])# AC_ENABLE_FAST_INSTALL
-
-
-# AC_DISABLE_FAST_INSTALL
-# -----------------------
-# set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)
-])# AC_DISABLE_FAST_INSTALL
-
-
-# AC_LIBTOOL_PICMODE([MODE])
-# --------------------------
-# implement the --with-pic flag
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)
-])# AC_LIBTOOL_PICMODE
-
-
-# AC_PROG_EGREP
-# -------------
-# This is predefined starting with Autoconf 2.54, so this conditional
-# definition can be removed once we require Autoconf 2.54 or later.
-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi])
- EGREP=$ac_cv_prog_egrep
- AC_SUBST([EGREP])
-])])
-
-
-# AC_PATH_TOOL_PREFIX
-# -------------------
-# find a file program which can recognize shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])# AC_PATH_TOOL_PREFIX
-
-
-# AC_PATH_MAGIC
-# -------------
-# find a file program which can recognize a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# AC_PATH_MAGIC
-
-
-# AC_PROG_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
-    [AC_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])
-AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])# AC_PROG_LD
-
-
-# AC_PROG_LD_GNU
-# --------------
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# AC_PROG_LD_GNU
-
-
-# AC_PROG_LD_RELOAD_FLAG
-# ----------------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-])# AC_PROG_LD_RELOAD_FLAG
-
-
-# AC_DEPLIBS_CHECK_METHOD
-# -----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognize dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[[4-9]]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[[45]]*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[[3-9]]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-])# AC_DEPLIBS_CHECK_METHOD
-
-
-# AC_PROG_NM
-# ----------
-# find the pathname to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-])# AC_PROG_NM
-
-
-# AC_CHECK_LIBM
-# -------------
-# check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-])# AC_CHECK_LIBM
-
-
-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl convenience library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
-# (note the single quotes!).  If your package is not flat and you're not
-# using automake, define top_builddir and top_srcdir appropriately in
-# the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_CONVENIENCE
-
-
-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl installable library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# and an installed libltdl is not found, it is assumed to be `libltdl'.
-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and top_srcdir
-# appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, lt_dlinit,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    LTDLINCL=
-  fi
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_INSTALLABLE
-
-
-# AC_LIBTOOL_CXX
-# --------------
-# enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX],
-[AC_REQUIRE([_LT_AC_LANG_CXX])
-])# AC_LIBTOOL_CXX
-
-
-# _LT_AC_LANG_CXX
-# ---------------
-AC_DEFUN([_LT_AC_LANG_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-])# _LT_AC_LANG_CXX
-
-# _LT_AC_PROG_CXXCPP
-# ------------------
-AC_DEFUN([_LT_AC_PROG_CXXCPP],
-[
-AC_REQUIRE([AC_PROG_CXX])
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-fi
-])# _LT_AC_PROG_CXXCPP
-
-# AC_LIBTOOL_F77
-# --------------
-# enable support for Fortran 77 libraries
-AC_DEFUN([AC_LIBTOOL_F77],
-[AC_REQUIRE([_LT_AC_LANG_F77])
-])# AC_LIBTOOL_F77
-
-
-# _LT_AC_LANG_F77
-# ---------------
-AC_DEFUN([_LT_AC_LANG_F77],
-[AC_REQUIRE([AC_PROG_F77])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-])# _LT_AC_LANG_F77
-
-
-# AC_LIBTOOL_GCJ
-# --------------
-# enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],
-[AC_REQUIRE([_LT_AC_LANG_GCJ])
-])# AC_LIBTOOL_GCJ
-
-
-# _LT_AC_LANG_GCJ
-# ---------------
-AC_DEFUN([_LT_AC_LANG_GCJ],
-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
-])# _LT_AC_LANG_GCJ
-
-
-# AC_LIBTOOL_RC
-# -------------
-# enable support for Windows resource files
-AC_DEFUN([AC_LIBTOOL_RC],
-[AC_REQUIRE([LT_AC_PROG_RC])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-])# AC_LIBTOOL_RC
-
-
-# AC_LIBTOOL_LANG_C_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-[lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF
-
-# Report which library types will actually be built
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix[[4-9]]*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-    ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_C_CONFIG
-
-
-# AC_LIBTOOL_LANG_CXX_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
-[AC_LANG_PUSH(C++)
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Dependencies to place before and after the object being linked:
-_LT_AC_TAGVAR(predep_objects, $1)=
-_LT_AC_TAGVAR(postdep_objects, $1)=
-_LT_AC_TAGVAR(predeps, $1)=
-_LT_AC_TAGVAR(postdeps, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
-  $as_unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
-  lt_cv_path_LD=$lt_cv_path_LDCXX
-else
-  $as_unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-else
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-fi
-
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
-
-  AC_PROG_LD
-
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if test "$with_gnu_ld" = yes; then
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-    #     investigate it a little bit more. (MM)
-    wlarc='${wl}'
-
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-	grep 'no-whole-archive' > /dev/null; then
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    with_gnu_ld=no
-    wlarc=
-
-    # A generic and very simple default shared library creation
-    # command for GNU C++ for the case where it uses the native
-    # linker, instead of GNU ld.  If possible, this setting should
-    # overridden to take advantage of the native linker features on
-    # the platform it is being used on.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
-
-  # Commands to make compiler produce verbose output that lists
-  # what "hidden" libraries, object files and flags are used when
-  # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-else
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  aix[[4-9]]*)
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
-
-      # Test if we are trying to use run time linking or normal
-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-      # need to do runtime linking.
-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	for ld_flag in $LDFLAGS; do
-	  case $ld_flag in
-	  *-brtl*)
-	    aix_use_runtimelinking=yes
-	    break
-	    ;;
-	  esac
-	done
-	;;
-      esac
-
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-    _LT_AC_TAGVAR(archive_cmds, $1)=''
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    if test "$GXX" = yes; then
-      case $host_os in aix4.[[012]]|aix4.[[012]].*)
-      # We only want to do this on AIX 4.2 and lower, the check
-      # below for broken collect2 doesn't work under 4.3+
-	collect2name=`${CC} -print-prog-name=collect2`
-	if test -f "$collect2name" && \
-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	then
-	  # We have reworked collect2
-	  :
-	else
-	  # We have old collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	fi
-	;;
-      esac
-      shared_flag='-shared'
-      if test "$aix_use_runtimelinking" = yes; then
-	shared_flag="$shared_flag "'${wl}-G'
-      fi
-    else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	shared_flag='-G'
-      else
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='${wl}-G'
-	else
-	  shared_flag='${wl}-bM:SRE'
-	fi
-      fi
-    fi
-
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      _LT_AC_SYS_LIBPATH_AIX
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-      if test "$host_cpu" = ia64; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-      else
-	# Determine the default libpath from the value encoded in an empty executable.
-	_LT_AC_SYS_LIBPATH_AIX
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	# Warning - without using the other run time loading flags,
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	# Exported symbols can be pulled into shared objects from archives
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	# This is similar to how AIX traditionally builds its shared libraries.
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-      fi
-    fi
-    ;;
-
-  beos*)
-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-      # support --undefined.  This deserves some investigation.  FIXME
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-    ;;
-
-  chorus*)
-    case $cc_basename in
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-    # as there is no search path for DLLs.
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      # If the export-symbols file already is a .def file (1st line
-      # is EXPORTS), use it as is; otherwise, prepend...
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	cp $export_symbols $output_objdir/$soname.def;
-      else
-	echo EXPORTS > $output_objdir/$soname.def;
-	cat $export_symbols >> $output_objdir/$soname.def;
-      fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-  ;;
-      darwin* | rhapsody*)
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-      if test "$GXX" = yes ; then
-      output_verbose_link_cmd='echo'
-      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-      fi
-      else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-          ;;
-      esac
-      fi
-        ;;
-
-  dgux*)
-    case $cc_basename in
-      ec++*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      ghcx*)
-	# Green Hills C++ Compiler
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  freebsd[[12]]*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  freebsd-elf*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    ;;
-  freebsd* | dragonfly*)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				# but as the default
-				# location of the library.
-
-    case $cc_basename in
-    CC*)
-      # FIXME: insert proper C++ library support
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    aCC*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      #
-      # There doesn't appear to be a way to prevent this compiler from
-      # explicitly linking system object files so we need to strip them
-      # from the output so that they don't get included in the library
-      # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-      ;;
-    *)
-      if test "$GXX" = yes; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-        # FIXME: insert proper C++ library support
-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-      case $host_cpu in
-      hppa*64*|ia64*) ;;
-      *)
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        ;;
-      esac
-    fi
-    case $host_cpu in
-    hppa*64*|ia64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-    *)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    esac
-
-    case $cc_basename in
-      CC*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      aCC*)
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	esac
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test $with_gnu_ld = no; then
-	    case $host_cpu in
-	    hppa*64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    ia64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    esac
-	  fi
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  interix[[3-9]]*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-    # Instead, shared libraries are loaded at an image base (0x10000000 by
-    # default) and relocated if they conflict, which is a slow very memory
-    # consuming and fragmenting process.  To avoid this, we pick a random,
-    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC*)
-	# SGI C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	# Archives containing C++ object files must be created using
-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test "$with_gnu_ld" = no; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	  else
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-	  fi
-	fi
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-	;;
-    esac
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    ;;
-  linux* | k*bsd*-gnu)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	;;
-      icpc*)
-	# Intel C++
-	with_gnu_ld=yes
-	# version 8.0 and above of icpc choke on multiply defined symbols
-	# if we add $predep_objects and $postdep_objects, however 7.1 and
-	# earlier do not add the objects themselves.
-	case `$CC -V 2>&1` in
-	*"Version 7."*)
-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	*)  # Version 8.0 or newer
-	  tmp_idyn=
-	  case $host_cpu in
-	    ia64*) tmp_idyn=' -i_dynamic';;
-	  esac
-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	esac
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	;;
-      pgCC* | pgcpp*)
-        # Portland Group C++ compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-        ;;
-      cxx*)
-	# Compaq C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	runpath_var=LD_RUN_PATH
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C++ 5.9
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-
-	  # Not sure whether something based on
-	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	  # would be better.
-	  output_verbose_link_cmd='echo'
-
-	  # Archives containing C++ object files must be created using
-	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	  # necessary to make sure instantiated templates are included
-	  # in the archive.
-	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	  ;;
-	esac
-	;;
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  netbsd*)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-    ;;
-  openbsd2*)
-    # C++ shared libraries are fairly broken
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  openbsd*)
-    if test -f /usr/libexec/ld.so; then
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      fi
-      output_verbose_link_cmd='echo'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-    ;;
-  osf3*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx*)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  osf4* | osf5*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx*)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
-	  $rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.x
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      lcc*)
-	# Lucid
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.2, 5.x and Centerline C++
-        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	case $host_os in
-	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	  *)
-	    # The compiler driver will combine and reorder linker options,
-	    # but understands `-z linker_flag'.
-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	    ;;
-	esac
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-	output_verbose_link_cmd='echo'
-
-	# Archives containing C++ object files must be created using
-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	;;
-      gcx*)
-	# Green Hills C++ Compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	# The C++ compiler must be used to create the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	;;
-      *)
-	# GNU C++ compiler with Solaris linker
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  else
-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	    # platform.
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  fi
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	  case $host_os in
-	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	  *)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	    ;;
-	  esac
-	fi
-	;;
-    esac
-    ;;
-  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  sysv5* | sco3.2v5* | sco5v6*)
-    # Note: We can NOT use -z defs as we might desire, because we do not
-    # link with -lc, and that would cause any symbols used from libc to
-    # always be unresolved, which means just about no library would
-    # ever link correctly.  If we're not using GNU ld we use -z text
-    # though, which does catch some bad symbols but isn't as heavy-handed
-    # as -z defs.
-    # For security reasons, it is highly recommended that you always
-    # use absolute paths for naming shared libraries, and exclude the
-    # DT_RUNPATH tag from executables and libraries.  But doing so
-    # requires that you compile everything twice, which is a pain.
-    # So that behaviour is only enabled if SCOABSPATH is set to a
-    # non-empty value in the environment.  Most likely only useful for
-    # creating official distributions of packages.
-    # This is a hack until libtool officially supports absolute path
-    # names for shared libraries.
-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC*)
-	# NonStop-UX NCC 3.20
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-esac
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_AC_TAGVAR(GCC, $1)="$GXX"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_POSTDEP_PREDEP($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-])# AC_LIBTOOL_LANG_CXX_CONFIG
-
-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
-int a;
-void foo (void) { a = 0; }
-EOF
-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-EOF
-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-
-  for p in `eval $output_verbose_link_cmd`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" \
-	  || test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
-	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
-	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$rm -f confest.$objext
-
-_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-
-# PORTME: override above test on systems where it is broken
-ifelse([$1],[CXX],
-[case $host_os in
-interix[[3-9]]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_AC_TAGVAR(predep_objects,$1)=
-  _LT_AC_TAGVAR(postdep_objects,$1)=
-  _LT_AC_TAGVAR(postdeps,$1)=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-    #
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-])
-case " $_LT_AC_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
-])# AC_LIBTOOL_POSTDEP_PREDEP
-
-# AC_LIBTOOL_LANG_F77_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-[AC_REQUIRE([AC_PROG_F77])
-AC_LANG_PUSH(Fortran 77)
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="\
-      program t
-      end
-"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-aix[[4-9]]*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-_LT_AC_TAGVAR(GCC, $1)="$G77"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_F77_CONFIG
-
-
-# AC_LIBTOOL_LANG_GCJ_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_GCJ_CONFIG
-
-
-# AC_LIBTOOL_LANG_RC_CONFIG
-# -------------------------
-# Ensure that the configuration vars for the Windows resource compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_RC_CONFIG
-
-
-# AC_LIBTOOL_CONFIG([TAGNAME])
-# ----------------------------
-# If TAGNAME is not passed, then create an initial libtool script
-# with a default configuration from the untagged config vars.  Otherwise
-# add code to config.status for appending the configuration named by
-# TAGNAME from the matching tagged config vars.
-AC_DEFUN([AC_LIBTOOL_CONFIG],
-[# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    _LT_AC_TAGVAR(compiler, $1) \
-    _LT_AC_TAGVAR(CC, $1) \
-    _LT_AC_TAGVAR(LD, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
-    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
-    _LT_AC_TAGVAR(old_archive_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
-    _LT_AC_TAGVAR(predep_objects, $1) \
-    _LT_AC_TAGVAR(postdep_objects, $1) \
-    _LT_AC_TAGVAR(predeps, $1) \
-    _LT_AC_TAGVAR(postdeps, $1) \
-    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
-    _LT_AC_TAGVAR(archive_cmds, $1) \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(postinstall_cmds, $1) \
-    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
-    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
-    _LT_AC_TAGVAR(no_undefined_flag, $1) \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
-    _LT_AC_TAGVAR(hardcode_automatic, $1) \
-    _LT_AC_TAGVAR(module_cmds, $1) \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
-    _LT_AC_TAGVAR(exclude_expsyms, $1) \
-    _LT_AC_TAGVAR(include_expsyms, $1); do
-
-    case $var in
-    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(module_cmds, $1) | \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\[$]0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
-    ;;
-  esac
-
-ifelse([$1], [],
-  [cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  AC_MSG_NOTICE([creating $ofile])],
-  [cfgfile="$ofile"])
-
-  cat <<__EOF__ >> "$cfgfile"
-ifelse([$1], [],
-[#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# 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; either version 2 of the License, or
-# (at your option) any later version.
-#
-# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e 1s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG],
-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-
-# Is the compiler the GNU C compiler?
-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-
-# Symbols that must always be exported.
-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
-
-ifelse([$1],[],
-[# ### END LIBTOOL CONFIG],
-[# ### END LIBTOOL TAG CONFIG: $tagname])
-
-__EOF__
-
-ifelse([$1],[], [
-  case $host_os in
-  aix3*)
-    cat <<\EOF >> "$cfgfile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-    ;;
-  esac
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-])
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-])# AC_LIBTOOL_CONFIG
-
-
-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-
-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
-
-
-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-# ---------------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([LT_AC_PROG_SED])
-AC_REQUIRE([AC_PROG_NM])
-AC_REQUIRE([AC_OBJEXT])
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-linux* | k*bsd*-gnu)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDGIRSTW]]'
-    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[[]] =
-{
-EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-
-
-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-# ---------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
-
-AC_MSG_CHECKING([for $compiler option to produce PIC])
- ifelse([$1],[CXX],[
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[[4-9]]*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-       darwin*)
-         # PIC is the default on this platform
-         # Common symbols not allowed in MH_DYLIB files
-         case $cc_basename in
-           xlc*)
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           ;;
-         esac
-       ;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  icpc* | ecpc*)
-	    # Intel C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler.
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-         ;;
-       esac
-       ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      m4_if([$1], [GCJ], [],
-	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    linux* | k*bsd*-gnu)
-      case $cc_basename in
-      icc* | ecc*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      *)
-        case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C 5.9
-	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
-    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-])
-
-
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
-# See if the linker supports building shared libraries.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-ifelse([$1],[CXX],[
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix[[4-9]]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
-  cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-  ;;
-  *)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-],[
-  runpath_var=
-  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_AC_TAGVAR(archive_cmds, $1)=
-  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
-  _LT_AC_TAGVAR(module_cmds, $1)=
-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(always_export_symbols, $1)=no
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_AC_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  _LT_CC_BASENAME([$compiler])
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[[3-9]]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    interix[[3-9]]*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | k*bsd*-gnu)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
-	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	*)
-	  tmp_sharedflag='-shared' ;;
-	esac
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-	if test $supports_anon_versioning = yes; then
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-	  else
-	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix[[4-9]]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_AC_TAGVAR(archive_cmds, $1)=''
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  :
-	  else
-  	  # We have old collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       _LT_AC_SYS_LIBPATH_AIX
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 _LT_AC_SYS_LIBPATH_AIX
-	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      # see comment about different semantics on the GNU ld section
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    bsdi[[45]]*)
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    freebsd1*)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	     ;;
-	   *)
-	     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-        fi
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	wlarc=''
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_AC_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $rm conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
-      ;;
-    esac
-  fi
-  ;;
-esac
-])# AC_LIBTOOL_PROG_LD_SHLIBS
-
-
-# _LT_AC_FILE_LTDLL_C
-# -------------------
-# Be careful that the start marker always follows a newline.
-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
-# /* ltdll.c starts here */
-# #define WIN32_LEAN_AND_MEAN
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
-#
-# #ifndef __CYGWIN__
-# #  ifdef __CYGWIN32__
-# #    define __CYGWIN__ __CYGWIN32__
-# #  endif
-# #endif
-#
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-# #ifdef __cplusplus
-# }
-# #endif
-#
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
-#
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
-#   __hDllInstance_base = hInst;
-#   return TRUE;
-# }
-# /* ltdll.c ends here */
-])# _LT_AC_FILE_LTDLL_C
-
-
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-# ---------------------------------
-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-
-
-# old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
-])
-
-
-# Cheap backport of AS_EXECUTABLE_P and required macros
-# from Autoconf 2.59; we should not use $as_executable_p directly.
-
-# _AS_TEST_PREPARE
-# ----------------
-m4_ifndef([_AS_TEST_PREPARE],
-[m4_defun([_AS_TEST_PREPARE],
-[if test -x / >/dev/null 2>&1; then
-  as_executable_p='test -x'
-else
-  as_executable_p='test -f'
-fi
-])])# _AS_TEST_PREPARE
-
-# AS_EXECUTABLE_P
-# ---------------
-# Check whether a file is executable.
-m4_ifndef([AS_EXECUTABLE_P],
-[m4_defun([AS_EXECUTABLE_P],
-[AS_REQUIRE([_AS_TEST_PREPARE])dnl
-$as_executable_p $1[]dnl
-])])# AS_EXECUTABLE_P
-
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-# LT_AC_PROG_SED
-# --------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-AC_DEFUN([LT_AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])
-
-m4_include([acinclude.m4])
+m4_include([m4/ac_add_search_path.m4])
+m4_include([m4/ac_msg_cache.m4])
+m4_include([m4/ac_msg_module_dbg.m4])
+m4_include([m4/ac_prompt_user.m4])
+m4_include([m4/libtool.m4])
+m4_include([m4/ltoptions.m4])
+m4_include([m4/ltsugar.m4])
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
+m4_include([m4/netsnmp_arg.m4])
+m4_include([m4/netsnmp_search_libs.m4])
diff --git a/agent/Makefile.depend b/agent/Makefile.depend
index ed6125c..ffc1aca 100644
--- a/agent/Makefile.depend
+++ b/agent/Makefile.depend
@@ -8,32 +8,14 @@
 ./agent_handler.lo: ../include/net-snmp/net-snmp-includes.h
 ./agent_handler.lo: ../include/net-snmp/definitions.h
 ./agent_handler.lo: ../include/net-snmp/types.h
+./agent_handler.lo: ../include/net-snmp/library/types.h
 ./agent_handler.lo: ../include/net-snmp/library/snmp_api.h
-./agent_handler.lo: ../include/net-snmp/library/asn1.h
-./agent_handler.lo: ../include/net-snmp/library/snmp_impl.h
-./agent_handler.lo: ../include/net-snmp/library/snmp.h
-./agent_handler.lo: ../include/net-snmp/library/snmp-tc.h
-./agent_handler.lo: ../include/net-snmp/utilities.h
+./agent_handler.lo: ../include/net-snmp/varbind_api.h
 ./agent_handler.lo: ../include/net-snmp/library/snmp_client.h
-./agent_handler.lo: ../include/net-snmp/library/system.h
-./agent_handler.lo: ../include/net-snmp/library/tools.h
-./agent_handler.lo: ../include/net-snmp/library/int64.h
-./agent_handler.lo: ../include/net-snmp/library/mt_support.h
-./agent_handler.lo: ../include/net-snmp/library/snmp_alarm.h
-./agent_handler.lo: ../include/net-snmp/library/callback.h
-./agent_handler.lo: ../include/net-snmp/library/data_list.h
-./agent_handler.lo: ../include/net-snmp/library/oid_stash.h
-./agent_handler.lo: ../include/net-snmp/library/check_varbind.h
-./agent_handler.lo: ../include/net-snmp/library/container.h
-./agent_handler.lo: ../include/net-snmp/library/factory.h
-./agent_handler.lo: ../include/net-snmp/library/snmp_logging.h
-./agent_handler.lo: ../include/net-snmp/library/container_binary_array.h
-./agent_handler.lo: ../include/net-snmp/library/container_list_ssll.h
-./agent_handler.lo: ../include/net-snmp/library/container_iterator.h
-./agent_handler.lo: ../include/net-snmp/library/container.h
-./agent_handler.lo: ../include/net-snmp/library/snmp_assert.h
-./agent_handler.lo: ../include/net-snmp/version.h
+./agent_handler.lo: ../include/net-snmp/pdu_api.h
+./agent_handler.lo: ../include/net-snmp/library/asn1.h
 ./agent_handler.lo: ../include/net-snmp/session_api.h
+./agent_handler.lo: ../include/net-snmp/library/callback.h
 ./agent_handler.lo: ../include/net-snmp/library/snmp_transport.h
 ./agent_handler.lo: ../include/net-snmp/library/snmp_service.h
 ./agent_handler.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -44,11 +26,31 @@
 ./agent_handler.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./agent_handler.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./agent_handler.lo: ../include/net-snmp/library/ucd_compat.h
-./agent_handler.lo: ../include/net-snmp/pdu_api.h
-./agent_handler.lo: ../include/net-snmp/mib_api.h
 ./agent_handler.lo: ../include/net-snmp/library/mib.h
+./agent_handler.lo: ../include/net-snmp/mib_api.h
 ./agent_handler.lo: ../include/net-snmp/library/parse.h
-./agent_handler.lo: ../include/net-snmp/varbind_api.h
+./agent_handler.lo: ../include/net-snmp/library/oid_stash.h
+./agent_handler.lo: ../include/net-snmp/library/snmp_impl.h
+./agent_handler.lo: ../include/net-snmp/library/snmp.h
+./agent_handler.lo: ../include/net-snmp/library/snmp-tc.h
+./agent_handler.lo: ../include/net-snmp/library/getopt.h
+./agent_handler.lo: ../include/net-snmp/utilities.h
+./agent_handler.lo: ../include/net-snmp/library/system.h
+./agent_handler.lo: ../include/net-snmp/library/tools.h
+./agent_handler.lo: ../include/net-snmp/library/int64.h
+./agent_handler.lo: ../include/net-snmp/library/mt_support.h
+./agent_handler.lo: ../include/net-snmp/library/snmp_alarm.h
+./agent_handler.lo: ../include/net-snmp/library/data_list.h
+./agent_handler.lo: ../include/net-snmp/library/check_varbind.h
+./agent_handler.lo: ../include/net-snmp/library/container.h
+./agent_handler.lo: ../include/net-snmp/library/factory.h
+./agent_handler.lo: ../include/net-snmp/library/snmp_logging.h
+./agent_handler.lo: ../include/net-snmp/library/container_binary_array.h
+./agent_handler.lo: ../include/net-snmp/library/container_list_ssll.h
+./agent_handler.lo: ../include/net-snmp/library/container_iterator.h
+./agent_handler.lo: ../include/net-snmp/library/container.h
+./agent_handler.lo: ../include/net-snmp/library/snmp_assert.h
+./agent_handler.lo: ../include/net-snmp/version.h
 ./agent_handler.lo: ../include/net-snmp/config_api.h
 ./agent_handler.lo: ../include/net-snmp/library/read_config.h
 ./agent_handler.lo: ../include/net-snmp/library/default_store.h
@@ -110,32 +112,14 @@
 ./agent_index.lo: ../include/net-snmp/net-snmp-includes.h
 ./agent_index.lo: ../include/net-snmp/definitions.h
 ./agent_index.lo: ../include/net-snmp/types.h
+./agent_index.lo: ../include/net-snmp/library/types.h
 ./agent_index.lo: ../include/net-snmp/library/snmp_api.h
-./agent_index.lo: ../include/net-snmp/library/asn1.h
-./agent_index.lo: ../include/net-snmp/library/snmp_impl.h
-./agent_index.lo: ../include/net-snmp/library/snmp.h
-./agent_index.lo: ../include/net-snmp/library/snmp-tc.h
-./agent_index.lo: ../include/net-snmp/utilities.h
+./agent_index.lo: ../include/net-snmp/varbind_api.h
 ./agent_index.lo: ../include/net-snmp/library/snmp_client.h
-./agent_index.lo: ../include/net-snmp/library/system.h
-./agent_index.lo: ../include/net-snmp/library/tools.h
-./agent_index.lo: ../include/net-snmp/library/int64.h
-./agent_index.lo: ../include/net-snmp/library/mt_support.h
-./agent_index.lo: ../include/net-snmp/library/snmp_alarm.h
-./agent_index.lo: ../include/net-snmp/library/callback.h
-./agent_index.lo: ../include/net-snmp/library/data_list.h
-./agent_index.lo: ../include/net-snmp/library/oid_stash.h
-./agent_index.lo: ../include/net-snmp/library/check_varbind.h
-./agent_index.lo: ../include/net-snmp/library/container.h
-./agent_index.lo: ../include/net-snmp/library/factory.h
-./agent_index.lo: ../include/net-snmp/library/snmp_logging.h
-./agent_index.lo: ../include/net-snmp/library/container_binary_array.h
-./agent_index.lo: ../include/net-snmp/library/container_list_ssll.h
-./agent_index.lo: ../include/net-snmp/library/container_iterator.h
-./agent_index.lo: ../include/net-snmp/library/container.h
-./agent_index.lo: ../include/net-snmp/library/snmp_assert.h
-./agent_index.lo: ../include/net-snmp/version.h
+./agent_index.lo: ../include/net-snmp/pdu_api.h
+./agent_index.lo: ../include/net-snmp/library/asn1.h
 ./agent_index.lo: ../include/net-snmp/session_api.h
+./agent_index.lo: ../include/net-snmp/library/callback.h
 ./agent_index.lo: ../include/net-snmp/library/snmp_transport.h
 ./agent_index.lo: ../include/net-snmp/library/snmp_service.h
 ./agent_index.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -146,10 +130,31 @@
 ./agent_index.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./agent_index.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./agent_index.lo: ../include/net-snmp/library/ucd_compat.h
-./agent_index.lo: ../include/net-snmp/pdu_api.h ../include/net-snmp/mib_api.h
 ./agent_index.lo: ../include/net-snmp/library/mib.h
+./agent_index.lo: ../include/net-snmp/mib_api.h
 ./agent_index.lo: ../include/net-snmp/library/parse.h
-./agent_index.lo: ../include/net-snmp/varbind_api.h
+./agent_index.lo: ../include/net-snmp/library/oid_stash.h
+./agent_index.lo: ../include/net-snmp/library/snmp_impl.h
+./agent_index.lo: ../include/net-snmp/library/snmp.h
+./agent_index.lo: ../include/net-snmp/library/snmp-tc.h
+./agent_index.lo: ../include/net-snmp/library/getopt.h
+./agent_index.lo: ../include/net-snmp/utilities.h
+./agent_index.lo: ../include/net-snmp/library/system.h
+./agent_index.lo: ../include/net-snmp/library/tools.h
+./agent_index.lo: ../include/net-snmp/library/int64.h
+./agent_index.lo: ../include/net-snmp/library/mt_support.h
+./agent_index.lo: ../include/net-snmp/library/snmp_alarm.h
+./agent_index.lo: ../include/net-snmp/library/data_list.h
+./agent_index.lo: ../include/net-snmp/library/check_varbind.h
+./agent_index.lo: ../include/net-snmp/library/container.h
+./agent_index.lo: ../include/net-snmp/library/factory.h
+./agent_index.lo: ../include/net-snmp/library/snmp_logging.h
+./agent_index.lo: ../include/net-snmp/library/container_binary_array.h
+./agent_index.lo: ../include/net-snmp/library/container_list_ssll.h
+./agent_index.lo: ../include/net-snmp/library/container_iterator.h
+./agent_index.lo: ../include/net-snmp/library/container.h
+./agent_index.lo: ../include/net-snmp/library/snmp_assert.h
+./agent_index.lo: ../include/net-snmp/version.h
 ./agent_index.lo: ../include/net-snmp/config_api.h
 ./agent_index.lo: ../include/net-snmp/library/read_config.h
 ./agent_index.lo: ../include/net-snmp/library/default_store.h
@@ -215,32 +220,14 @@
 ./agent_read_config.lo: ../include/net-snmp/net-snmp-includes.h
 ./agent_read_config.lo: ../include/net-snmp/definitions.h
 ./agent_read_config.lo: ../include/net-snmp/types.h
+./agent_read_config.lo: ../include/net-snmp/library/types.h
 ./agent_read_config.lo: ../include/net-snmp/library/snmp_api.h
-./agent_read_config.lo: ../include/net-snmp/library/asn1.h
-./agent_read_config.lo: ../include/net-snmp/library/snmp_impl.h
-./agent_read_config.lo: ../include/net-snmp/library/snmp.h
-./agent_read_config.lo: ../include/net-snmp/library/snmp-tc.h
-./agent_read_config.lo: ../include/net-snmp/utilities.h
+./agent_read_config.lo: ../include/net-snmp/varbind_api.h
 ./agent_read_config.lo: ../include/net-snmp/library/snmp_client.h
-./agent_read_config.lo: ../include/net-snmp/library/system.h
-./agent_read_config.lo: ../include/net-snmp/library/tools.h
-./agent_read_config.lo: ../include/net-snmp/library/int64.h
-./agent_read_config.lo: ../include/net-snmp/library/mt_support.h
-./agent_read_config.lo: ../include/net-snmp/library/snmp_alarm.h
-./agent_read_config.lo: ../include/net-snmp/library/callback.h
-./agent_read_config.lo: ../include/net-snmp/library/data_list.h
-./agent_read_config.lo: ../include/net-snmp/library/oid_stash.h
-./agent_read_config.lo: ../include/net-snmp/library/check_varbind.h
-./agent_read_config.lo: ../include/net-snmp/library/container.h
-./agent_read_config.lo: ../include/net-snmp/library/factory.h
-./agent_read_config.lo: ../include/net-snmp/library/snmp_logging.h
-./agent_read_config.lo: ../include/net-snmp/library/container_binary_array.h
-./agent_read_config.lo: ../include/net-snmp/library/container_list_ssll.h
-./agent_read_config.lo: ../include/net-snmp/library/container_iterator.h
-./agent_read_config.lo: ../include/net-snmp/library/container.h
-./agent_read_config.lo: ../include/net-snmp/library/snmp_assert.h
-./agent_read_config.lo: ../include/net-snmp/version.h
+./agent_read_config.lo: ../include/net-snmp/pdu_api.h
+./agent_read_config.lo: ../include/net-snmp/library/asn1.h
 ./agent_read_config.lo: ../include/net-snmp/session_api.h
+./agent_read_config.lo: ../include/net-snmp/library/callback.h
 ./agent_read_config.lo: ../include/net-snmp/library/snmp_transport.h
 ./agent_read_config.lo: ../include/net-snmp/library/snmp_service.h
 ./agent_read_config.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -251,11 +238,31 @@
 ./agent_read_config.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./agent_read_config.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./agent_read_config.lo: ../include/net-snmp/library/ucd_compat.h
-./agent_read_config.lo: ../include/net-snmp/pdu_api.h
-./agent_read_config.lo: ../include/net-snmp/mib_api.h
 ./agent_read_config.lo: ../include/net-snmp/library/mib.h
+./agent_read_config.lo: ../include/net-snmp/mib_api.h
 ./agent_read_config.lo: ../include/net-snmp/library/parse.h
-./agent_read_config.lo: ../include/net-snmp/varbind_api.h
+./agent_read_config.lo: ../include/net-snmp/library/oid_stash.h
+./agent_read_config.lo: ../include/net-snmp/library/snmp_impl.h
+./agent_read_config.lo: ../include/net-snmp/library/snmp.h
+./agent_read_config.lo: ../include/net-snmp/library/snmp-tc.h
+./agent_read_config.lo: ../include/net-snmp/library/getopt.h
+./agent_read_config.lo: ../include/net-snmp/utilities.h
+./agent_read_config.lo: ../include/net-snmp/library/system.h
+./agent_read_config.lo: ../include/net-snmp/library/tools.h
+./agent_read_config.lo: ../include/net-snmp/library/int64.h
+./agent_read_config.lo: ../include/net-snmp/library/mt_support.h
+./agent_read_config.lo: ../include/net-snmp/library/snmp_alarm.h
+./agent_read_config.lo: ../include/net-snmp/library/data_list.h
+./agent_read_config.lo: ../include/net-snmp/library/check_varbind.h
+./agent_read_config.lo: ../include/net-snmp/library/container.h
+./agent_read_config.lo: ../include/net-snmp/library/factory.h
+./agent_read_config.lo: ../include/net-snmp/library/snmp_logging.h
+./agent_read_config.lo: ../include/net-snmp/library/container_binary_array.h
+./agent_read_config.lo: ../include/net-snmp/library/container_list_ssll.h
+./agent_read_config.lo: ../include/net-snmp/library/container_iterator.h
+./agent_read_config.lo: ../include/net-snmp/library/container.h
+./agent_read_config.lo: ../include/net-snmp/library/snmp_assert.h
+./agent_read_config.lo: ../include/net-snmp/version.h
 ./agent_read_config.lo: ../include/net-snmp/config_api.h
 ./agent_read_config.lo: ../include/net-snmp/library/read_config.h
 ./agent_read_config.lo: ../include/net-snmp/library/default_store.h
@@ -311,24 +318,22 @@
 ./agent_read_config.lo: ../include/net-snmp/agent/mfd.h mibgroup/struct.h
 ./agent_read_config.lo: snmpd.h ../include/net-snmp/agent/agent_callbacks.h
 ./agent_read_config.lo: ../agent/mibgroup/agent_module_includes.h
-./agent_read_config.lo: mibgroup/smux/smux.h mibgroup/snmpv3/usmConf.h
-./agent_read_config.lo: mibgroup/utilities/iquery.h
-./agent_read_config.lo: mibgroup/mibII/vacm_conf.h
+./agent_read_config.lo: mibgroup/smux/smux.h mibgroup/utilities/iquery.h
+./agent_read_config.lo: mibgroup/snmpv3/usmConf.h mibgroup/mibII/vacm_conf.h
 ./agent_read_config.lo: ../agent/mibgroup/mib_module_includes.h
 ./agent_read_config.lo: mibgroup/examples/example.h mibgroup/testhandler.h
-./agent_read_config.lo: mibgroup/host/hr_system.h mibgroup/host/hr_storage.h
-./agent_read_config.lo: mibgroup/host/hr_device.h mibgroup/host/hr_other.h
-./agent_read_config.lo: mibgroup/host/hr_proc.h mibgroup/host/hr_network.h
-./agent_read_config.lo: mibgroup/host/hr_print.h mibgroup/host/hr_disk.h
-./agent_read_config.lo: mibgroup/host/hr_partition.h
-./agent_read_config.lo: mibgroup/host/hr_filesys.h mibgroup/host/hr_swrun.h
-./agent_read_config.lo: mibgroup/host/hr_swinst.h
+./agent_read_config.lo: mibgroup/host/hr_storage.h mibgroup/host/hr_filesys.h
+./agent_read_config.lo: mibgroup/host/hr_swinst.h mibgroup/host/hr_swrun.h
+./agent_read_config.lo: mibgroup/host/hr_system.h mibgroup/host/hr_device.h
+./agent_read_config.lo: mibgroup/host/hr_other.h mibgroup/host/hr_proc.h
+./agent_read_config.lo: mibgroup/host/hr_network.h mibgroup/host/hr_print.h
+./agent_read_config.lo: mibgroup/host/hr_disk.h mibgroup/host/hr_partition.h
 ./agent_read_config.lo: mibgroup/examples/scalar_int.h
 ./agent_read_config.lo: mibgroup/examples/watched.h
 ./agent_read_config.lo: mibgroup/examples/data_set.h
 ./agent_read_config.lo: mibgroup/examples/delayed_instance.h
 ./agent_read_config.lo: mibgroup/Rmon/rows.h mibgroup/Rmon/agutil.h
-./agent_read_config.lo: mibgroup/Rmon/statistics.h mibgroup/Rmon/alarm.h
+./agent_read_config.lo: mibgroup/Rmon/statistics.h mibgroup/Rmon/alarmTable.h
 ./agent_read_config.lo: mibgroup/Rmon/history.h mibgroup/Rmon/event.h
 ./agent_read_config.lo: mibgroup/disman/event/mteScalars.h
 ./agent_read_config.lo: mibgroup/disman/event/mteTrigger.h
@@ -347,16 +352,17 @@
 ./agent_read_config.lo: mibgroup/disman/event/mteObjects.h
 ./agent_read_config.lo: mibgroup/disman/event/mteObjectsTable.h
 ./agent_read_config.lo: mibgroup/disman/event/mteObjectsConf.h
+./agent_read_config.lo: mibgroup/snmpv3/snmpMPDStats_5_5.h
+./agent_read_config.lo: mibgroup/snmpv3/usmStats_5_5.h
 ./agent_read_config.lo: mibgroup/snmpv3/snmpEngine.h
-./agent_read_config.lo: mibgroup/snmpv3/snmpMPDStats.h
-./agent_read_config.lo: mibgroup/snmpv3/usmStats.h mibgroup/snmpv3/usmUser.h
+./agent_read_config.lo: mibgroup/snmpv3/usmUser.h
+./agent_read_config.lo: mibgroup/mibII/snmp_mib_5_5.h
 ./agent_read_config.lo: mibgroup/mibII/system_mib.h
 ./agent_read_config.lo: mibgroup/mibII/sysORTable.h mibgroup/mibII/at.h
 ./agent_read_config.lo: mibgroup/mibII/ip.h mibgroup/mibII/var_route.h
 ./agent_read_config.lo: mibgroup/mibII/route_write.h mibgroup/mibII/at.h
-./agent_read_config.lo: mibgroup/mibII/snmp_mib.h mibgroup/mibII/tcp.h
-./agent_read_config.lo: mibgroup/mibII/icmp.h mibgroup/mibII/udp.h
-./agent_read_config.lo: mibgroup/mibII/vacm_vars.h
+./agent_read_config.lo: mibgroup/mibII/tcp.h mibgroup/mibII/icmp.h
+./agent_read_config.lo: mibgroup/mibII/udp.h mibgroup/mibII/vacm_vars.h
 ./agent_read_config.lo: mibgroup/mibII/setSerialNo.h mibgroup/mibII/ipv6.h
 ./agent_read_config.lo: mibgroup/ucd-snmp/proc.h ../agent/mibgroup/mibdefs.h
 ./agent_read_config.lo: mibgroup/ucd-snmp/versioninfo.h
@@ -371,9 +377,9 @@
 ./agent_read_config.lo: mibgroup/notification/snmpNotifyTable.h
 ./agent_read_config.lo: mibgroup/notification/snmpNotifyFilterProfileTable.h
 ./agent_read_config.lo: mibgroup/notification-log-mib/notification_log.h
+./agent_read_config.lo: mibgroup/target/target_counters_5_5.h
 ./agent_read_config.lo: mibgroup/target/snmpTargetAddrEntry.h
 ./agent_read_config.lo: mibgroup/target/snmpTargetParamsEntry.h
-./agent_read_config.lo: mibgroup/target/target_counters.h
 ./agent_read_config.lo: mibgroup/agent/nsTransactionTable.h
 ./agent_read_config.lo: mibgroup/agent/nsModuleTable.h
 ./agent_read_config.lo: mibgroup/agent/nsDebug.h mibgroup/agent/nsCache.h
@@ -426,6 +432,20 @@
 ./agent_read_config.lo: mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.h
 ./agent_read_config.lo: mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h
 ./agent_read_config.lo: mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access.h
+./agent_read_config.lo: mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable.h
+./agent_read_config.lo: ../include/net-snmp/data_access/scopezone.h
+./agent_read_config.lo: mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable_oids.h
+./agent_read_config.lo: mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable_enums.h
+./agent_read_config.lo: mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable_interface.h
+./agent_read_config.lo: mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable.h
+./agent_read_config.lo: mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable_data_access.h
+./agent_read_config.lo: mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable.h
+./agent_read_config.lo: mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_oids.h
+./agent_read_config.lo: mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_enums.h
+./agent_read_config.lo: mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.h
+./agent_read_config.lo: mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable.h
+./agent_read_config.lo: mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_access.h
+./agent_read_config.lo: mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h
 ./agent_read_config.lo: mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable.h
 ./agent_read_config.lo: ../include/net-snmp/data_access/route.h
 ./agent_read_config.lo: ../agent/mibgroup/mibII/route_headers.h
@@ -465,32 +485,14 @@
 ./agent_registry.lo: ../include/net-snmp/net-snmp-includes.h
 ./agent_registry.lo: ../include/net-snmp/definitions.h
 ./agent_registry.lo: ../include/net-snmp/types.h
+./agent_registry.lo: ../include/net-snmp/library/types.h
 ./agent_registry.lo: ../include/net-snmp/library/snmp_api.h
-./agent_registry.lo: ../include/net-snmp/library/asn1.h
-./agent_registry.lo: ../include/net-snmp/library/snmp_impl.h
-./agent_registry.lo: ../include/net-snmp/library/snmp.h
-./agent_registry.lo: ../include/net-snmp/library/snmp-tc.h
-./agent_registry.lo: ../include/net-snmp/utilities.h
+./agent_registry.lo: ../include/net-snmp/varbind_api.h
 ./agent_registry.lo: ../include/net-snmp/library/snmp_client.h
-./agent_registry.lo: ../include/net-snmp/library/system.h
-./agent_registry.lo: ../include/net-snmp/library/tools.h
-./agent_registry.lo: ../include/net-snmp/library/int64.h
-./agent_registry.lo: ../include/net-snmp/library/mt_support.h
-./agent_registry.lo: ../include/net-snmp/library/snmp_alarm.h
-./agent_registry.lo: ../include/net-snmp/library/callback.h
-./agent_registry.lo: ../include/net-snmp/library/data_list.h
-./agent_registry.lo: ../include/net-snmp/library/oid_stash.h
-./agent_registry.lo: ../include/net-snmp/library/check_varbind.h
-./agent_registry.lo: ../include/net-snmp/library/container.h
-./agent_registry.lo: ../include/net-snmp/library/factory.h
-./agent_registry.lo: ../include/net-snmp/library/snmp_logging.h
-./agent_registry.lo: ../include/net-snmp/library/container_binary_array.h
-./agent_registry.lo: ../include/net-snmp/library/container_list_ssll.h
-./agent_registry.lo: ../include/net-snmp/library/container_iterator.h
-./agent_registry.lo: ../include/net-snmp/library/container.h
-./agent_registry.lo: ../include/net-snmp/library/snmp_assert.h
-./agent_registry.lo: ../include/net-snmp/version.h
+./agent_registry.lo: ../include/net-snmp/pdu_api.h
+./agent_registry.lo: ../include/net-snmp/library/asn1.h
 ./agent_registry.lo: ../include/net-snmp/session_api.h
+./agent_registry.lo: ../include/net-snmp/library/callback.h
 ./agent_registry.lo: ../include/net-snmp/library/snmp_transport.h
 ./agent_registry.lo: ../include/net-snmp/library/snmp_service.h
 ./agent_registry.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -501,11 +503,31 @@
 ./agent_registry.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./agent_registry.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./agent_registry.lo: ../include/net-snmp/library/ucd_compat.h
-./agent_registry.lo: ../include/net-snmp/pdu_api.h
-./agent_registry.lo: ../include/net-snmp/mib_api.h
 ./agent_registry.lo: ../include/net-snmp/library/mib.h
+./agent_registry.lo: ../include/net-snmp/mib_api.h
 ./agent_registry.lo: ../include/net-snmp/library/parse.h
-./agent_registry.lo: ../include/net-snmp/varbind_api.h
+./agent_registry.lo: ../include/net-snmp/library/oid_stash.h
+./agent_registry.lo: ../include/net-snmp/library/snmp_impl.h
+./agent_registry.lo: ../include/net-snmp/library/snmp.h
+./agent_registry.lo: ../include/net-snmp/library/snmp-tc.h
+./agent_registry.lo: ../include/net-snmp/library/getopt.h
+./agent_registry.lo: ../include/net-snmp/utilities.h
+./agent_registry.lo: ../include/net-snmp/library/system.h
+./agent_registry.lo: ../include/net-snmp/library/tools.h
+./agent_registry.lo: ../include/net-snmp/library/int64.h
+./agent_registry.lo: ../include/net-snmp/library/mt_support.h
+./agent_registry.lo: ../include/net-snmp/library/snmp_alarm.h
+./agent_registry.lo: ../include/net-snmp/library/data_list.h
+./agent_registry.lo: ../include/net-snmp/library/check_varbind.h
+./agent_registry.lo: ../include/net-snmp/library/container.h
+./agent_registry.lo: ../include/net-snmp/library/factory.h
+./agent_registry.lo: ../include/net-snmp/library/snmp_logging.h
+./agent_registry.lo: ../include/net-snmp/library/container_binary_array.h
+./agent_registry.lo: ../include/net-snmp/library/container_list_ssll.h
+./agent_registry.lo: ../include/net-snmp/library/container_iterator.h
+./agent_registry.lo: ../include/net-snmp/library/container.h
+./agent_registry.lo: ../include/net-snmp/library/snmp_assert.h
+./agent_registry.lo: ../include/net-snmp/version.h
 ./agent_registry.lo: ../include/net-snmp/config_api.h
 ./agent_registry.lo: ../include/net-snmp/library/read_config.h
 ./agent_registry.lo: ../include/net-snmp/library/default_store.h
@@ -562,27 +584,152 @@
 ./agent_registry.lo: ../include/net-snmp/agent/agent_callbacks.h snmpd.h
 ./agent_registry.lo: mibgroup/struct.h ../agent/mibgroup/agentx/subagent.h
 ./agent_registry.lo: ../agent/mibgroup/agentx/client.h
+./agent_sysORTable.lo: ../include/net-snmp/net-snmp-config.h
+./agent_sysORTable.lo: ../include/net-snmp/system/linux.h
+./agent_sysORTable.lo: ../include/net-snmp/system/sysv.h
+./agent_sysORTable.lo: ../include/net-snmp/system/generic.h
+./agent_sysORTable.lo: ../include/net-snmp/machine/generic.h
+./agent_sysORTable.lo: ../include/net-snmp/net-snmp-includes.h
+./agent_sysORTable.lo: ../include/net-snmp/definitions.h
+./agent_sysORTable.lo: ../include/net-snmp/types.h
+./agent_sysORTable.lo: ../include/net-snmp/library/types.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmp_api.h
+./agent_sysORTable.lo: ../include/net-snmp/varbind_api.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmp_client.h
+./agent_sysORTable.lo: ../include/net-snmp/pdu_api.h
+./agent_sysORTable.lo: ../include/net-snmp/library/asn1.h
+./agent_sysORTable.lo: ../include/net-snmp/session_api.h
+./agent_sysORTable.lo: ../include/net-snmp/library/callback.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmp_transport.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmp_service.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmpCallbackDomain.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmpUnixDomain.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmpUDPDomain.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmpTCPDomain.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmpUDPIPv6Domain.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmpIPXDomain.h
+./agent_sysORTable.lo: ../include/net-snmp/library/ucd_compat.h
+./agent_sysORTable.lo: ../include/net-snmp/library/mib.h
+./agent_sysORTable.lo: ../include/net-snmp/mib_api.h
+./agent_sysORTable.lo: ../include/net-snmp/library/parse.h
+./agent_sysORTable.lo: ../include/net-snmp/library/oid_stash.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmp_impl.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmp.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmp-tc.h
+./agent_sysORTable.lo: ../include/net-snmp/library/getopt.h
+./agent_sysORTable.lo: ../include/net-snmp/utilities.h
+./agent_sysORTable.lo: ../include/net-snmp/library/system.h
+./agent_sysORTable.lo: ../include/net-snmp/library/tools.h
+./agent_sysORTable.lo: ../include/net-snmp/library/int64.h
+./agent_sysORTable.lo: ../include/net-snmp/library/mt_support.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmp_alarm.h
+./agent_sysORTable.lo: ../include/net-snmp/library/data_list.h
+./agent_sysORTable.lo: ../include/net-snmp/library/check_varbind.h
+./agent_sysORTable.lo: ../include/net-snmp/library/container.h
+./agent_sysORTable.lo: ../include/net-snmp/library/factory.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmp_logging.h
+./agent_sysORTable.lo: ../include/net-snmp/library/container_binary_array.h
+./agent_sysORTable.lo: ../include/net-snmp/library/container_list_ssll.h
+./agent_sysORTable.lo: ../include/net-snmp/library/container_iterator.h
+./agent_sysORTable.lo: ../include/net-snmp/library/container.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmp_assert.h
+./agent_sysORTable.lo: ../include/net-snmp/version.h
+./agent_sysORTable.lo: ../include/net-snmp/config_api.h
+./agent_sysORTable.lo: ../include/net-snmp/library/read_config.h
+./agent_sysORTable.lo: ../include/net-snmp/library/default_store.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmp_parse_args.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmp_enum.h
+./agent_sysORTable.lo: ../include/net-snmp/library/vacm.h
+./agent_sysORTable.lo: ../include/net-snmp/output_api.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmp_debug.h
+./agent_sysORTable.lo: ../include/net-snmp/snmpv3_api.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmpv3.h
+./agent_sysORTable.lo: ../include/net-snmp/library/transform_oids.h
+./agent_sysORTable.lo: ../include/net-snmp/library/keytools.h
+./agent_sysORTable.lo: ../include/net-snmp/library/scapi.h
+./agent_sysORTable.lo: ../include/net-snmp/library/lcd_time.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmp_secmod.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmpv3-security-includes.h
+./agent_sysORTable.lo: ../include/net-snmp/library/snmpusm.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/net-snmp-agent-includes.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/mib_module_config.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/agent_module_config.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/snmp_agent.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/snmp_vars.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/agent_handler.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/var_struct.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/agent_registry.h
+./agent_sysORTable.lo: ../include/net-snmp/library/fd_event_manager.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/ds_agent.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/agent_read_config.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/agent_trap.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/all_helpers.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/instance.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/baby_steps.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/scalar.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/scalar_group.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/watcher.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/multiplexer.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/null.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/debug_handler.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/cache_handler.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/old_api.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/read_only.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/row_merge.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/serialize.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/bulk_to_next.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/mode_end_call.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/table.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/table_data.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/table_dataset.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/table_tdata.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/table_iterator.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/table_container.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/table_array.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/mfd.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/agent_callbacks.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/agent_sysORTable.h
+./agent_sysORTable.lo: ../include/net-snmp/agent/sysORTable.h
 ./agent_trap.lo: ../include/net-snmp/net-snmp-config.h
 ./agent_trap.lo: ../include/net-snmp/system/linux.h
 ./agent_trap.lo: ../include/net-snmp/system/sysv.h
 ./agent_trap.lo: ../include/net-snmp/system/generic.h
 ./agent_trap.lo: ../include/net-snmp/machine/generic.h
-./agent_trap.lo: ../include/net-snmp/utilities.h ../include/net-snmp/types.h
+./agent_trap.lo: ../include/net-snmp/utilities.h
+./agent_trap.lo: ../include/net-snmp/types.h
+./agent_trap.lo: ../include/net-snmp/library/types.h
 ./agent_trap.lo: ../include/net-snmp/definitions.h
 ./agent_trap.lo: ../include/net-snmp/library/snmp_api.h
+./agent_trap.lo: ../include/net-snmp/varbind_api.h
+./agent_trap.lo: ../include/net-snmp/library/snmp_client.h
+./agent_trap.lo: ../include/net-snmp/pdu_api.h
 ./agent_trap.lo: ../include/net-snmp/library/asn1.h
+./agent_trap.lo: ../include/net-snmp/session_api.h
+./agent_trap.lo: ../include/net-snmp/library/callback.h
+./agent_trap.lo: ../include/net-snmp/library/snmp_transport.h
+./agent_trap.lo: ../include/net-snmp/library/snmp_service.h
+./agent_trap.lo: ../include/net-snmp/library/snmpCallbackDomain.h
+./agent_trap.lo: ../include/net-snmp/library/snmpUnixDomain.h
+./agent_trap.lo: ../include/net-snmp/library/snmpUDPDomain.h
+./agent_trap.lo: ../include/net-snmp/library/snmpTCPDomain.h
+./agent_trap.lo: ../include/net-snmp/library/snmpUDPIPv6Domain.h
+./agent_trap.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
+./agent_trap.lo: ../include/net-snmp/library/snmpIPXDomain.h
+./agent_trap.lo: ../include/net-snmp/library/ucd_compat.h
+./agent_trap.lo: ../include/net-snmp/library/mib.h
+./agent_trap.lo: ../include/net-snmp/mib_api.h
+./agent_trap.lo: ../include/net-snmp/library/parse.h
+./agent_trap.lo: ../include/net-snmp/library/oid_stash.h
 ./agent_trap.lo: ../include/net-snmp/library/snmp_impl.h
 ./agent_trap.lo: ../include/net-snmp/library/snmp.h
 ./agent_trap.lo: ../include/net-snmp/library/snmp-tc.h
-./agent_trap.lo: ../include/net-snmp/library/snmp_client.h
 ./agent_trap.lo: ../include/net-snmp/library/system.h
 ./agent_trap.lo: ../include/net-snmp/library/tools.h
 ./agent_trap.lo: ../include/net-snmp/library/int64.h
 ./agent_trap.lo: ../include/net-snmp/library/mt_support.h
 ./agent_trap.lo: ../include/net-snmp/library/snmp_alarm.h
-./agent_trap.lo: ../include/net-snmp/library/callback.h
 ./agent_trap.lo: ../include/net-snmp/library/data_list.h
-./agent_trap.lo: ../include/net-snmp/library/oid_stash.h
 ./agent_trap.lo: ../include/net-snmp/library/check_varbind.h
 ./agent_trap.lo: ../include/net-snmp/library/container.h
 ./agent_trap.lo: ../include/net-snmp/library/factory.h
@@ -594,21 +741,7 @@
 ./agent_trap.lo: ../include/net-snmp/library/snmp_assert.h
 ./agent_trap.lo: ../include/net-snmp/version.h
 ./agent_trap.lo: ../include/net-snmp/net-snmp-includes.h
-./agent_trap.lo: ../include/net-snmp/session_api.h
-./agent_trap.lo: ../include/net-snmp/library/snmp_transport.h
-./agent_trap.lo: ../include/net-snmp/library/snmp_service.h
-./agent_trap.lo: ../include/net-snmp/library/snmpCallbackDomain.h
-./agent_trap.lo: ../include/net-snmp/library/snmpUnixDomain.h
-./agent_trap.lo: ../include/net-snmp/library/snmpUDPDomain.h
-./agent_trap.lo: ../include/net-snmp/library/snmpTCPDomain.h
-./agent_trap.lo: ../include/net-snmp/library/snmpUDPIPv6Domain.h
-./agent_trap.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
-./agent_trap.lo: ../include/net-snmp/library/snmpIPXDomain.h
-./agent_trap.lo: ../include/net-snmp/library/ucd_compat.h
-./agent_trap.lo: ../include/net-snmp/pdu_api.h ../include/net-snmp/mib_api.h
-./agent_trap.lo: ../include/net-snmp/library/mib.h
-./agent_trap.lo: ../include/net-snmp/library/parse.h
-./agent_trap.lo: ../include/net-snmp/varbind_api.h
+./agent_trap.lo: ../include/net-snmp/library/getopt.h
 ./agent_trap.lo: ../include/net-snmp/config_api.h
 ./agent_trap.lo: ../include/net-snmp/library/read_config.h
 ./agent_trap.lo: ../include/net-snmp/library/default_store.h
@@ -626,11 +759,43 @@
 ./agent_trap.lo: ../include/net-snmp/library/snmp_secmod.h
 ./agent_trap.lo: ../include/net-snmp/library/snmpv3-security-includes.h
 ./agent_trap.lo: ../include/net-snmp/library/snmpusm.h
-./agent_trap.lo: ../include/net-snmp/agent/agent_trap.h
-./agent_trap.lo: ../include/net-snmp/agent/snmp_agent.h
-./agent_trap.lo: ../include/net-snmp/agent/agent_callbacks.h
-./agent_trap.lo: ../include/net-snmp/agent/agent_module_config.h
+./agent_trap.lo: ../include/net-snmp/agent/net-snmp-agent-includes.h
 ./agent_trap.lo: ../include/net-snmp/agent/mib_module_config.h
+./agent_trap.lo: ../include/net-snmp/agent/agent_module_config.h
+./agent_trap.lo: ../include/net-snmp/agent/snmp_agent.h
+./agent_trap.lo: ../include/net-snmp/agent/snmp_vars.h
+./agent_trap.lo: ../include/net-snmp/agent/agent_handler.h
+./agent_trap.lo: ../include/net-snmp/agent/var_struct.h
+./agent_trap.lo: ../include/net-snmp/agent/agent_registry.h
+./agent_trap.lo: ../include/net-snmp/library/fd_event_manager.h
+./agent_trap.lo: ../include/net-snmp/agent/ds_agent.h
+./agent_trap.lo: ../include/net-snmp/agent/agent_read_config.h
+./agent_trap.lo: ../include/net-snmp/agent/agent_trap.h
+./agent_trap.lo: ../include/net-snmp/agent/all_helpers.h
+./agent_trap.lo: ../include/net-snmp/agent/instance.h
+./agent_trap.lo: ../include/net-snmp/agent/baby_steps.h
+./agent_trap.lo: ../include/net-snmp/agent/scalar.h
+./agent_trap.lo: ../include/net-snmp/agent/scalar_group.h
+./agent_trap.lo: ../include/net-snmp/agent/watcher.h
+./agent_trap.lo: ../include/net-snmp/agent/multiplexer.h
+./agent_trap.lo: ../include/net-snmp/agent/null.h
+./agent_trap.lo: ../include/net-snmp/agent/debug_handler.h
+./agent_trap.lo: ../include/net-snmp/agent/cache_handler.h
+./agent_trap.lo: ../include/net-snmp/agent/old_api.h
+./agent_trap.lo: ../include/net-snmp/agent/read_only.h
+./agent_trap.lo: ../include/net-snmp/agent/row_merge.h
+./agent_trap.lo: ../include/net-snmp/agent/serialize.h
+./agent_trap.lo: ../include/net-snmp/agent/bulk_to_next.h
+./agent_trap.lo: ../include/net-snmp/agent/mode_end_call.h
+./agent_trap.lo: ../include/net-snmp/agent/table.h
+./agent_trap.lo: ../include/net-snmp/agent/table_data.h
+./agent_trap.lo: ../include/net-snmp/agent/table_dataset.h
+./agent_trap.lo: ../include/net-snmp/agent/table_tdata.h
+./agent_trap.lo: ../include/net-snmp/agent/table_iterator.h
+./agent_trap.lo: ../include/net-snmp/agent/table_container.h
+./agent_trap.lo: ../include/net-snmp/agent/table_array.h
+./agent_trap.lo: ../include/net-snmp/agent/mfd.h
+./agent_trap.lo: ../include/net-snmp/agent/agent_callbacks.h
 ./agent_trap.lo: ../agent/mibgroup/agentx/protocol.h
 ./auto_nlist.lo: ../include/net-snmp/net-snmp-config.h
 ./auto_nlist.lo: ../include/net-snmp/system/linux.h
@@ -652,32 +817,14 @@
 ./mib_modules.lo: ../include/net-snmp/net-snmp-includes.h
 ./mib_modules.lo: ../include/net-snmp/definitions.h
 ./mib_modules.lo: ../include/net-snmp/types.h
+./mib_modules.lo: ../include/net-snmp/library/types.h
 ./mib_modules.lo: ../include/net-snmp/library/snmp_api.h
-./mib_modules.lo: ../include/net-snmp/library/asn1.h
-./mib_modules.lo: ../include/net-snmp/library/snmp_impl.h
-./mib_modules.lo: ../include/net-snmp/library/snmp.h
-./mib_modules.lo: ../include/net-snmp/library/snmp-tc.h
-./mib_modules.lo: ../include/net-snmp/utilities.h
+./mib_modules.lo: ../include/net-snmp/varbind_api.h
 ./mib_modules.lo: ../include/net-snmp/library/snmp_client.h
-./mib_modules.lo: ../include/net-snmp/library/system.h
-./mib_modules.lo: ../include/net-snmp/library/tools.h
-./mib_modules.lo: ../include/net-snmp/library/int64.h
-./mib_modules.lo: ../include/net-snmp/library/mt_support.h
-./mib_modules.lo: ../include/net-snmp/library/snmp_alarm.h
-./mib_modules.lo: ../include/net-snmp/library/callback.h
-./mib_modules.lo: ../include/net-snmp/library/data_list.h
-./mib_modules.lo: ../include/net-snmp/library/oid_stash.h
-./mib_modules.lo: ../include/net-snmp/library/check_varbind.h
-./mib_modules.lo: ../include/net-snmp/library/container.h
-./mib_modules.lo: ../include/net-snmp/library/factory.h
-./mib_modules.lo: ../include/net-snmp/library/snmp_logging.h
-./mib_modules.lo: ../include/net-snmp/library/container_binary_array.h
-./mib_modules.lo: ../include/net-snmp/library/container_list_ssll.h
-./mib_modules.lo: ../include/net-snmp/library/container_iterator.h
-./mib_modules.lo: ../include/net-snmp/library/container.h
-./mib_modules.lo: ../include/net-snmp/library/snmp_assert.h
-./mib_modules.lo: ../include/net-snmp/version.h
+./mib_modules.lo: ../include/net-snmp/pdu_api.h
+./mib_modules.lo: ../include/net-snmp/library/asn1.h
 ./mib_modules.lo: ../include/net-snmp/session_api.h
+./mib_modules.lo: ../include/net-snmp/library/callback.h
 ./mib_modules.lo: ../include/net-snmp/library/snmp_transport.h
 ./mib_modules.lo: ../include/net-snmp/library/snmp_service.h
 ./mib_modules.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -688,10 +835,31 @@
 ./mib_modules.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mib_modules.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./mib_modules.lo: ../include/net-snmp/library/ucd_compat.h
-./mib_modules.lo: ../include/net-snmp/pdu_api.h ../include/net-snmp/mib_api.h
 ./mib_modules.lo: ../include/net-snmp/library/mib.h
+./mib_modules.lo: ../include/net-snmp/mib_api.h
 ./mib_modules.lo: ../include/net-snmp/library/parse.h
-./mib_modules.lo: ../include/net-snmp/varbind_api.h
+./mib_modules.lo: ../include/net-snmp/library/oid_stash.h
+./mib_modules.lo: ../include/net-snmp/library/snmp_impl.h
+./mib_modules.lo: ../include/net-snmp/library/snmp.h
+./mib_modules.lo: ../include/net-snmp/library/snmp-tc.h
+./mib_modules.lo: ../include/net-snmp/library/getopt.h
+./mib_modules.lo: ../include/net-snmp/utilities.h
+./mib_modules.lo: ../include/net-snmp/library/system.h
+./mib_modules.lo: ../include/net-snmp/library/tools.h
+./mib_modules.lo: ../include/net-snmp/library/int64.h
+./mib_modules.lo: ../include/net-snmp/library/mt_support.h
+./mib_modules.lo: ../include/net-snmp/library/snmp_alarm.h
+./mib_modules.lo: ../include/net-snmp/library/data_list.h
+./mib_modules.lo: ../include/net-snmp/library/check_varbind.h
+./mib_modules.lo: ../include/net-snmp/library/container.h
+./mib_modules.lo: ../include/net-snmp/library/factory.h
+./mib_modules.lo: ../include/net-snmp/library/snmp_logging.h
+./mib_modules.lo: ../include/net-snmp/library/container_binary_array.h
+./mib_modules.lo: ../include/net-snmp/library/container_list_ssll.h
+./mib_modules.lo: ../include/net-snmp/library/container_iterator.h
+./mib_modules.lo: ../include/net-snmp/library/container.h
+./mib_modules.lo: ../include/net-snmp/library/snmp_assert.h
+./mib_modules.lo: ../include/net-snmp/version.h
 ./mib_modules.lo: ../include/net-snmp/config_api.h
 ./mib_modules.lo: ../include/net-snmp/library/read_config.h
 ./mib_modules.lo: ../include/net-snmp/library/default_store.h
@@ -748,17 +916,17 @@
 ./mib_modules.lo: mibgroup/struct.h ../include/net-snmp/agent/mib_modules.h
 ./mib_modules.lo: ../agent/mibgroup/mib_module_includes.h
 ./mib_modules.lo: mibgroup/examples/example.h mibgroup/testhandler.h
-./mib_modules.lo: mibgroup/host/hr_system.h mibgroup/host/hr_storage.h
-./mib_modules.lo: mibgroup/host/hr_device.h mibgroup/host/hr_other.h
-./mib_modules.lo: mibgroup/host/hr_proc.h mibgroup/host/hr_network.h
-./mib_modules.lo: mibgroup/host/hr_print.h mibgroup/host/hr_disk.h
-./mib_modules.lo: mibgroup/host/hr_partition.h mibgroup/host/hr_filesys.h
-./mib_modules.lo: mibgroup/host/hr_swrun.h mibgroup/host/hr_swinst.h
+./mib_modules.lo: mibgroup/host/hr_storage.h mibgroup/host/hr_filesys.h
+./mib_modules.lo: mibgroup/host/hr_swinst.h mibgroup/host/hr_swrun.h
+./mib_modules.lo: mibgroup/host/hr_system.h mibgroup/host/hr_device.h
+./mib_modules.lo: mibgroup/host/hr_other.h mibgroup/host/hr_proc.h
+./mib_modules.lo: mibgroup/host/hr_network.h mibgroup/host/hr_print.h
+./mib_modules.lo: mibgroup/host/hr_disk.h mibgroup/host/hr_partition.h
 ./mib_modules.lo: mibgroup/examples/scalar_int.h mibgroup/examples/watched.h
 ./mib_modules.lo: mibgroup/examples/data_set.h
 ./mib_modules.lo: mibgroup/examples/delayed_instance.h mibgroup/Rmon/rows.h
 ./mib_modules.lo: mibgroup/Rmon/agutil.h mibgroup/Rmon/statistics.h
-./mib_modules.lo: mibgroup/Rmon/alarm.h mibgroup/Rmon/history.h
+./mib_modules.lo: mibgroup/Rmon/alarmTable.h mibgroup/Rmon/history.h
 ./mib_modules.lo: mibgroup/Rmon/event.h mibgroup/disman/event/mteScalars.h
 ./mib_modules.lo: mibgroup/disman/event/mteTrigger.h
 ./mib_modules.lo: mibgroup/disman/event/mteTriggerTable.h
@@ -776,30 +944,29 @@
 ./mib_modules.lo: mibgroup/disman/event/mteObjects.h
 ./mib_modules.lo: mibgroup/disman/event/mteObjectsTable.h
 ./mib_modules.lo: mibgroup/disman/event/mteObjectsConf.h
-./mib_modules.lo: mibgroup/snmpv3/snmpEngine.h mibgroup/snmpv3/snmpMPDStats.h
-./mib_modules.lo: mibgroup/snmpv3/usmStats.h mibgroup/snmpv3/usmUser.h
+./mib_modules.lo: mibgroup/snmpv3/snmpMPDStats_5_5.h
+./mib_modules.lo: mibgroup/snmpv3/usmStats_5_5.h mibgroup/snmpv3/snmpEngine.h
+./mib_modules.lo: mibgroup/snmpv3/usmUser.h mibgroup/mibII/snmp_mib_5_5.h
 ./mib_modules.lo: mibgroup/mibII/system_mib.h mibgroup/mibII/sysORTable.h
 ./mib_modules.lo: mibgroup/mibII/at.h mibgroup/mibII/ip.h
 ./mib_modules.lo: mibgroup/mibII/var_route.h mibgroup/mibII/route_write.h
-./mib_modules.lo: mibgroup/mibII/at.h mibgroup/mibII/snmp_mib.h
-./mib_modules.lo: mibgroup/mibII/tcp.h mibgroup/mibII/icmp.h
-./mib_modules.lo: mibgroup/mibII/udp.h mibgroup/mibII/vacm_vars.h
-./mib_modules.lo: mibgroup/mibII/setSerialNo.h mibgroup/mibII/ipv6.h
-./mib_modules.lo: mibgroup/ucd-snmp/proc.h ../agent/mibgroup/mibdefs.h
-./mib_modules.lo: mibgroup/ucd-snmp/versioninfo.h mibgroup/ucd-snmp/pass.h
-./mib_modules.lo: mibgroup/ucd-snmp/pass_persist.h mibgroup/ucd-snmp/disk.h
-./mib_modules.lo: mibgroup/ucd-snmp/loadave.h mibgroup/agent/extend.h
-./mib_modules.lo: mibgroup/ucd-snmp/errormib.h mibgroup/ucd-snmp/file.h
-./mib_modules.lo: mibgroup/ucd-snmp/dlmod.h mibgroup/ucd-snmp/proxy.h
-./mib_modules.lo: mibgroup/ucd-snmp/logmatch.h
-./mib_modules.lo: mibgroup/ucd-snmp/memory.h
-./mib_modules.lo: mibgroup/ucd-snmp/vmstat.h
+./mib_modules.lo: mibgroup/mibII/at.h mibgroup/mibII/tcp.h
+./mib_modules.lo: mibgroup/mibII/icmp.h mibgroup/mibII/udp.h
+./mib_modules.lo: mibgroup/mibII/vacm_vars.h mibgroup/mibII/setSerialNo.h
+./mib_modules.lo: mibgroup/mibII/ipv6.h mibgroup/ucd-snmp/proc.h
+./mib_modules.lo: ../agent/mibgroup/mibdefs.h mibgroup/ucd-snmp/versioninfo.h
+./mib_modules.lo: mibgroup/ucd-snmp/pass.h mibgroup/ucd-snmp/pass_persist.h
+./mib_modules.lo: mibgroup/ucd-snmp/disk.h mibgroup/ucd-snmp/loadave.h
+./mib_modules.lo: mibgroup/agent/extend.h mibgroup/ucd-snmp/errormib.h
+./mib_modules.lo: mibgroup/ucd-snmp/file.h mibgroup/ucd-snmp/dlmod.h
+./mib_modules.lo: mibgroup/ucd-snmp/proxy.h mibgroup/ucd-snmp/logmatch.h
+./mib_modules.lo: mibgroup/ucd-snmp/memory.h mibgroup/ucd-snmp/vmstat.h
 ./mib_modules.lo: mibgroup/notification/snmpNotifyTable.h
 ./mib_modules.lo: mibgroup/notification/snmpNotifyFilterProfileTable.h
 ./mib_modules.lo: mibgroup/notification-log-mib/notification_log.h
+./mib_modules.lo: mibgroup/target/target_counters_5_5.h
 ./mib_modules.lo: mibgroup/target/snmpTargetAddrEntry.h
 ./mib_modules.lo: mibgroup/target/snmpTargetParamsEntry.h
-./mib_modules.lo: mibgroup/target/target_counters.h
 ./mib_modules.lo: mibgroup/agent/nsTransactionTable.h
 ./mib_modules.lo: mibgroup/agent/nsModuleTable.h mibgroup/agent/nsDebug.h
 ./mib_modules.lo: mibgroup/agent/nsCache.h mibgroup/agent/nsLogging.h
@@ -849,6 +1016,20 @@
 ./mib_modules.lo: mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.h
 ./mib_modules.lo: mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h
 ./mib_modules.lo: mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access.h
+./mib_modules.lo: mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable.h
+./mib_modules.lo: ../include/net-snmp/data_access/scopezone.h
+./mib_modules.lo: mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable_oids.h
+./mib_modules.lo: mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable_enums.h
+./mib_modules.lo: mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable_interface.h
+./mib_modules.lo: mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable.h
+./mib_modules.lo: mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable_data_access.h
+./mib_modules.lo: mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable.h
+./mib_modules.lo: mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_oids.h
+./mib_modules.lo: mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_enums.h
+./mib_modules.lo: mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.h
+./mib_modules.lo: mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable.h
+./mib_modules.lo: mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_access.h
+./mib_modules.lo: mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h
 ./mib_modules.lo: mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable.h
 ./mib_modules.lo: ../include/net-snmp/data_access/route.h
 ./mib_modules.lo: ../agent/mibgroup/mibII/route_headers.h
@@ -878,7 +1059,6 @@
 ./mib_modules.lo: mibgroup/udp-mib/udpEndpointTable/udpEndpointTable.h
 ./mib_modules.lo: mibgroup/udp-mib/udpEndpointTable/udpEndpointTable_data_access.h
 ./mib_modules.lo: mibgroup/if-mib/data_access/interface.h
-./mib_modules.lo: mibgroup/agentx/subagent.h
 ./mib_modules.lo: ../agent/mibgroup/mib_module_shutdown.h
 ./mib_modules.lo: ../agent/mibgroup/mib_module_inits.h
 ./object_monitor.lo: ../include/net-snmp/net-snmp-config.h
@@ -889,32 +1069,14 @@
 ./object_monitor.lo: ../include/net-snmp/net-snmp-includes.h
 ./object_monitor.lo: ../include/net-snmp/definitions.h
 ./object_monitor.lo: ../include/net-snmp/types.h
+./object_monitor.lo: ../include/net-snmp/library/types.h
 ./object_monitor.lo: ../include/net-snmp/library/snmp_api.h
-./object_monitor.lo: ../include/net-snmp/library/asn1.h
-./object_monitor.lo: ../include/net-snmp/library/snmp_impl.h
-./object_monitor.lo: ../include/net-snmp/library/snmp.h
-./object_monitor.lo: ../include/net-snmp/library/snmp-tc.h
-./object_monitor.lo: ../include/net-snmp/utilities.h
+./object_monitor.lo: ../include/net-snmp/varbind_api.h
 ./object_monitor.lo: ../include/net-snmp/library/snmp_client.h
-./object_monitor.lo: ../include/net-snmp/library/system.h
-./object_monitor.lo: ../include/net-snmp/library/tools.h
-./object_monitor.lo: ../include/net-snmp/library/int64.h
-./object_monitor.lo: ../include/net-snmp/library/mt_support.h
-./object_monitor.lo: ../include/net-snmp/library/snmp_alarm.h
-./object_monitor.lo: ../include/net-snmp/library/callback.h
-./object_monitor.lo: ../include/net-snmp/library/data_list.h
-./object_monitor.lo: ../include/net-snmp/library/oid_stash.h
-./object_monitor.lo: ../include/net-snmp/library/check_varbind.h
-./object_monitor.lo: ../include/net-snmp/library/container.h
-./object_monitor.lo: ../include/net-snmp/library/factory.h
-./object_monitor.lo: ../include/net-snmp/library/snmp_logging.h
-./object_monitor.lo: ../include/net-snmp/library/container_binary_array.h
-./object_monitor.lo: ../include/net-snmp/library/container_list_ssll.h
-./object_monitor.lo: ../include/net-snmp/library/container_iterator.h
-./object_monitor.lo: ../include/net-snmp/library/container.h
-./object_monitor.lo: ../include/net-snmp/library/snmp_assert.h
-./object_monitor.lo: ../include/net-snmp/version.h
+./object_monitor.lo: ../include/net-snmp/pdu_api.h
+./object_monitor.lo: ../include/net-snmp/library/asn1.h
 ./object_monitor.lo: ../include/net-snmp/session_api.h
+./object_monitor.lo: ../include/net-snmp/library/callback.h
 ./object_monitor.lo: ../include/net-snmp/library/snmp_transport.h
 ./object_monitor.lo: ../include/net-snmp/library/snmp_service.h
 ./object_monitor.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -925,11 +1087,31 @@
 ./object_monitor.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./object_monitor.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./object_monitor.lo: ../include/net-snmp/library/ucd_compat.h
-./object_monitor.lo: ../include/net-snmp/pdu_api.h
-./object_monitor.lo: ../include/net-snmp/mib_api.h
 ./object_monitor.lo: ../include/net-snmp/library/mib.h
+./object_monitor.lo: ../include/net-snmp/mib_api.h
 ./object_monitor.lo: ../include/net-snmp/library/parse.h
-./object_monitor.lo: ../include/net-snmp/varbind_api.h
+./object_monitor.lo: ../include/net-snmp/library/oid_stash.h
+./object_monitor.lo: ../include/net-snmp/library/snmp_impl.h
+./object_monitor.lo: ../include/net-snmp/library/snmp.h
+./object_monitor.lo: ../include/net-snmp/library/snmp-tc.h
+./object_monitor.lo: ../include/net-snmp/library/getopt.h
+./object_monitor.lo: ../include/net-snmp/utilities.h
+./object_monitor.lo: ../include/net-snmp/library/system.h
+./object_monitor.lo: ../include/net-snmp/library/tools.h
+./object_monitor.lo: ../include/net-snmp/library/int64.h
+./object_monitor.lo: ../include/net-snmp/library/mt_support.h
+./object_monitor.lo: ../include/net-snmp/library/snmp_alarm.h
+./object_monitor.lo: ../include/net-snmp/library/data_list.h
+./object_monitor.lo: ../include/net-snmp/library/check_varbind.h
+./object_monitor.lo: ../include/net-snmp/library/container.h
+./object_monitor.lo: ../include/net-snmp/library/factory.h
+./object_monitor.lo: ../include/net-snmp/library/snmp_logging.h
+./object_monitor.lo: ../include/net-snmp/library/container_binary_array.h
+./object_monitor.lo: ../include/net-snmp/library/container_list_ssll.h
+./object_monitor.lo: ../include/net-snmp/library/container_iterator.h
+./object_monitor.lo: ../include/net-snmp/library/container.h
+./object_monitor.lo: ../include/net-snmp/library/snmp_assert.h
+./object_monitor.lo: ../include/net-snmp/version.h
 ./object_monitor.lo: ../include/net-snmp/config_api.h
 ./object_monitor.lo: ../include/net-snmp/library/read_config.h
 ./object_monitor.lo: ../include/net-snmp/library/default_store.h
@@ -992,32 +1174,14 @@
 ./snmp_agent.lo: ../include/net-snmp/net-snmp-includes.h
 ./snmp_agent.lo: ../include/net-snmp/definitions.h
 ./snmp_agent.lo: ../include/net-snmp/types.h
+./snmp_agent.lo: ../include/net-snmp/library/types.h
 ./snmp_agent.lo: ../include/net-snmp/library/snmp_api.h
-./snmp_agent.lo: ../include/net-snmp/library/asn1.h
-./snmp_agent.lo: ../include/net-snmp/library/snmp_impl.h
-./snmp_agent.lo: ../include/net-snmp/library/snmp.h
-./snmp_agent.lo: ../include/net-snmp/library/snmp-tc.h
-./snmp_agent.lo: ../include/net-snmp/utilities.h
+./snmp_agent.lo: ../include/net-snmp/varbind_api.h
 ./snmp_agent.lo: ../include/net-snmp/library/snmp_client.h
-./snmp_agent.lo: ../include/net-snmp/library/system.h
-./snmp_agent.lo: ../include/net-snmp/library/tools.h
-./snmp_agent.lo: ../include/net-snmp/library/int64.h
-./snmp_agent.lo: ../include/net-snmp/library/mt_support.h
-./snmp_agent.lo: ../include/net-snmp/library/snmp_alarm.h
-./snmp_agent.lo: ../include/net-snmp/library/callback.h
-./snmp_agent.lo: ../include/net-snmp/library/data_list.h
-./snmp_agent.lo: ../include/net-snmp/library/oid_stash.h
-./snmp_agent.lo: ../include/net-snmp/library/check_varbind.h
-./snmp_agent.lo: ../include/net-snmp/library/container.h
-./snmp_agent.lo: ../include/net-snmp/library/factory.h
-./snmp_agent.lo: ../include/net-snmp/library/snmp_logging.h
-./snmp_agent.lo: ../include/net-snmp/library/container_binary_array.h
-./snmp_agent.lo: ../include/net-snmp/library/container_list_ssll.h
-./snmp_agent.lo: ../include/net-snmp/library/container_iterator.h
-./snmp_agent.lo: ../include/net-snmp/library/container.h
-./snmp_agent.lo: ../include/net-snmp/library/snmp_assert.h
-./snmp_agent.lo: ../include/net-snmp/version.h
+./snmp_agent.lo: ../include/net-snmp/pdu_api.h
+./snmp_agent.lo: ../include/net-snmp/library/asn1.h
 ./snmp_agent.lo: ../include/net-snmp/session_api.h
+./snmp_agent.lo: ../include/net-snmp/library/callback.h
 ./snmp_agent.lo: ../include/net-snmp/library/snmp_transport.h
 ./snmp_agent.lo: ../include/net-snmp/library/snmp_service.h
 ./snmp_agent.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -1028,10 +1192,31 @@
 ./snmp_agent.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./snmp_agent.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./snmp_agent.lo: ../include/net-snmp/library/ucd_compat.h
-./snmp_agent.lo: ../include/net-snmp/pdu_api.h ../include/net-snmp/mib_api.h
 ./snmp_agent.lo: ../include/net-snmp/library/mib.h
+./snmp_agent.lo: ../include/net-snmp/mib_api.h
 ./snmp_agent.lo: ../include/net-snmp/library/parse.h
-./snmp_agent.lo: ../include/net-snmp/varbind_api.h
+./snmp_agent.lo: ../include/net-snmp/library/oid_stash.h
+./snmp_agent.lo: ../include/net-snmp/library/snmp_impl.h
+./snmp_agent.lo: ../include/net-snmp/library/snmp.h
+./snmp_agent.lo: ../include/net-snmp/library/snmp-tc.h
+./snmp_agent.lo: ../include/net-snmp/library/getopt.h
+./snmp_agent.lo: ../include/net-snmp/utilities.h
+./snmp_agent.lo: ../include/net-snmp/library/system.h
+./snmp_agent.lo: ../include/net-snmp/library/tools.h
+./snmp_agent.lo: ../include/net-snmp/library/int64.h
+./snmp_agent.lo: ../include/net-snmp/library/mt_support.h
+./snmp_agent.lo: ../include/net-snmp/library/snmp_alarm.h
+./snmp_agent.lo: ../include/net-snmp/library/data_list.h
+./snmp_agent.lo: ../include/net-snmp/library/check_varbind.h
+./snmp_agent.lo: ../include/net-snmp/library/container.h
+./snmp_agent.lo: ../include/net-snmp/library/factory.h
+./snmp_agent.lo: ../include/net-snmp/library/snmp_logging.h
+./snmp_agent.lo: ../include/net-snmp/library/container_binary_array.h
+./snmp_agent.lo: ../include/net-snmp/library/container_list_ssll.h
+./snmp_agent.lo: ../include/net-snmp/library/container_iterator.h
+./snmp_agent.lo: ../include/net-snmp/library/container.h
+./snmp_agent.lo: ../include/net-snmp/library/snmp_assert.h
+./snmp_agent.lo: ../include/net-snmp/version.h
 ./snmp_agent.lo: ../include/net-snmp/config_api.h
 ./snmp_agent.lo: ../include/net-snmp/library/read_config.h
 ./snmp_agent.lo: ../include/net-snmp/library/default_store.h
@@ -1084,45 +1269,271 @@
 ./snmp_agent.lo: ../include/net-snmp/agent/table_iterator.h
 ./snmp_agent.lo: ../include/net-snmp/agent/table_container.h
 ./snmp_agent.lo: ../include/net-snmp/agent/table_array.h
-./snmp_agent.lo: ../include/net-snmp/agent/mfd.h snmpd.h mibgroup/struct.h
-./snmp_agent.lo: mibgroup/util_funcs.h mibgroup/struct.h
+./snmp_agent.lo: ../include/net-snmp/agent/mfd.h snmpd.h
 ./snmp_agent.lo: ../include/net-snmp/agent/mib_modules.h
 ./snmp_agent.lo: ../agent/mibgroup/agentx/protocol.h
 ./snmp_agent.lo: ../agent/mibgroup/agentx/master.h
 ./snmp_agent.lo: ../agent/mibgroup/smux/smux.h
+./snmpd.lo: ../include/net-snmp/net-snmp-config.h
+./snmpd.lo: ../include/net-snmp/system/linux.h
+./snmpd.lo: ../include/net-snmp/system/sysv.h
+./snmpd.lo: ../include/net-snmp/system/generic.h
+./snmpd.lo: ../include/net-snmp/machine/generic.h
+./snmpd.lo: ../include/net-snmp/net-snmp-includes.h
+./snmpd.lo: ../include/net-snmp/definitions.h ../include/net-snmp/types.h
+./snmpd.lo: ../include/net-snmp/library/types.h
+./snmpd.lo: ../include/net-snmp/library/snmp_api.h
+./snmpd.lo: ../include/net-snmp/varbind_api.h
+./snmpd.lo: ../include/net-snmp/library/snmp_client.h
+./snmpd.lo: ../include/net-snmp/pdu_api.h ../include/net-snmp/library/asn1.h
+./snmpd.lo: ../include/net-snmp/session_api.h
+./snmpd.lo: ../include/net-snmp/library/callback.h
+./snmpd.lo: ../include/net-snmp/library/snmp_transport.h
+./snmpd.lo: ../include/net-snmp/library/snmp_service.h
+./snmpd.lo: ../include/net-snmp/library/snmpCallbackDomain.h
+./snmpd.lo: ../include/net-snmp/library/snmpUnixDomain.h
+./snmpd.lo: ../include/net-snmp/library/snmpUDPDomain.h
+./snmpd.lo: ../include/net-snmp/library/snmpTCPDomain.h
+./snmpd.lo: ../include/net-snmp/library/snmpUDPIPv6Domain.h
+./snmpd.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
+./snmpd.lo: ../include/net-snmp/library/snmpIPXDomain.h
+./snmpd.lo: ../include/net-snmp/library/ucd_compat.h
+./snmpd.lo: ../include/net-snmp/library/mib.h ../include/net-snmp/mib_api.h
+./snmpd.lo: ../include/net-snmp/library/parse.h
+./snmpd.lo: ../include/net-snmp/library/oid_stash.h
+./snmpd.lo: ../include/net-snmp/library/snmp_impl.h
+./snmpd.lo: ../include/net-snmp/library/snmp.h
+./snmpd.lo: ../include/net-snmp/library/snmp-tc.h
+./snmpd.lo: ../include/net-snmp/library/getopt.h
+./snmpd.lo: ../include/net-snmp/utilities.h
+./snmpd.lo: ../include/net-snmp/library/system.h
+./snmpd.lo: ../include/net-snmp/library/tools.h
+./snmpd.lo: ../include/net-snmp/library/int64.h
+./snmpd.lo: ../include/net-snmp/library/mt_support.h
+./snmpd.lo: ../include/net-snmp/library/snmp_alarm.h
+./snmpd.lo: ../include/net-snmp/library/data_list.h
+./snmpd.lo: ../include/net-snmp/library/check_varbind.h
+./snmpd.lo: ../include/net-snmp/library/container.h
+./snmpd.lo: ../include/net-snmp/library/factory.h
+./snmpd.lo: ../include/net-snmp/library/snmp_logging.h
+./snmpd.lo: ../include/net-snmp/library/container_binary_array.h
+./snmpd.lo: ../include/net-snmp/library/container_list_ssll.h
+./snmpd.lo: ../include/net-snmp/library/container_iterator.h
+./snmpd.lo: ../include/net-snmp/library/container.h
+./snmpd.lo: ../include/net-snmp/library/snmp_assert.h
+./snmpd.lo: ../include/net-snmp/version.h ../include/net-snmp/config_api.h
+./snmpd.lo: ../include/net-snmp/library/read_config.h
+./snmpd.lo: ../include/net-snmp/library/default_store.h
+./snmpd.lo: ../include/net-snmp/library/snmp_parse_args.h
+./snmpd.lo: ../include/net-snmp/library/snmp_enum.h
+./snmpd.lo: ../include/net-snmp/library/vacm.h
+./snmpd.lo: ../include/net-snmp/output_api.h
+./snmpd.lo: ../include/net-snmp/library/snmp_debug.h
+./snmpd.lo: ../include/net-snmp/snmpv3_api.h
+./snmpd.lo: ../include/net-snmp/library/snmpv3.h
+./snmpd.lo: ../include/net-snmp/library/transform_oids.h
+./snmpd.lo: ../include/net-snmp/library/keytools.h
+./snmpd.lo: ../include/net-snmp/library/scapi.h
+./snmpd.lo: ../include/net-snmp/library/lcd_time.h
+./snmpd.lo: ../include/net-snmp/library/snmp_secmod.h
+./snmpd.lo: ../include/net-snmp/library/snmpv3-security-includes.h
+./snmpd.lo: ../include/net-snmp/library/snmpusm.h
+./snmpd.lo: ../include/net-snmp/agent/net-snmp-agent-includes.h
+./snmpd.lo: ../include/net-snmp/agent/mib_module_config.h
+./snmpd.lo: ../include/net-snmp/agent/agent_module_config.h
+./snmpd.lo: ../include/net-snmp/agent/snmp_agent.h
+./snmpd.lo: ../include/net-snmp/agent/snmp_vars.h
+./snmpd.lo: ../include/net-snmp/agent/agent_handler.h
+./snmpd.lo: ../include/net-snmp/agent/var_struct.h
+./snmpd.lo: ../include/net-snmp/agent/agent_registry.h
+./snmpd.lo: ../include/net-snmp/library/fd_event_manager.h
+./snmpd.lo: ../include/net-snmp/agent/ds_agent.h
+./snmpd.lo: ../include/net-snmp/agent/agent_read_config.h
+./snmpd.lo: ../include/net-snmp/agent/agent_trap.h
+./snmpd.lo: ../include/net-snmp/agent/all_helpers.h
+./snmpd.lo: ../include/net-snmp/agent/instance.h
+./snmpd.lo: ../include/net-snmp/agent/baby_steps.h
+./snmpd.lo: ../include/net-snmp/agent/scalar.h
+./snmpd.lo: ../include/net-snmp/agent/scalar_group.h
+./snmpd.lo: ../include/net-snmp/agent/watcher.h
+./snmpd.lo: ../include/net-snmp/agent/multiplexer.h
+./snmpd.lo: ../include/net-snmp/agent/null.h
+./snmpd.lo: ../include/net-snmp/agent/debug_handler.h
+./snmpd.lo: ../include/net-snmp/agent/cache_handler.h
+./snmpd.lo: ../include/net-snmp/agent/old_api.h
+./snmpd.lo: ../include/net-snmp/agent/read_only.h
+./snmpd.lo: ../include/net-snmp/agent/row_merge.h
+./snmpd.lo: ../include/net-snmp/agent/serialize.h
+./snmpd.lo: ../include/net-snmp/agent/bulk_to_next.h
+./snmpd.lo: ../include/net-snmp/agent/mode_end_call.h
+./snmpd.lo: ../include/net-snmp/agent/table.h
+./snmpd.lo: ../include/net-snmp/agent/table_data.h
+./snmpd.lo: ../include/net-snmp/agent/table_dataset.h
+./snmpd.lo: ../include/net-snmp/agent/table_tdata.h
+./snmpd.lo: ../include/net-snmp/agent/table_iterator.h
+./snmpd.lo: ../include/net-snmp/agent/table_container.h
+./snmpd.lo: ../include/net-snmp/agent/table_array.h
+./snmpd.lo: ../include/net-snmp/agent/mfd.h
+./snmpd.lo: ../include/net-snmp/library/large_fd_set.h
+./snmpd.lo: ../include/net-snmp/net-snmp-config.h m2m.h snmpd.h
+./snmpd.lo: mibgroup/struct.h ../include/net-snmp/agent/mib_modules.h
+./snmpd.lo: mibgroup/util_funcs.h mibgroup/util_funcs/header_generic.h
+./snmpd.lo: mibgroup/util_funcs/header_simple_table.h mibgroup/struct.h
+./snmpd.lo: mibgroup/util_funcs/MIB_STATS_CACHE_TIMEOUT.h
+./snmpd.lo: ../agent/mibgroup/mib_module_includes.h
+./snmpd.lo: mibgroup/examples/example.h mibgroup/testhandler.h
+./snmpd.lo: mibgroup/host/hr_storage.h mibgroup/host/hr_filesys.h
+./snmpd.lo: mibgroup/host/hr_swinst.h mibgroup/host/hr_swrun.h
+./snmpd.lo: mibgroup/host/hr_system.h mibgroup/host/hr_device.h
+./snmpd.lo: mibgroup/host/hr_other.h mibgroup/host/hr_proc.h
+./snmpd.lo: mibgroup/host/hr_network.h mibgroup/host/hr_print.h
+./snmpd.lo: mibgroup/host/hr_disk.h mibgroup/host/hr_partition.h
+./snmpd.lo: mibgroup/examples/scalar_int.h mibgroup/examples/watched.h
+./snmpd.lo: mibgroup/examples/data_set.h mibgroup/examples/delayed_instance.h
+./snmpd.lo: mibgroup/Rmon/rows.h mibgroup/Rmon/agutil.h
+./snmpd.lo: mibgroup/Rmon/statistics.h mibgroup/Rmon/alarmTable.h
+./snmpd.lo: mibgroup/Rmon/history.h mibgroup/Rmon/event.h
+./snmpd.lo: mibgroup/disman/event/mteScalars.h
+./snmpd.lo: mibgroup/disman/event/mteTrigger.h
+./snmpd.lo: mibgroup/disman/event/mteTriggerTable.h
+./snmpd.lo: mibgroup/disman/event/mteTriggerDeltaTable.h
+./snmpd.lo: mibgroup/disman/event/mteTriggerExistenceTable.h
+./snmpd.lo: mibgroup/disman/event/mteTriggerBooleanTable.h
+./snmpd.lo: mibgroup/disman/event/mteTriggerThresholdTable.h
+./snmpd.lo: mibgroup/disman/event/mteTriggerConf.h
+./snmpd.lo: mibgroup/disman/event/mteEvent.h
+./snmpd.lo: ../agent/mibgroup/disman/event/mteTrigger.h
+./snmpd.lo: mibgroup/disman/event/mteEventTable.h
+./snmpd.lo: mibgroup/disman/event/mteEventSetTable.h
+./snmpd.lo: mibgroup/disman/event/mteEventNotificationTable.h
+./snmpd.lo: mibgroup/disman/event/mteEventConf.h
+./snmpd.lo: mibgroup/disman/event/mteObjects.h
+./snmpd.lo: mibgroup/disman/event/mteObjectsTable.h
+./snmpd.lo: mibgroup/disman/event/mteObjectsConf.h
+./snmpd.lo: mibgroup/snmpv3/snmpMPDStats_5_5.h mibgroup/snmpv3/usmStats_5_5.h
+./snmpd.lo: mibgroup/snmpv3/snmpEngine.h mibgroup/snmpv3/usmUser.h
+./snmpd.lo: mibgroup/mibII/snmp_mib_5_5.h mibgroup/mibII/system_mib.h
+./snmpd.lo: mibgroup/mibII/sysORTable.h mibgroup/mibII/at.h
+./snmpd.lo: mibgroup/mibII/ip.h mibgroup/mibII/var_route.h
+./snmpd.lo: mibgroup/mibII/route_write.h mibgroup/mibII/at.h
+./snmpd.lo: mibgroup/mibII/tcp.h mibgroup/mibII/icmp.h mibgroup/mibII/udp.h
+./snmpd.lo: mibgroup/mibII/vacm_vars.h mibgroup/mibII/setSerialNo.h
+./snmpd.lo: mibgroup/mibII/ipv6.h mibgroup/ucd-snmp/proc.h
+./snmpd.lo: ../agent/mibgroup/mibdefs.h mibgroup/ucd-snmp/versioninfo.h
+./snmpd.lo: mibgroup/ucd-snmp/pass.h mibgroup/ucd-snmp/pass_persist.h
+./snmpd.lo: mibgroup/ucd-snmp/disk.h mibgroup/ucd-snmp/loadave.h
+./snmpd.lo: mibgroup/agent/extend.h mibgroup/ucd-snmp/errormib.h
+./snmpd.lo: mibgroup/ucd-snmp/file.h mibgroup/ucd-snmp/dlmod.h
+./snmpd.lo: mibgroup/ucd-snmp/proxy.h mibgroup/ucd-snmp/logmatch.h
+./snmpd.lo: mibgroup/ucd-snmp/memory.h mibgroup/ucd-snmp/vmstat.h
+./snmpd.lo: mibgroup/notification/snmpNotifyTable.h
+./snmpd.lo: mibgroup/notification/snmpNotifyFilterProfileTable.h
+./snmpd.lo: mibgroup/notification-log-mib/notification_log.h
+./snmpd.lo: mibgroup/target/target_counters_5_5.h
+./snmpd.lo: mibgroup/target/snmpTargetAddrEntry.h
+./snmpd.lo: mibgroup/target/snmpTargetParamsEntry.h
+./snmpd.lo: mibgroup/agent/nsTransactionTable.h
+./snmpd.lo: mibgroup/agent/nsModuleTable.h mibgroup/agent/nsDebug.h
+./snmpd.lo: mibgroup/agent/nsCache.h mibgroup/agent/nsLogging.h
+./snmpd.lo: mibgroup/agent/nsVacmAccessTable.h
+./snmpd.lo: mibgroup/disman/schedule/schedCore.h
+./snmpd.lo: mibgroup/disman/schedule/schedConf.h
+./snmpd.lo: mibgroup/disman/schedule/schedTable.h
+./snmpd.lo: mibgroup/utilities/override.h mibgroup/hardware/memory/hw_mem.h
+./snmpd.lo: mibgroup/hardware/cpu/cpu.h mibgroup/hardware/cpu/cpu_linux.h
+./snmpd.lo: mibgroup/mibII/var_route.h mibgroup/mibII/tcpTable.h
+./snmpd.lo: mibgroup/mibII/udpTable.h mibgroup/mibII/vacm_context.h
+./snmpd.lo: mibgroup/ip-mib/ip_scalars.h
+./snmpd.lo: mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable.h
+./snmpd.lo: mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable_constants.h
+./snmpd.lo: mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable_interface.h
+./snmpd.lo: mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable.h
+./snmpd.lo: mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable_data_access.h
+./snmpd.lo: mibgroup/if-mib/ifTable/ifTable.h
+./snmpd.lo: ../include/net-snmp/data_access/interface.h
+./snmpd.lo: mibgroup/if-mib/ifTable/ifTable_constants.h
+./snmpd.lo: mibgroup/if-mib/ifTable/ifTable_interface.h
+./snmpd.lo: mibgroup/if-mib/ifTable/ifTable.h
+./snmpd.lo: mibgroup/if-mib/ifTable/ifTable_data_access.h
+./snmpd.lo: mibgroup/if-mib/ifXTable/ifXTable.h
+./snmpd.lo: ../agent/mibgroup/if-mib/ifTable/ifTable.h
+./snmpd.lo: mibgroup/if-mib/ifXTable/ifXTable_constants.h
+./snmpd.lo: mibgroup/if-mib/ifXTable/ifXTable_interface.h
+./snmpd.lo: mibgroup/if-mib/ifXTable/ifXTable.h
+./snmpd.lo: mibgroup/if-mib/ifXTable/ifXTable_data_access.h
+./snmpd.lo: mibgroup/ip-mib/ipAddressTable/ipAddressTable.h
+./snmpd.lo: ../include/net-snmp/data_access/ipaddress.h
+./snmpd.lo: mibgroup/ip-mib/ipAddressTable/ipAddressTable_constants.h
+./snmpd.lo: mibgroup/ip-mib/ipAddressTable/ipAddressTable_interface.h
+./snmpd.lo: mibgroup/ip-mib/ipAddressTable/ipAddressTable.h
+./snmpd.lo: mibgroup/ip-mib/ipAddressTable/ipAddressTable_data_access.h
+./snmpd.lo: mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable.h
+./snmpd.lo: ../include/net-snmp/data_access/arp.h
+./snmpd.lo: mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable_constants.h
+./snmpd.lo: mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable_interface.h
+./snmpd.lo: mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable.h
+./snmpd.lo: mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable_data_access.h
+./snmpd.lo: mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h
+./snmpd.lo: ../include/net-snmp/data_access/ipstats.h
+./snmpd.lo: ../include/net-snmp/data_access/systemstats.h
+./snmpd.lo: mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_constants.h
+./snmpd.lo: mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.h
+./snmpd.lo: mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h
+./snmpd.lo: mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access.h
+./snmpd.lo: mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable.h
+./snmpd.lo: ../include/net-snmp/data_access/scopezone.h
+./snmpd.lo: mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable_oids.h
+./snmpd.lo: mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable_enums.h
+./snmpd.lo: mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable_interface.h
+./snmpd.lo: mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable.h
+./snmpd.lo: mibgroup/ip-mib/ipv6ScopeZoneIndexTable/ipv6ScopeZoneIndexTable_data_access.h
+./snmpd.lo: mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable.h
+./snmpd.lo: mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_oids.h
+./snmpd.lo: mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_enums.h
+./snmpd.lo: mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.h
+./snmpd.lo: mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable.h
+./snmpd.lo: mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_access.h
+./snmpd.lo: mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h
+./snmpd.lo: mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable.h
+./snmpd.lo: ../include/net-snmp/data_access/route.h
+./snmpd.lo: ../agent/mibgroup/mibII/route_headers.h
+./snmpd.lo: mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable_constants.h
+./snmpd.lo: mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable_interface.h
+./snmpd.lo: mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable.h
+./snmpd.lo: mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable_data_access.h
+./snmpd.lo: mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable.h
+./snmpd.lo: mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable_constants.h
+./snmpd.lo: mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable_interface.h
+./snmpd.lo: mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable.h
+./snmpd.lo: mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable_data_access.h
+./snmpd.lo: mibgroup/tcp-mib/tcpConnectionTable/tcpConnectionTable.h
+./snmpd.lo: ../include/net-snmp/data_access/tcpConn.h
+./snmpd.lo: mibgroup/tcp-mib/tcpConnectionTable/tcpConnectionTable_constants.h
+./snmpd.lo: mibgroup/tcp-mib/tcpConnectionTable/tcpConnectionTable_interface.h
+./snmpd.lo: mibgroup/tcp-mib/tcpConnectionTable/tcpConnectionTable.h
+./snmpd.lo: mibgroup/tcp-mib/tcpConnectionTable/tcpConnectionTable_data_access.h
+./snmpd.lo: mibgroup/tcp-mib/tcpListenerTable/tcpListenerTable.h
+./snmpd.lo: mibgroup/tcp-mib/tcpListenerTable/tcpListenerTable_constants.h
+./snmpd.lo: mibgroup/tcp-mib/tcpListenerTable/tcpListenerTable_interface.h
+./snmpd.lo: mibgroup/tcp-mib/tcpListenerTable/tcpListenerTable.h
+./snmpd.lo: mibgroup/tcp-mib/tcpListenerTable/tcpListenerTable_data_access.h
+./snmpd.lo: mibgroup/udp-mib/udpEndpointTable/udpEndpointTable.h
+./snmpd.lo: mibgroup/udp-mib/udpEndpointTable/udpEndpointTable_constants.h
+./snmpd.lo: mibgroup/udp-mib/udpEndpointTable/udpEndpointTable_interface.h
+./snmpd.lo: mibgroup/udp-mib/udpEndpointTable/udpEndpointTable.h
+./snmpd.lo: mibgroup/udp-mib/udpEndpointTable/udpEndpointTable_data_access.h
+./snmpd.lo: mibgroup/if-mib/data_access/interface.h mibgroup/smux/smux.h
 ./snmp_perl.lo: ../include/net-snmp/net-snmp-config.h
-./snmp_perl.lo: ../include/net-snmp/system/linux.h
-./snmp_perl.lo: ../include/net-snmp/system/sysv.h
-./snmp_perl.lo: ../include/net-snmp/system/generic.h
-./snmp_perl.lo: ../include/net-snmp/machine/generic.h
 ./snmp_perl.lo: ../include/net-snmp/net-snmp-includes.h
 ./snmp_perl.lo: ../include/net-snmp/definitions.h ../include/net-snmp/types.h
+./snmp_perl.lo: ../include/net-snmp/library/types.h
 ./snmp_perl.lo: ../include/net-snmp/library/snmp_api.h
-./snmp_perl.lo: ../include/net-snmp/library/asn1.h
-./snmp_perl.lo: ../include/net-snmp/library/snmp_impl.h
-./snmp_perl.lo: ../include/net-snmp/library/snmp.h
-./snmp_perl.lo: ../include/net-snmp/library/snmp-tc.h
-./snmp_perl.lo: ../include/net-snmp/utilities.h
+./snmp_perl.lo: ../include/net-snmp/varbind_api.h
 ./snmp_perl.lo: ../include/net-snmp/library/snmp_client.h
-./snmp_perl.lo: ../include/net-snmp/library/system.h
-./snmp_perl.lo: ../include/net-snmp/library/tools.h
-./snmp_perl.lo: ../include/net-snmp/library/int64.h
-./snmp_perl.lo: ../include/net-snmp/library/mt_support.h
-./snmp_perl.lo: ../include/net-snmp/library/snmp_alarm.h
-./snmp_perl.lo: ../include/net-snmp/library/callback.h
-./snmp_perl.lo: ../include/net-snmp/library/data_list.h
-./snmp_perl.lo: ../include/net-snmp/library/oid_stash.h
-./snmp_perl.lo: ../include/net-snmp/library/check_varbind.h
-./snmp_perl.lo: ../include/net-snmp/library/container.h
-./snmp_perl.lo: ../include/net-snmp/library/factory.h
-./snmp_perl.lo: ../include/net-snmp/library/snmp_logging.h
-./snmp_perl.lo: ../include/net-snmp/library/container_binary_array.h
-./snmp_perl.lo: ../include/net-snmp/library/container_list_ssll.h
-./snmp_perl.lo: ../include/net-snmp/library/container_iterator.h
-./snmp_perl.lo: ../include/net-snmp/library/container.h
-./snmp_perl.lo: ../include/net-snmp/library/snmp_assert.h
-./snmp_perl.lo: ../include/net-snmp/version.h
+./snmp_perl.lo: ../include/net-snmp/pdu_api.h
+./snmp_perl.lo: ../include/net-snmp/library/asn1.h
 ./snmp_perl.lo: ../include/net-snmp/session_api.h
+./snmp_perl.lo: ../include/net-snmp/library/callback.h
 ./snmp_perl.lo: ../include/net-snmp/library/snmp_transport.h
 ./snmp_perl.lo: ../include/net-snmp/library/snmp_service.h
 ./snmp_perl.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -1133,10 +1544,31 @@
 ./snmp_perl.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./snmp_perl.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./snmp_perl.lo: ../include/net-snmp/library/ucd_compat.h
-./snmp_perl.lo: ../include/net-snmp/pdu_api.h ../include/net-snmp/mib_api.h
 ./snmp_perl.lo: ../include/net-snmp/library/mib.h
+./snmp_perl.lo: ../include/net-snmp/mib_api.h
 ./snmp_perl.lo: ../include/net-snmp/library/parse.h
-./snmp_perl.lo: ../include/net-snmp/varbind_api.h
+./snmp_perl.lo: ../include/net-snmp/library/oid_stash.h
+./snmp_perl.lo: ../include/net-snmp/library/snmp_impl.h
+./snmp_perl.lo: ../include/net-snmp/library/snmp.h
+./snmp_perl.lo: ../include/net-snmp/library/snmp-tc.h
+./snmp_perl.lo: ../include/net-snmp/library/getopt.h
+./snmp_perl.lo: ../include/net-snmp/utilities.h
+./snmp_perl.lo: ../include/net-snmp/library/system.h
+./snmp_perl.lo: ../include/net-snmp/library/tools.h
+./snmp_perl.lo: ../include/net-snmp/library/int64.h
+./snmp_perl.lo: ../include/net-snmp/library/mt_support.h
+./snmp_perl.lo: ../include/net-snmp/library/snmp_alarm.h
+./snmp_perl.lo: ../include/net-snmp/library/data_list.h
+./snmp_perl.lo: ../include/net-snmp/library/check_varbind.h
+./snmp_perl.lo: ../include/net-snmp/library/container.h
+./snmp_perl.lo: ../include/net-snmp/library/factory.h
+./snmp_perl.lo: ../include/net-snmp/library/snmp_logging.h
+./snmp_perl.lo: ../include/net-snmp/library/container_binary_array.h
+./snmp_perl.lo: ../include/net-snmp/library/container_list_ssll.h
+./snmp_perl.lo: ../include/net-snmp/library/container_iterator.h
+./snmp_perl.lo: ../include/net-snmp/library/container.h
+./snmp_perl.lo: ../include/net-snmp/library/snmp_assert.h
+./snmp_perl.lo: ../include/net-snmp/version.h
 ./snmp_perl.lo: ../include/net-snmp/config_api.h
 ./snmp_perl.lo: ../include/net-snmp/library/read_config.h
 ./snmp_perl.lo: ../include/net-snmp/library/default_store.h
@@ -1191,39 +1623,17 @@
 ./snmp_perl.lo: ../include/net-snmp/agent/table_array.h
 ./snmp_perl.lo: ../include/net-snmp/agent/mfd.h snmp_perl.h
 ./snmp_vars.lo: ../include/net-snmp/net-snmp-config.h
-./snmp_vars.lo: ../include/net-snmp/system/linux.h
-./snmp_vars.lo: ../include/net-snmp/system/sysv.h
-./snmp_vars.lo: ../include/net-snmp/system/generic.h
-./snmp_vars.lo: ../include/net-snmp/machine/generic.h
 ./snmp_vars.lo: ../include/net-snmp/net-snmp-includes.h
 ./snmp_vars.lo: ../include/net-snmp/definitions.h
 ./snmp_vars.lo: ../include/net-snmp/types.h
+./snmp_vars.lo: ../include/net-snmp/library/types.h
 ./snmp_vars.lo: ../include/net-snmp/library/snmp_api.h
-./snmp_vars.lo: ../include/net-snmp/library/asn1.h
-./snmp_vars.lo: ../include/net-snmp/library/snmp_impl.h
-./snmp_vars.lo: ../include/net-snmp/library/snmp.h
-./snmp_vars.lo: ../include/net-snmp/library/snmp-tc.h
-./snmp_vars.lo: ../include/net-snmp/utilities.h
+./snmp_vars.lo: ../include/net-snmp/varbind_api.h
 ./snmp_vars.lo: ../include/net-snmp/library/snmp_client.h
-./snmp_vars.lo: ../include/net-snmp/library/system.h
-./snmp_vars.lo: ../include/net-snmp/library/tools.h
-./snmp_vars.lo: ../include/net-snmp/library/int64.h
-./snmp_vars.lo: ../include/net-snmp/library/mt_support.h
-./snmp_vars.lo: ../include/net-snmp/library/snmp_alarm.h
-./snmp_vars.lo: ../include/net-snmp/library/callback.h
-./snmp_vars.lo: ../include/net-snmp/library/data_list.h
-./snmp_vars.lo: ../include/net-snmp/library/oid_stash.h
-./snmp_vars.lo: ../include/net-snmp/library/check_varbind.h
-./snmp_vars.lo: ../include/net-snmp/library/container.h
-./snmp_vars.lo: ../include/net-snmp/library/factory.h
-./snmp_vars.lo: ../include/net-snmp/library/snmp_logging.h
-./snmp_vars.lo: ../include/net-snmp/library/container_binary_array.h
-./snmp_vars.lo: ../include/net-snmp/library/container_list_ssll.h
-./snmp_vars.lo: ../include/net-snmp/library/container_iterator.h
-./snmp_vars.lo: ../include/net-snmp/library/container.h
-./snmp_vars.lo: ../include/net-snmp/library/snmp_assert.h
-./snmp_vars.lo: ../include/net-snmp/version.h
+./snmp_vars.lo: ../include/net-snmp/pdu_api.h
+./snmp_vars.lo: ../include/net-snmp/library/asn1.h
 ./snmp_vars.lo: ../include/net-snmp/session_api.h
+./snmp_vars.lo: ../include/net-snmp/library/callback.h
 ./snmp_vars.lo: ../include/net-snmp/library/snmp_transport.h
 ./snmp_vars.lo: ../include/net-snmp/library/snmp_service.h
 ./snmp_vars.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -1234,10 +1644,31 @@
 ./snmp_vars.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./snmp_vars.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./snmp_vars.lo: ../include/net-snmp/library/ucd_compat.h
-./snmp_vars.lo: ../include/net-snmp/pdu_api.h ../include/net-snmp/mib_api.h
 ./snmp_vars.lo: ../include/net-snmp/library/mib.h
+./snmp_vars.lo: ../include/net-snmp/mib_api.h
 ./snmp_vars.lo: ../include/net-snmp/library/parse.h
-./snmp_vars.lo: ../include/net-snmp/varbind_api.h
+./snmp_vars.lo: ../include/net-snmp/library/oid_stash.h
+./snmp_vars.lo: ../include/net-snmp/library/snmp_impl.h
+./snmp_vars.lo: ../include/net-snmp/library/snmp.h
+./snmp_vars.lo: ../include/net-snmp/library/snmp-tc.h
+./snmp_vars.lo: ../include/net-snmp/library/getopt.h
+./snmp_vars.lo: ../include/net-snmp/utilities.h
+./snmp_vars.lo: ../include/net-snmp/library/system.h
+./snmp_vars.lo: ../include/net-snmp/library/tools.h
+./snmp_vars.lo: ../include/net-snmp/library/int64.h
+./snmp_vars.lo: ../include/net-snmp/library/mt_support.h
+./snmp_vars.lo: ../include/net-snmp/library/snmp_alarm.h
+./snmp_vars.lo: ../include/net-snmp/library/data_list.h
+./snmp_vars.lo: ../include/net-snmp/library/check_varbind.h
+./snmp_vars.lo: ../include/net-snmp/library/container.h
+./snmp_vars.lo: ../include/net-snmp/library/factory.h
+./snmp_vars.lo: ../include/net-snmp/library/snmp_logging.h
+./snmp_vars.lo: ../include/net-snmp/library/container_binary_array.h
+./snmp_vars.lo: ../include/net-snmp/library/container_list_ssll.h
+./snmp_vars.lo: ../include/net-snmp/library/container_iterator.h
+./snmp_vars.lo: ../include/net-snmp/library/container.h
+./snmp_vars.lo: ../include/net-snmp/library/snmp_assert.h
+./snmp_vars.lo: ../include/net-snmp/version.h
 ./snmp_vars.lo: ../include/net-snmp/config_api.h
 ./snmp_vars.lo: ../include/net-snmp/library/read_config.h
 ./snmp_vars.lo: ../include/net-snmp/library/default_store.h
@@ -1291,277 +1722,27 @@
 ./snmp_vars.lo: ../include/net-snmp/agent/table_container.h
 ./snmp_vars.lo: ../include/net-snmp/agent/table_array.h
 ./snmp_vars.lo: ../include/net-snmp/agent/mfd.h
-./snmp_vars.lo: ../include/net-snmp/agent/mib_modules.h kernel.h
+./snmp_vars.lo: ../include/net-snmp/agent/mib_modules.h
+./snmp_vars.lo: ../include/net-snmp/agent/agent_sysORTable.h kernel.h
 ./snmp_vars.lo: mibgroup/struct.h snmpd.h
 ./snmp_vars.lo: ../agent/mibgroup/agentx/agentx_config.h
 ./snmp_vars.lo: ../agent/mibgroup/agentx/subagent.h
 ./snmp_vars.lo: ../agent/mibgroup/agent_module_includes.h
-./snmp_vars.lo: mibgroup/smux/smux.h mibgroup/snmpv3/usmConf.h
-./snmp_vars.lo: mibgroup/utilities/iquery.h mibgroup/mibII/vacm_conf.h
+./snmp_vars.lo: mibgroup/smux/smux.h mibgroup/utilities/iquery.h
+./snmp_vars.lo: mibgroup/snmpv3/usmConf.h mibgroup/mibII/vacm_conf.h
 ./snmp_vars.lo: snmp_perl.h ../agent/mibgroup/agent_module_inits.h
-./snmpd.lo: ../include/net-snmp/net-snmp-config.h
-./snmpd.lo: ../include/net-snmp/system/linux.h
-./snmpd.lo: ../include/net-snmp/system/sysv.h
-./snmpd.lo: ../include/net-snmp/system/generic.h
-./snmpd.lo: ../include/net-snmp/machine/generic.h
-./snmpd.lo: ../include/net-snmp/net-snmp-includes.h
-./snmpd.lo: ../include/net-snmp/definitions.h ../include/net-snmp/types.h
-./snmpd.lo: ../include/net-snmp/library/snmp_api.h
-./snmpd.lo: ../include/net-snmp/library/asn1.h
-./snmpd.lo: ../include/net-snmp/library/snmp_impl.h
-./snmpd.lo: ../include/net-snmp/library/snmp.h
-./snmpd.lo: ../include/net-snmp/library/snmp-tc.h
-./snmpd.lo: ../include/net-snmp/utilities.h
-./snmpd.lo: ../include/net-snmp/library/snmp_client.h
-./snmpd.lo: ../include/net-snmp/library/system.h
-./snmpd.lo: ../include/net-snmp/library/tools.h
-./snmpd.lo: ../include/net-snmp/library/int64.h
-./snmpd.lo: ../include/net-snmp/library/mt_support.h
-./snmpd.lo: ../include/net-snmp/library/snmp_alarm.h
-./snmpd.lo: ../include/net-snmp/library/callback.h
-./snmpd.lo: ../include/net-snmp/library/data_list.h
-./snmpd.lo: ../include/net-snmp/library/oid_stash.h
-./snmpd.lo: ../include/net-snmp/library/check_varbind.h
-./snmpd.lo: ../include/net-snmp/library/container.h
-./snmpd.lo: ../include/net-snmp/library/factory.h
-./snmpd.lo: ../include/net-snmp/library/snmp_logging.h
-./snmpd.lo: ../include/net-snmp/library/container_binary_array.h
-./snmpd.lo: ../include/net-snmp/library/container_list_ssll.h
-./snmpd.lo: ../include/net-snmp/library/container_iterator.h
-./snmpd.lo: ../include/net-snmp/library/container.h
-./snmpd.lo: ../include/net-snmp/library/snmp_assert.h
-./snmpd.lo: ../include/net-snmp/version.h ../include/net-snmp/session_api.h
-./snmpd.lo: ../include/net-snmp/library/snmp_transport.h
-./snmpd.lo: ../include/net-snmp/library/snmp_service.h
-./snmpd.lo: ../include/net-snmp/library/snmpCallbackDomain.h
-./snmpd.lo: ../include/net-snmp/library/snmpUnixDomain.h
-./snmpd.lo: ../include/net-snmp/library/snmpUDPDomain.h
-./snmpd.lo: ../include/net-snmp/library/snmpTCPDomain.h
-./snmpd.lo: ../include/net-snmp/library/snmpUDPIPv6Domain.h
-./snmpd.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
-./snmpd.lo: ../include/net-snmp/library/snmpIPXDomain.h
-./snmpd.lo: ../include/net-snmp/library/ucd_compat.h
-./snmpd.lo: ../include/net-snmp/pdu_api.h ../include/net-snmp/mib_api.h
-./snmpd.lo: ../include/net-snmp/library/mib.h
-./snmpd.lo: ../include/net-snmp/library/parse.h
-./snmpd.lo: ../include/net-snmp/varbind_api.h
-./snmpd.lo: ../include/net-snmp/config_api.h
-./snmpd.lo: ../include/net-snmp/library/read_config.h
-./snmpd.lo: ../include/net-snmp/library/default_store.h
-./snmpd.lo: ../include/net-snmp/library/snmp_parse_args.h
-./snmpd.lo: ../include/net-snmp/library/snmp_enum.h
-./snmpd.lo: ../include/net-snmp/library/vacm.h
-./snmpd.lo: ../include/net-snmp/output_api.h
-./snmpd.lo: ../include/net-snmp/library/snmp_debug.h
-./snmpd.lo: ../include/net-snmp/snmpv3_api.h
-./snmpd.lo: ../include/net-snmp/library/snmpv3.h
-./snmpd.lo: ../include/net-snmp/library/transform_oids.h
-./snmpd.lo: ../include/net-snmp/library/keytools.h
-./snmpd.lo: ../include/net-snmp/library/scapi.h
-./snmpd.lo: ../include/net-snmp/library/lcd_time.h
-./snmpd.lo: ../include/net-snmp/library/snmp_secmod.h
-./snmpd.lo: ../include/net-snmp/library/snmpv3-security-includes.h
-./snmpd.lo: ../include/net-snmp/library/snmpusm.h
-./snmpd.lo: ../include/net-snmp/agent/net-snmp-agent-includes.h
-./snmpd.lo: ../include/net-snmp/agent/mib_module_config.h
-./snmpd.lo: ../include/net-snmp/agent/agent_module_config.h
-./snmpd.lo: ../include/net-snmp/agent/snmp_agent.h
-./snmpd.lo: ../include/net-snmp/agent/snmp_vars.h
-./snmpd.lo: ../include/net-snmp/agent/agent_handler.h
-./snmpd.lo: ../include/net-snmp/agent/var_struct.h
-./snmpd.lo: ../include/net-snmp/agent/agent_registry.h
-./snmpd.lo: ../include/net-snmp/library/fd_event_manager.h
-./snmpd.lo: ../include/net-snmp/agent/ds_agent.h
-./snmpd.lo: ../include/net-snmp/agent/agent_read_config.h
-./snmpd.lo: ../include/net-snmp/agent/agent_trap.h
-./snmpd.lo: ../include/net-snmp/agent/all_helpers.h
-./snmpd.lo: ../include/net-snmp/agent/instance.h
-./snmpd.lo: ../include/net-snmp/agent/baby_steps.h
-./snmpd.lo: ../include/net-snmp/agent/scalar.h
-./snmpd.lo: ../include/net-snmp/agent/scalar_group.h
-./snmpd.lo: ../include/net-snmp/agent/watcher.h
-./snmpd.lo: ../include/net-snmp/agent/multiplexer.h
-./snmpd.lo: ../include/net-snmp/agent/null.h
-./snmpd.lo: ../include/net-snmp/agent/debug_handler.h
-./snmpd.lo: ../include/net-snmp/agent/cache_handler.h
-./snmpd.lo: ../include/net-snmp/agent/old_api.h
-./snmpd.lo: ../include/net-snmp/agent/read_only.h
-./snmpd.lo: ../include/net-snmp/agent/row_merge.h
-./snmpd.lo: ../include/net-snmp/agent/serialize.h
-./snmpd.lo: ../include/net-snmp/agent/bulk_to_next.h
-./snmpd.lo: ../include/net-snmp/agent/mode_end_call.h
-./snmpd.lo: ../include/net-snmp/agent/table.h
-./snmpd.lo: ../include/net-snmp/agent/table_data.h
-./snmpd.lo: ../include/net-snmp/agent/table_dataset.h
-./snmpd.lo: ../include/net-snmp/agent/table_tdata.h
-./snmpd.lo: ../include/net-snmp/agent/table_iterator.h
-./snmpd.lo: ../include/net-snmp/agent/table_container.h
-./snmpd.lo: ../include/net-snmp/agent/table_array.h
-./snmpd.lo: ../include/net-snmp/agent/mfd.h m2m.h snmpd.h mibgroup/struct.h
-./snmpd.lo: ../include/net-snmp/agent/mib_modules.h mibgroup/util_funcs.h
-./snmpd.lo: mibgroup/struct.h ../agent/mibgroup/mib_module_includes.h
-./snmpd.lo: mibgroup/examples/example.h mibgroup/testhandler.h
-./snmpd.lo: mibgroup/host/hr_system.h mibgroup/host/hr_storage.h
-./snmpd.lo: mibgroup/host/hr_device.h mibgroup/host/hr_other.h
-./snmpd.lo: mibgroup/host/hr_proc.h mibgroup/host/hr_network.h
-./snmpd.lo: mibgroup/host/hr_print.h mibgroup/host/hr_disk.h
-./snmpd.lo: mibgroup/host/hr_partition.h mibgroup/host/hr_filesys.h
-./snmpd.lo: mibgroup/host/hr_swrun.h mibgroup/host/hr_swinst.h
-./snmpd.lo: mibgroup/examples/scalar_int.h mibgroup/examples/watched.h
-./snmpd.lo: mibgroup/examples/data_set.h mibgroup/examples/delayed_instance.h
-./snmpd.lo: mibgroup/Rmon/rows.h mibgroup/Rmon/agutil.h
-./snmpd.lo: mibgroup/Rmon/statistics.h mibgroup/Rmon/alarm.h
-./snmpd.lo: mibgroup/Rmon/history.h mibgroup/Rmon/event.h
-./snmpd.lo: mibgroup/disman/event/mteScalars.h
-./snmpd.lo: mibgroup/disman/event/mteTrigger.h
-./snmpd.lo: mibgroup/disman/event/mteTriggerTable.h
-./snmpd.lo: mibgroup/disman/event/mteTriggerDeltaTable.h
-./snmpd.lo: mibgroup/disman/event/mteTriggerExistenceTable.h
-./snmpd.lo: mibgroup/disman/event/mteTriggerBooleanTable.h
-./snmpd.lo: mibgroup/disman/event/mteTriggerThresholdTable.h
-./snmpd.lo: mibgroup/disman/event/mteTriggerConf.h
-./snmpd.lo: mibgroup/disman/event/mteEvent.h
-./snmpd.lo: ../agent/mibgroup/disman/event/mteTrigger.h
-./snmpd.lo: mibgroup/disman/event/mteEventTable.h
-./snmpd.lo: mibgroup/disman/event/mteEventSetTable.h
-./snmpd.lo: mibgroup/disman/event/mteEventNotificationTable.h
-./snmpd.lo: mibgroup/disman/event/mteEventConf.h
-./snmpd.lo: mibgroup/disman/event/mteObjects.h
-./snmpd.lo: mibgroup/disman/event/mteObjectsTable.h
-./snmpd.lo: mibgroup/disman/event/mteObjectsConf.h
-./snmpd.lo: mibgroup/snmpv3/snmpEngine.h mibgroup/snmpv3/snmpMPDStats.h
-./snmpd.lo: mibgroup/snmpv3/usmStats.h mibgroup/snmpv3/usmUser.h
-./snmpd.lo: mibgroup/mibII/system_mib.h mibgroup/mibII/sysORTable.h
-./snmpd.lo: mibgroup/mibII/at.h mibgroup/mibII/ip.h
-./snmpd.lo: mibgroup/mibII/var_route.h mibgroup/mibII/route_write.h
-./snmpd.lo: mibgroup/mibII/at.h mibgroup/mibII/snmp_mib.h
-./snmpd.lo: mibgroup/mibII/tcp.h mibgroup/mibII/icmp.h mibgroup/mibII/udp.h
-./snmpd.lo: mibgroup/mibII/vacm_vars.h mibgroup/mibII/setSerialNo.h
-./snmpd.lo: mibgroup/mibII/ipv6.h mibgroup/ucd-snmp/proc.h
-./snmpd.lo: ../agent/mibgroup/mibdefs.h mibgroup/ucd-snmp/versioninfo.h
-./snmpd.lo: mibgroup/ucd-snmp/pass.h mibgroup/ucd-snmp/pass_persist.h
-./snmpd.lo: mibgroup/ucd-snmp/disk.h mibgroup/ucd-snmp/loadave.h
-./snmpd.lo: mibgroup/agent/extend.h mibgroup/ucd-snmp/errormib.h
-./snmpd.lo: mibgroup/ucd-snmp/file.h mibgroup/ucd-snmp/dlmod.h
-./snmpd.lo: mibgroup/ucd-snmp/proxy.h mibgroup/ucd-snmp/logmatch.h
-./snmpd.lo: mibgroup/ucd-snmp/memory.h mibgroup/ucd-snmp/vmstat.h
-./snmpd.lo: mibgroup/notification/snmpNotifyTable.h
-./snmpd.lo: mibgroup/notification/snmpNotifyFilterProfileTable.h
-./snmpd.lo: mibgroup/notification-log-mib/notification_log.h
-./snmpd.lo: mibgroup/target/snmpTargetAddrEntry.h
-./snmpd.lo: mibgroup/target/snmpTargetParamsEntry.h
-./snmpd.lo: mibgroup/target/target_counters.h
-./snmpd.lo: mibgroup/agent/nsTransactionTable.h
-./snmpd.lo: mibgroup/agent/nsModuleTable.h mibgroup/agent/nsDebug.h
-./snmpd.lo: mibgroup/agent/nsCache.h mibgroup/agent/nsLogging.h
-./snmpd.lo: mibgroup/agent/nsVacmAccessTable.h
-./snmpd.lo: mibgroup/disman/schedule/schedCore.h
-./snmpd.lo: mibgroup/disman/schedule/schedConf.h
-./snmpd.lo: mibgroup/disman/schedule/schedTable.h
-./snmpd.lo: mibgroup/utilities/override.h mibgroup/hardware/memory/hw_mem.h
-./snmpd.lo: mibgroup/hardware/cpu/cpu.h mibgroup/hardware/cpu/cpu_linux.h
-./snmpd.lo: mibgroup/mibII/var_route.h mibgroup/mibII/tcpTable.h
-./snmpd.lo: mibgroup/mibII/udpTable.h mibgroup/mibII/vacm_context.h
-./snmpd.lo: mibgroup/ip-mib/ip_scalars.h
-./snmpd.lo: mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable.h
-./snmpd.lo: mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable_constants.h
-./snmpd.lo: mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable_interface.h
-./snmpd.lo: mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable.h
-./snmpd.lo: mibgroup/snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable_data_access.h
-./snmpd.lo: mibgroup/if-mib/ifTable/ifTable.h
-./snmpd.lo: ../include/net-snmp/data_access/interface.h
-./snmpd.lo: mibgroup/if-mib/ifTable/ifTable_constants.h
-./snmpd.lo: mibgroup/if-mib/ifTable/ifTable_interface.h
-./snmpd.lo: mibgroup/if-mib/ifTable/ifTable.h
-./snmpd.lo: mibgroup/if-mib/ifTable/ifTable_data_access.h
-./snmpd.lo: mibgroup/if-mib/ifXTable/ifXTable.h
-./snmpd.lo: ../agent/mibgroup/if-mib/ifTable/ifTable.h
-./snmpd.lo: mibgroup/if-mib/ifXTable/ifXTable_constants.h
-./snmpd.lo: mibgroup/if-mib/ifXTable/ifXTable_interface.h
-./snmpd.lo: mibgroup/if-mib/ifXTable/ifXTable.h
-./snmpd.lo: mibgroup/if-mib/ifXTable/ifXTable_data_access.h
-./snmpd.lo: mibgroup/ip-mib/ipAddressTable/ipAddressTable.h
-./snmpd.lo: ../include/net-snmp/data_access/ipaddress.h
-./snmpd.lo: mibgroup/ip-mib/ipAddressTable/ipAddressTable_constants.h
-./snmpd.lo: mibgroup/ip-mib/ipAddressTable/ipAddressTable_interface.h
-./snmpd.lo: mibgroup/ip-mib/ipAddressTable/ipAddressTable.h
-./snmpd.lo: mibgroup/ip-mib/ipAddressTable/ipAddressTable_data_access.h
-./snmpd.lo: mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable.h
-./snmpd.lo: ../include/net-snmp/data_access/arp.h
-./snmpd.lo: mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable_constants.h
-./snmpd.lo: mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable_interface.h
-./snmpd.lo: mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable.h
-./snmpd.lo: mibgroup/ip-mib/inetNetToMediaTable/inetNetToMediaTable_data_access.h
-./snmpd.lo: mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h
-./snmpd.lo: ../include/net-snmp/data_access/ipstats.h
-./snmpd.lo: ../include/net-snmp/data_access/systemstats.h
-./snmpd.lo: mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_constants.h
-./snmpd.lo: mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.h
-./snmpd.lo: mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h
-./snmpd.lo: mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access.h
-./snmpd.lo: mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable.h
-./snmpd.lo: ../include/net-snmp/data_access/route.h
-./snmpd.lo: ../agent/mibgroup/mibII/route_headers.h
-./snmpd.lo: mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable_constants.h
-./snmpd.lo: mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable_interface.h
-./snmpd.lo: mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable.h
-./snmpd.lo: mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable_data_access.h
-./snmpd.lo: mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable.h
-./snmpd.lo: mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable_constants.h
-./snmpd.lo: mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable_interface.h
-./snmpd.lo: mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable.h
-./snmpd.lo: mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable_data_access.h
-./snmpd.lo: mibgroup/tcp-mib/tcpConnectionTable/tcpConnectionTable.h
-./snmpd.lo: ../include/net-snmp/data_access/tcpConn.h
-./snmpd.lo: mibgroup/tcp-mib/tcpConnectionTable/tcpConnectionTable_constants.h
-./snmpd.lo: mibgroup/tcp-mib/tcpConnectionTable/tcpConnectionTable_interface.h
-./snmpd.lo: mibgroup/tcp-mib/tcpConnectionTable/tcpConnectionTable.h
-./snmpd.lo: mibgroup/tcp-mib/tcpConnectionTable/tcpConnectionTable_data_access.h
-./snmpd.lo: mibgroup/tcp-mib/tcpListenerTable/tcpListenerTable.h
-./snmpd.lo: mibgroup/tcp-mib/tcpListenerTable/tcpListenerTable_constants.h
-./snmpd.lo: mibgroup/tcp-mib/tcpListenerTable/tcpListenerTable_interface.h
-./snmpd.lo: mibgroup/tcp-mib/tcpListenerTable/tcpListenerTable.h
-./snmpd.lo: mibgroup/tcp-mib/tcpListenerTable/tcpListenerTable_data_access.h
-./snmpd.lo: mibgroup/udp-mib/udpEndpointTable/udpEndpointTable.h
-./snmpd.lo: mibgroup/udp-mib/udpEndpointTable/udpEndpointTable_constants.h
-./snmpd.lo: mibgroup/udp-mib/udpEndpointTable/udpEndpointTable_interface.h
-./snmpd.lo: mibgroup/udp-mib/udpEndpointTable/udpEndpointTable.h
-./snmpd.lo: mibgroup/udp-mib/udpEndpointTable/udpEndpointTable_data_access.h
-./snmpd.lo: mibgroup/if-mib/data_access/interface.h mibgroup/smux/smux.h
 ./helpers/all_helpers.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/all_helpers.lo: ../include/net-snmp/system/linux.h
-./helpers/all_helpers.lo: ../include/net-snmp/system/sysv.h
-./helpers/all_helpers.lo: ../include/net-snmp/system/generic.h
-./helpers/all_helpers.lo: ../include/net-snmp/machine/generic.h
 ./helpers/all_helpers.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/all_helpers.lo: ../include/net-snmp/definitions.h
 ./helpers/all_helpers.lo: ../include/net-snmp/types.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/types.h
 ./helpers/all_helpers.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/all_helpers.lo: ../include/net-snmp/library/asn1.h
-./helpers/all_helpers.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/all_helpers.lo: ../include/net-snmp/library/snmp.h
-./helpers/all_helpers.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/all_helpers.lo: ../include/net-snmp/utilities.h
+./helpers/all_helpers.lo: ../include/net-snmp/varbind_api.h
 ./helpers/all_helpers.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/all_helpers.lo: ../include/net-snmp/library/system.h
-./helpers/all_helpers.lo: ../include/net-snmp/library/tools.h
-./helpers/all_helpers.lo: ../include/net-snmp/library/int64.h
-./helpers/all_helpers.lo: ../include/net-snmp/library/mt_support.h
-./helpers/all_helpers.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/all_helpers.lo: ../include/net-snmp/library/callback.h
-./helpers/all_helpers.lo: ../include/net-snmp/library/data_list.h
-./helpers/all_helpers.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/all_helpers.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/all_helpers.lo: ../include/net-snmp/library/container.h
-./helpers/all_helpers.lo: ../include/net-snmp/library/factory.h
-./helpers/all_helpers.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/all_helpers.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/all_helpers.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/all_helpers.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/all_helpers.lo: ../include/net-snmp/library/container.h
-./helpers/all_helpers.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/all_helpers.lo: ../include/net-snmp/version.h
+./helpers/all_helpers.lo: ../include/net-snmp/pdu_api.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/asn1.h
 ./helpers/all_helpers.lo: ../include/net-snmp/session_api.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/callback.h
 ./helpers/all_helpers.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/all_helpers.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/all_helpers.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -1572,11 +1753,31 @@
 ./helpers/all_helpers.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/all_helpers.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/all_helpers.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/all_helpers.lo: ../include/net-snmp/pdu_api.h
-./helpers/all_helpers.lo: ../include/net-snmp/mib_api.h
 ./helpers/all_helpers.lo: ../include/net-snmp/library/mib.h
+./helpers/all_helpers.lo: ../include/net-snmp/mib_api.h
 ./helpers/all_helpers.lo: ../include/net-snmp/library/parse.h
-./helpers/all_helpers.lo: ../include/net-snmp/varbind_api.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/snmp.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/getopt.h
+./helpers/all_helpers.lo: ../include/net-snmp/utilities.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/system.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/tools.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/int64.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/mt_support.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/data_list.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/container.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/factory.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/container.h
+./helpers/all_helpers.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/all_helpers.lo: ../include/net-snmp/version.h
 ./helpers/all_helpers.lo: ../include/net-snmp/config_api.h
 ./helpers/all_helpers.lo: ../include/net-snmp/library/read_config.h
 ./helpers/all_helpers.lo: ../include/net-snmp/library/default_store.h
@@ -1630,40 +1831,19 @@
 ./helpers/all_helpers.lo: ../include/net-snmp/agent/table_container.h
 ./helpers/all_helpers.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/all_helpers.lo: ../include/net-snmp/agent/mfd.h
+./helpers/all_helpers.lo: ../include/net-snmp/agent/stash_cache.h
 ./helpers/baby_steps.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/baby_steps.lo: ../include/net-snmp/system/linux.h
-./helpers/baby_steps.lo: ../include/net-snmp/system/sysv.h
-./helpers/baby_steps.lo: ../include/net-snmp/system/generic.h
-./helpers/baby_steps.lo: ../include/net-snmp/machine/generic.h
 ./helpers/baby_steps.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/baby_steps.lo: ../include/net-snmp/definitions.h
 ./helpers/baby_steps.lo: ../include/net-snmp/types.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/types.h
 ./helpers/baby_steps.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/baby_steps.lo: ../include/net-snmp/library/asn1.h
-./helpers/baby_steps.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/baby_steps.lo: ../include/net-snmp/library/snmp.h
-./helpers/baby_steps.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/baby_steps.lo: ../include/net-snmp/utilities.h
+./helpers/baby_steps.lo: ../include/net-snmp/varbind_api.h
 ./helpers/baby_steps.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/baby_steps.lo: ../include/net-snmp/library/system.h
-./helpers/baby_steps.lo: ../include/net-snmp/library/tools.h
-./helpers/baby_steps.lo: ../include/net-snmp/library/int64.h
-./helpers/baby_steps.lo: ../include/net-snmp/library/mt_support.h
-./helpers/baby_steps.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/baby_steps.lo: ../include/net-snmp/library/callback.h
-./helpers/baby_steps.lo: ../include/net-snmp/library/data_list.h
-./helpers/baby_steps.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/baby_steps.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/baby_steps.lo: ../include/net-snmp/library/container.h
-./helpers/baby_steps.lo: ../include/net-snmp/library/factory.h
-./helpers/baby_steps.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/baby_steps.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/baby_steps.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/baby_steps.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/baby_steps.lo: ../include/net-snmp/library/container.h
-./helpers/baby_steps.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/baby_steps.lo: ../include/net-snmp/version.h
+./helpers/baby_steps.lo: ../include/net-snmp/pdu_api.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/asn1.h
 ./helpers/baby_steps.lo: ../include/net-snmp/session_api.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/callback.h
 ./helpers/baby_steps.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/baby_steps.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/baby_steps.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -1674,11 +1854,31 @@
 ./helpers/baby_steps.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/baby_steps.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/baby_steps.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/baby_steps.lo: ../include/net-snmp/pdu_api.h
-./helpers/baby_steps.lo: ../include/net-snmp/mib_api.h
 ./helpers/baby_steps.lo: ../include/net-snmp/library/mib.h
+./helpers/baby_steps.lo: ../include/net-snmp/mib_api.h
 ./helpers/baby_steps.lo: ../include/net-snmp/library/parse.h
-./helpers/baby_steps.lo: ../include/net-snmp/varbind_api.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/snmp.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/getopt.h
+./helpers/baby_steps.lo: ../include/net-snmp/utilities.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/system.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/tools.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/int64.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/mt_support.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/data_list.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/container.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/factory.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/container.h
+./helpers/baby_steps.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/baby_steps.lo: ../include/net-snmp/version.h
 ./helpers/baby_steps.lo: ../include/net-snmp/config_api.h
 ./helpers/baby_steps.lo: ../include/net-snmp/library/read_config.h
 ./helpers/baby_steps.lo: ../include/net-snmp/library/default_store.h
@@ -1733,39 +1933,17 @@
 ./helpers/baby_steps.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/baby_steps.lo: ../include/net-snmp/agent/mfd.h
 ./helpers/bulk_to_next.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/system/linux.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/system/sysv.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/system/generic.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/machine/generic.h
 ./helpers/bulk_to_next.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/bulk_to_next.lo: ../include/net-snmp/definitions.h
 ./helpers/bulk_to_next.lo: ../include/net-snmp/types.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/types.h
 ./helpers/bulk_to_next.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/library/asn1.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/library/snmp.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/utilities.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/varbind_api.h
 ./helpers/bulk_to_next.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/library/system.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/library/tools.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/library/int64.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/library/mt_support.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/library/callback.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/library/data_list.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/library/container.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/library/factory.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/library/container.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/version.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/pdu_api.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/asn1.h
 ./helpers/bulk_to_next.lo: ../include/net-snmp/session_api.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/callback.h
 ./helpers/bulk_to_next.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/bulk_to_next.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/bulk_to_next.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -1776,11 +1954,31 @@
 ./helpers/bulk_to_next.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/bulk_to_next.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/bulk_to_next.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/pdu_api.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/mib_api.h
 ./helpers/bulk_to_next.lo: ../include/net-snmp/library/mib.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/mib_api.h
 ./helpers/bulk_to_next.lo: ../include/net-snmp/library/parse.h
-./helpers/bulk_to_next.lo: ../include/net-snmp/varbind_api.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/snmp.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/getopt.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/utilities.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/system.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/tools.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/int64.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/mt_support.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/data_list.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/container.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/factory.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/container.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/bulk_to_next.lo: ../include/net-snmp/version.h
 ./helpers/bulk_to_next.lo: ../include/net-snmp/config_api.h
 ./helpers/bulk_to_next.lo: ../include/net-snmp/library/read_config.h
 ./helpers/bulk_to_next.lo: ../include/net-snmp/library/default_store.h
@@ -1835,39 +2033,17 @@
 ./helpers/bulk_to_next.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/bulk_to_next.lo: ../include/net-snmp/agent/mfd.h
 ./helpers/cache_handler.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/cache_handler.lo: ../include/net-snmp/system/linux.h
-./helpers/cache_handler.lo: ../include/net-snmp/system/sysv.h
-./helpers/cache_handler.lo: ../include/net-snmp/system/generic.h
-./helpers/cache_handler.lo: ../include/net-snmp/machine/generic.h
 ./helpers/cache_handler.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/cache_handler.lo: ../include/net-snmp/definitions.h
 ./helpers/cache_handler.lo: ../include/net-snmp/types.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/types.h
 ./helpers/cache_handler.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/cache_handler.lo: ../include/net-snmp/library/asn1.h
-./helpers/cache_handler.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/cache_handler.lo: ../include/net-snmp/library/snmp.h
-./helpers/cache_handler.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/cache_handler.lo: ../include/net-snmp/utilities.h
+./helpers/cache_handler.lo: ../include/net-snmp/varbind_api.h
 ./helpers/cache_handler.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/cache_handler.lo: ../include/net-snmp/library/system.h
-./helpers/cache_handler.lo: ../include/net-snmp/library/tools.h
-./helpers/cache_handler.lo: ../include/net-snmp/library/int64.h
-./helpers/cache_handler.lo: ../include/net-snmp/library/mt_support.h
-./helpers/cache_handler.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/cache_handler.lo: ../include/net-snmp/library/callback.h
-./helpers/cache_handler.lo: ../include/net-snmp/library/data_list.h
-./helpers/cache_handler.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/cache_handler.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/cache_handler.lo: ../include/net-snmp/library/container.h
-./helpers/cache_handler.lo: ../include/net-snmp/library/factory.h
-./helpers/cache_handler.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/cache_handler.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/cache_handler.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/cache_handler.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/cache_handler.lo: ../include/net-snmp/library/container.h
-./helpers/cache_handler.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/cache_handler.lo: ../include/net-snmp/version.h
+./helpers/cache_handler.lo: ../include/net-snmp/pdu_api.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/asn1.h
 ./helpers/cache_handler.lo: ../include/net-snmp/session_api.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/callback.h
 ./helpers/cache_handler.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/cache_handler.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/cache_handler.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -1878,11 +2054,31 @@
 ./helpers/cache_handler.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/cache_handler.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/cache_handler.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/cache_handler.lo: ../include/net-snmp/pdu_api.h
-./helpers/cache_handler.lo: ../include/net-snmp/mib_api.h
 ./helpers/cache_handler.lo: ../include/net-snmp/library/mib.h
+./helpers/cache_handler.lo: ../include/net-snmp/mib_api.h
 ./helpers/cache_handler.lo: ../include/net-snmp/library/parse.h
-./helpers/cache_handler.lo: ../include/net-snmp/varbind_api.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/snmp.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/getopt.h
+./helpers/cache_handler.lo: ../include/net-snmp/utilities.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/system.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/tools.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/int64.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/mt_support.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/data_list.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/container.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/factory.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/container.h
+./helpers/cache_handler.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/cache_handler.lo: ../include/net-snmp/version.h
 ./helpers/cache_handler.lo: ../include/net-snmp/config_api.h
 ./helpers/cache_handler.lo: ../include/net-snmp/library/read_config.h
 ./helpers/cache_handler.lo: ../include/net-snmp/library/default_store.h
@@ -1937,39 +2133,17 @@
 ./helpers/cache_handler.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/cache_handler.lo: ../include/net-snmp/agent/mfd.h
 ./helpers/debug_handler.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/debug_handler.lo: ../include/net-snmp/system/linux.h
-./helpers/debug_handler.lo: ../include/net-snmp/system/sysv.h
-./helpers/debug_handler.lo: ../include/net-snmp/system/generic.h
-./helpers/debug_handler.lo: ../include/net-snmp/machine/generic.h
 ./helpers/debug_handler.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/debug_handler.lo: ../include/net-snmp/definitions.h
 ./helpers/debug_handler.lo: ../include/net-snmp/types.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/types.h
 ./helpers/debug_handler.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/debug_handler.lo: ../include/net-snmp/library/asn1.h
-./helpers/debug_handler.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/debug_handler.lo: ../include/net-snmp/library/snmp.h
-./helpers/debug_handler.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/debug_handler.lo: ../include/net-snmp/utilities.h
+./helpers/debug_handler.lo: ../include/net-snmp/varbind_api.h
 ./helpers/debug_handler.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/debug_handler.lo: ../include/net-snmp/library/system.h
-./helpers/debug_handler.lo: ../include/net-snmp/library/tools.h
-./helpers/debug_handler.lo: ../include/net-snmp/library/int64.h
-./helpers/debug_handler.lo: ../include/net-snmp/library/mt_support.h
-./helpers/debug_handler.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/debug_handler.lo: ../include/net-snmp/library/callback.h
-./helpers/debug_handler.lo: ../include/net-snmp/library/data_list.h
-./helpers/debug_handler.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/debug_handler.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/debug_handler.lo: ../include/net-snmp/library/container.h
-./helpers/debug_handler.lo: ../include/net-snmp/library/factory.h
-./helpers/debug_handler.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/debug_handler.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/debug_handler.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/debug_handler.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/debug_handler.lo: ../include/net-snmp/library/container.h
-./helpers/debug_handler.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/debug_handler.lo: ../include/net-snmp/version.h
+./helpers/debug_handler.lo: ../include/net-snmp/pdu_api.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/asn1.h
 ./helpers/debug_handler.lo: ../include/net-snmp/session_api.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/callback.h
 ./helpers/debug_handler.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/debug_handler.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/debug_handler.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -1980,11 +2154,31 @@
 ./helpers/debug_handler.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/debug_handler.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/debug_handler.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/debug_handler.lo: ../include/net-snmp/pdu_api.h
-./helpers/debug_handler.lo: ../include/net-snmp/mib_api.h
 ./helpers/debug_handler.lo: ../include/net-snmp/library/mib.h
+./helpers/debug_handler.lo: ../include/net-snmp/mib_api.h
 ./helpers/debug_handler.lo: ../include/net-snmp/library/parse.h
-./helpers/debug_handler.lo: ../include/net-snmp/varbind_api.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/snmp.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/getopt.h
+./helpers/debug_handler.lo: ../include/net-snmp/utilities.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/system.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/tools.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/int64.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/mt_support.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/data_list.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/container.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/factory.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/container.h
+./helpers/debug_handler.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/debug_handler.lo: ../include/net-snmp/version.h
 ./helpers/debug_handler.lo: ../include/net-snmp/config_api.h
 ./helpers/debug_handler.lo: ../include/net-snmp/library/read_config.h
 ./helpers/debug_handler.lo: ../include/net-snmp/library/default_store.h
@@ -2039,39 +2233,17 @@
 ./helpers/debug_handler.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/debug_handler.lo: ../include/net-snmp/agent/mfd.h
 ./helpers/instance.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/instance.lo: ../include/net-snmp/system/linux.h
-./helpers/instance.lo: ../include/net-snmp/system/sysv.h
-./helpers/instance.lo: ../include/net-snmp/system/generic.h
-./helpers/instance.lo: ../include/net-snmp/machine/generic.h
 ./helpers/instance.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/instance.lo: ../include/net-snmp/definitions.h
 ./helpers/instance.lo: ../include/net-snmp/types.h
+./helpers/instance.lo: ../include/net-snmp/library/types.h
 ./helpers/instance.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/instance.lo: ../include/net-snmp/library/asn1.h
-./helpers/instance.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/instance.lo: ../include/net-snmp/library/snmp.h
-./helpers/instance.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/instance.lo: ../include/net-snmp/utilities.h
+./helpers/instance.lo: ../include/net-snmp/varbind_api.h
 ./helpers/instance.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/instance.lo: ../include/net-snmp/library/system.h
-./helpers/instance.lo: ../include/net-snmp/library/tools.h
-./helpers/instance.lo: ../include/net-snmp/library/int64.h
-./helpers/instance.lo: ../include/net-snmp/library/mt_support.h
-./helpers/instance.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/instance.lo: ../include/net-snmp/library/callback.h
-./helpers/instance.lo: ../include/net-snmp/library/data_list.h
-./helpers/instance.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/instance.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/instance.lo: ../include/net-snmp/library/container.h
-./helpers/instance.lo: ../include/net-snmp/library/factory.h
-./helpers/instance.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/instance.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/instance.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/instance.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/instance.lo: ../include/net-snmp/library/container.h
-./helpers/instance.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/instance.lo: ../include/net-snmp/version.h
+./helpers/instance.lo: ../include/net-snmp/pdu_api.h
+./helpers/instance.lo: ../include/net-snmp/library/asn1.h
 ./helpers/instance.lo: ../include/net-snmp/session_api.h
+./helpers/instance.lo: ../include/net-snmp/library/callback.h
 ./helpers/instance.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/instance.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/instance.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -2082,11 +2254,31 @@
 ./helpers/instance.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/instance.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/instance.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/instance.lo: ../include/net-snmp/pdu_api.h
-./helpers/instance.lo: ../include/net-snmp/mib_api.h
 ./helpers/instance.lo: ../include/net-snmp/library/mib.h
+./helpers/instance.lo: ../include/net-snmp/mib_api.h
 ./helpers/instance.lo: ../include/net-snmp/library/parse.h
-./helpers/instance.lo: ../include/net-snmp/varbind_api.h
+./helpers/instance.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/instance.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/instance.lo: ../include/net-snmp/library/snmp.h
+./helpers/instance.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/instance.lo: ../include/net-snmp/library/getopt.h
+./helpers/instance.lo: ../include/net-snmp/utilities.h
+./helpers/instance.lo: ../include/net-snmp/library/system.h
+./helpers/instance.lo: ../include/net-snmp/library/tools.h
+./helpers/instance.lo: ../include/net-snmp/library/int64.h
+./helpers/instance.lo: ../include/net-snmp/library/mt_support.h
+./helpers/instance.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/instance.lo: ../include/net-snmp/library/data_list.h
+./helpers/instance.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/instance.lo: ../include/net-snmp/library/container.h
+./helpers/instance.lo: ../include/net-snmp/library/factory.h
+./helpers/instance.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/instance.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/instance.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/instance.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/instance.lo: ../include/net-snmp/library/container.h
+./helpers/instance.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/instance.lo: ../include/net-snmp/version.h
 ./helpers/instance.lo: ../include/net-snmp/config_api.h
 ./helpers/instance.lo: ../include/net-snmp/library/read_config.h
 ./helpers/instance.lo: ../include/net-snmp/library/default_store.h
@@ -2141,39 +2333,17 @@
 ./helpers/instance.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/instance.lo: ../include/net-snmp/agent/mfd.h
 ./helpers/mode_end_call.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/mode_end_call.lo: ../include/net-snmp/system/linux.h
-./helpers/mode_end_call.lo: ../include/net-snmp/system/sysv.h
-./helpers/mode_end_call.lo: ../include/net-snmp/system/generic.h
-./helpers/mode_end_call.lo: ../include/net-snmp/machine/generic.h
 ./helpers/mode_end_call.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/mode_end_call.lo: ../include/net-snmp/definitions.h
 ./helpers/mode_end_call.lo: ../include/net-snmp/types.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/types.h
 ./helpers/mode_end_call.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/mode_end_call.lo: ../include/net-snmp/library/asn1.h
-./helpers/mode_end_call.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/mode_end_call.lo: ../include/net-snmp/library/snmp.h
-./helpers/mode_end_call.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/mode_end_call.lo: ../include/net-snmp/utilities.h
+./helpers/mode_end_call.lo: ../include/net-snmp/varbind_api.h
 ./helpers/mode_end_call.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/mode_end_call.lo: ../include/net-snmp/library/system.h
-./helpers/mode_end_call.lo: ../include/net-snmp/library/tools.h
-./helpers/mode_end_call.lo: ../include/net-snmp/library/int64.h
-./helpers/mode_end_call.lo: ../include/net-snmp/library/mt_support.h
-./helpers/mode_end_call.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/mode_end_call.lo: ../include/net-snmp/library/callback.h
-./helpers/mode_end_call.lo: ../include/net-snmp/library/data_list.h
-./helpers/mode_end_call.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/mode_end_call.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/mode_end_call.lo: ../include/net-snmp/library/container.h
-./helpers/mode_end_call.lo: ../include/net-snmp/library/factory.h
-./helpers/mode_end_call.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/mode_end_call.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/mode_end_call.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/mode_end_call.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/mode_end_call.lo: ../include/net-snmp/library/container.h
-./helpers/mode_end_call.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/mode_end_call.lo: ../include/net-snmp/version.h
+./helpers/mode_end_call.lo: ../include/net-snmp/pdu_api.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/asn1.h
 ./helpers/mode_end_call.lo: ../include/net-snmp/session_api.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/callback.h
 ./helpers/mode_end_call.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/mode_end_call.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/mode_end_call.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -2184,11 +2354,31 @@
 ./helpers/mode_end_call.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/mode_end_call.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/mode_end_call.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/mode_end_call.lo: ../include/net-snmp/pdu_api.h
-./helpers/mode_end_call.lo: ../include/net-snmp/mib_api.h
 ./helpers/mode_end_call.lo: ../include/net-snmp/library/mib.h
+./helpers/mode_end_call.lo: ../include/net-snmp/mib_api.h
 ./helpers/mode_end_call.lo: ../include/net-snmp/library/parse.h
-./helpers/mode_end_call.lo: ../include/net-snmp/varbind_api.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/snmp.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/getopt.h
+./helpers/mode_end_call.lo: ../include/net-snmp/utilities.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/system.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/tools.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/int64.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/mt_support.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/data_list.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/container.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/factory.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/container.h
+./helpers/mode_end_call.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/mode_end_call.lo: ../include/net-snmp/version.h
 ./helpers/mode_end_call.lo: ../include/net-snmp/config_api.h
 ./helpers/mode_end_call.lo: ../include/net-snmp/library/read_config.h
 ./helpers/mode_end_call.lo: ../include/net-snmp/library/default_store.h
@@ -2243,39 +2433,17 @@
 ./helpers/mode_end_call.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/mode_end_call.lo: ../include/net-snmp/agent/mfd.h
 ./helpers/multiplexer.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/multiplexer.lo: ../include/net-snmp/system/linux.h
-./helpers/multiplexer.lo: ../include/net-snmp/system/sysv.h
-./helpers/multiplexer.lo: ../include/net-snmp/system/generic.h
-./helpers/multiplexer.lo: ../include/net-snmp/machine/generic.h
 ./helpers/multiplexer.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/multiplexer.lo: ../include/net-snmp/definitions.h
 ./helpers/multiplexer.lo: ../include/net-snmp/types.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/types.h
 ./helpers/multiplexer.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/multiplexer.lo: ../include/net-snmp/library/asn1.h
-./helpers/multiplexer.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/multiplexer.lo: ../include/net-snmp/library/snmp.h
-./helpers/multiplexer.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/multiplexer.lo: ../include/net-snmp/utilities.h
+./helpers/multiplexer.lo: ../include/net-snmp/varbind_api.h
 ./helpers/multiplexer.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/multiplexer.lo: ../include/net-snmp/library/system.h
-./helpers/multiplexer.lo: ../include/net-snmp/library/tools.h
-./helpers/multiplexer.lo: ../include/net-snmp/library/int64.h
-./helpers/multiplexer.lo: ../include/net-snmp/library/mt_support.h
-./helpers/multiplexer.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/multiplexer.lo: ../include/net-snmp/library/callback.h
-./helpers/multiplexer.lo: ../include/net-snmp/library/data_list.h
-./helpers/multiplexer.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/multiplexer.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/multiplexer.lo: ../include/net-snmp/library/container.h
-./helpers/multiplexer.lo: ../include/net-snmp/library/factory.h
-./helpers/multiplexer.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/multiplexer.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/multiplexer.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/multiplexer.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/multiplexer.lo: ../include/net-snmp/library/container.h
-./helpers/multiplexer.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/multiplexer.lo: ../include/net-snmp/version.h
+./helpers/multiplexer.lo: ../include/net-snmp/pdu_api.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/asn1.h
 ./helpers/multiplexer.lo: ../include/net-snmp/session_api.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/callback.h
 ./helpers/multiplexer.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/multiplexer.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/multiplexer.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -2286,11 +2454,31 @@
 ./helpers/multiplexer.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/multiplexer.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/multiplexer.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/multiplexer.lo: ../include/net-snmp/pdu_api.h
-./helpers/multiplexer.lo: ../include/net-snmp/mib_api.h
 ./helpers/multiplexer.lo: ../include/net-snmp/library/mib.h
+./helpers/multiplexer.lo: ../include/net-snmp/mib_api.h
 ./helpers/multiplexer.lo: ../include/net-snmp/library/parse.h
-./helpers/multiplexer.lo: ../include/net-snmp/varbind_api.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/snmp.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/getopt.h
+./helpers/multiplexer.lo: ../include/net-snmp/utilities.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/system.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/tools.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/int64.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/mt_support.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/data_list.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/container.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/factory.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/container.h
+./helpers/multiplexer.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/multiplexer.lo: ../include/net-snmp/version.h
 ./helpers/multiplexer.lo: ../include/net-snmp/config_api.h
 ./helpers/multiplexer.lo: ../include/net-snmp/library/read_config.h
 ./helpers/multiplexer.lo: ../include/net-snmp/library/default_store.h
@@ -2345,39 +2533,17 @@
 ./helpers/multiplexer.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/multiplexer.lo: ../include/net-snmp/agent/mfd.h
 ./helpers/null.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/null.lo: ../include/net-snmp/system/linux.h
-./helpers/null.lo: ../include/net-snmp/system/sysv.h
-./helpers/null.lo: ../include/net-snmp/system/generic.h
-./helpers/null.lo: ../include/net-snmp/machine/generic.h
 ./helpers/null.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/null.lo: ../include/net-snmp/definitions.h
 ./helpers/null.lo: ../include/net-snmp/types.h
+./helpers/null.lo: ../include/net-snmp/library/types.h
 ./helpers/null.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/null.lo: ../include/net-snmp/library/asn1.h
-./helpers/null.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/null.lo: ../include/net-snmp/library/snmp.h
-./helpers/null.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/null.lo: ../include/net-snmp/utilities.h
+./helpers/null.lo: ../include/net-snmp/varbind_api.h
 ./helpers/null.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/null.lo: ../include/net-snmp/library/system.h
-./helpers/null.lo: ../include/net-snmp/library/tools.h
-./helpers/null.lo: ../include/net-snmp/library/int64.h
-./helpers/null.lo: ../include/net-snmp/library/mt_support.h
-./helpers/null.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/null.lo: ../include/net-snmp/library/callback.h
-./helpers/null.lo: ../include/net-snmp/library/data_list.h
-./helpers/null.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/null.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/null.lo: ../include/net-snmp/library/container.h
-./helpers/null.lo: ../include/net-snmp/library/factory.h
-./helpers/null.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/null.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/null.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/null.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/null.lo: ../include/net-snmp/library/container.h
-./helpers/null.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/null.lo: ../include/net-snmp/version.h
+./helpers/null.lo: ../include/net-snmp/pdu_api.h
+./helpers/null.lo: ../include/net-snmp/library/asn1.h
 ./helpers/null.lo: ../include/net-snmp/session_api.h
+./helpers/null.lo: ../include/net-snmp/library/callback.h
 ./helpers/null.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/null.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/null.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -2388,11 +2554,31 @@
 ./helpers/null.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/null.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/null.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/null.lo: ../include/net-snmp/pdu_api.h
-./helpers/null.lo: ../include/net-snmp/mib_api.h
 ./helpers/null.lo: ../include/net-snmp/library/mib.h
+./helpers/null.lo: ../include/net-snmp/mib_api.h
 ./helpers/null.lo: ../include/net-snmp/library/parse.h
-./helpers/null.lo: ../include/net-snmp/varbind_api.h
+./helpers/null.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/null.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/null.lo: ../include/net-snmp/library/snmp.h
+./helpers/null.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/null.lo: ../include/net-snmp/library/getopt.h
+./helpers/null.lo: ../include/net-snmp/utilities.h
+./helpers/null.lo: ../include/net-snmp/library/system.h
+./helpers/null.lo: ../include/net-snmp/library/tools.h
+./helpers/null.lo: ../include/net-snmp/library/int64.h
+./helpers/null.lo: ../include/net-snmp/library/mt_support.h
+./helpers/null.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/null.lo: ../include/net-snmp/library/data_list.h
+./helpers/null.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/null.lo: ../include/net-snmp/library/container.h
+./helpers/null.lo: ../include/net-snmp/library/factory.h
+./helpers/null.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/null.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/null.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/null.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/null.lo: ../include/net-snmp/library/container.h
+./helpers/null.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/null.lo: ../include/net-snmp/version.h
 ./helpers/null.lo: ../include/net-snmp/config_api.h
 ./helpers/null.lo: ../include/net-snmp/library/read_config.h
 ./helpers/null.lo: ../include/net-snmp/library/default_store.h
@@ -2447,39 +2633,17 @@
 ./helpers/null.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/null.lo: ../include/net-snmp/agent/mfd.h
 ./helpers/old_api.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/old_api.lo: ../include/net-snmp/system/linux.h
-./helpers/old_api.lo: ../include/net-snmp/system/sysv.h
-./helpers/old_api.lo: ../include/net-snmp/system/generic.h
-./helpers/old_api.lo: ../include/net-snmp/machine/generic.h
 ./helpers/old_api.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/old_api.lo: ../include/net-snmp/definitions.h
 ./helpers/old_api.lo: ../include/net-snmp/types.h
+./helpers/old_api.lo: ../include/net-snmp/library/types.h
 ./helpers/old_api.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/old_api.lo: ../include/net-snmp/library/asn1.h
-./helpers/old_api.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/old_api.lo: ../include/net-snmp/library/snmp.h
-./helpers/old_api.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/old_api.lo: ../include/net-snmp/utilities.h
+./helpers/old_api.lo: ../include/net-snmp/varbind_api.h
 ./helpers/old_api.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/old_api.lo: ../include/net-snmp/library/system.h
-./helpers/old_api.lo: ../include/net-snmp/library/tools.h
-./helpers/old_api.lo: ../include/net-snmp/library/int64.h
-./helpers/old_api.lo: ../include/net-snmp/library/mt_support.h
-./helpers/old_api.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/old_api.lo: ../include/net-snmp/library/callback.h
-./helpers/old_api.lo: ../include/net-snmp/library/data_list.h
-./helpers/old_api.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/old_api.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/old_api.lo: ../include/net-snmp/library/container.h
-./helpers/old_api.lo: ../include/net-snmp/library/factory.h
-./helpers/old_api.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/old_api.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/old_api.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/old_api.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/old_api.lo: ../include/net-snmp/library/container.h
-./helpers/old_api.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/old_api.lo: ../include/net-snmp/version.h
+./helpers/old_api.lo: ../include/net-snmp/pdu_api.h
+./helpers/old_api.lo: ../include/net-snmp/library/asn1.h
 ./helpers/old_api.lo: ../include/net-snmp/session_api.h
+./helpers/old_api.lo: ../include/net-snmp/library/callback.h
 ./helpers/old_api.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/old_api.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/old_api.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -2490,11 +2654,31 @@
 ./helpers/old_api.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/old_api.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/old_api.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/old_api.lo: ../include/net-snmp/pdu_api.h
-./helpers/old_api.lo: ../include/net-snmp/mib_api.h
 ./helpers/old_api.lo: ../include/net-snmp/library/mib.h
+./helpers/old_api.lo: ../include/net-snmp/mib_api.h
 ./helpers/old_api.lo: ../include/net-snmp/library/parse.h
-./helpers/old_api.lo: ../include/net-snmp/varbind_api.h
+./helpers/old_api.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/old_api.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/old_api.lo: ../include/net-snmp/library/snmp.h
+./helpers/old_api.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/old_api.lo: ../include/net-snmp/library/getopt.h
+./helpers/old_api.lo: ../include/net-snmp/utilities.h
+./helpers/old_api.lo: ../include/net-snmp/library/system.h
+./helpers/old_api.lo: ../include/net-snmp/library/tools.h
+./helpers/old_api.lo: ../include/net-snmp/library/int64.h
+./helpers/old_api.lo: ../include/net-snmp/library/mt_support.h
+./helpers/old_api.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/old_api.lo: ../include/net-snmp/library/data_list.h
+./helpers/old_api.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/old_api.lo: ../include/net-snmp/library/container.h
+./helpers/old_api.lo: ../include/net-snmp/library/factory.h
+./helpers/old_api.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/old_api.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/old_api.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/old_api.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/old_api.lo: ../include/net-snmp/library/container.h
+./helpers/old_api.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/old_api.lo: ../include/net-snmp/version.h
 ./helpers/old_api.lo: ../include/net-snmp/config_api.h
 ./helpers/old_api.lo: ../include/net-snmp/library/read_config.h
 ./helpers/old_api.lo: ../include/net-snmp/library/default_store.h
@@ -2550,39 +2734,17 @@
 ./helpers/old_api.lo: ../include/net-snmp/agent/mfd.h
 ./helpers/old_api.lo: ../include/net-snmp/agent/agent_callbacks.h
 ./helpers/read_only.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/read_only.lo: ../include/net-snmp/system/linux.h
-./helpers/read_only.lo: ../include/net-snmp/system/sysv.h
-./helpers/read_only.lo: ../include/net-snmp/system/generic.h
-./helpers/read_only.lo: ../include/net-snmp/machine/generic.h
 ./helpers/read_only.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/read_only.lo: ../include/net-snmp/definitions.h
 ./helpers/read_only.lo: ../include/net-snmp/types.h
+./helpers/read_only.lo: ../include/net-snmp/library/types.h
 ./helpers/read_only.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/read_only.lo: ../include/net-snmp/library/asn1.h
-./helpers/read_only.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/read_only.lo: ../include/net-snmp/library/snmp.h
-./helpers/read_only.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/read_only.lo: ../include/net-snmp/utilities.h
+./helpers/read_only.lo: ../include/net-snmp/varbind_api.h
 ./helpers/read_only.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/read_only.lo: ../include/net-snmp/library/system.h
-./helpers/read_only.lo: ../include/net-snmp/library/tools.h
-./helpers/read_only.lo: ../include/net-snmp/library/int64.h
-./helpers/read_only.lo: ../include/net-snmp/library/mt_support.h
-./helpers/read_only.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/read_only.lo: ../include/net-snmp/library/callback.h
-./helpers/read_only.lo: ../include/net-snmp/library/data_list.h
-./helpers/read_only.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/read_only.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/read_only.lo: ../include/net-snmp/library/container.h
-./helpers/read_only.lo: ../include/net-snmp/library/factory.h
-./helpers/read_only.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/read_only.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/read_only.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/read_only.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/read_only.lo: ../include/net-snmp/library/container.h
-./helpers/read_only.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/read_only.lo: ../include/net-snmp/version.h
+./helpers/read_only.lo: ../include/net-snmp/pdu_api.h
+./helpers/read_only.lo: ../include/net-snmp/library/asn1.h
 ./helpers/read_only.lo: ../include/net-snmp/session_api.h
+./helpers/read_only.lo: ../include/net-snmp/library/callback.h
 ./helpers/read_only.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/read_only.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/read_only.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -2593,11 +2755,31 @@
 ./helpers/read_only.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/read_only.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/read_only.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/read_only.lo: ../include/net-snmp/pdu_api.h
-./helpers/read_only.lo: ../include/net-snmp/mib_api.h
 ./helpers/read_only.lo: ../include/net-snmp/library/mib.h
+./helpers/read_only.lo: ../include/net-snmp/mib_api.h
 ./helpers/read_only.lo: ../include/net-snmp/library/parse.h
-./helpers/read_only.lo: ../include/net-snmp/varbind_api.h
+./helpers/read_only.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/read_only.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/read_only.lo: ../include/net-snmp/library/snmp.h
+./helpers/read_only.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/read_only.lo: ../include/net-snmp/library/getopt.h
+./helpers/read_only.lo: ../include/net-snmp/utilities.h
+./helpers/read_only.lo: ../include/net-snmp/library/system.h
+./helpers/read_only.lo: ../include/net-snmp/library/tools.h
+./helpers/read_only.lo: ../include/net-snmp/library/int64.h
+./helpers/read_only.lo: ../include/net-snmp/library/mt_support.h
+./helpers/read_only.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/read_only.lo: ../include/net-snmp/library/data_list.h
+./helpers/read_only.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/read_only.lo: ../include/net-snmp/library/container.h
+./helpers/read_only.lo: ../include/net-snmp/library/factory.h
+./helpers/read_only.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/read_only.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/read_only.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/read_only.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/read_only.lo: ../include/net-snmp/library/container.h
+./helpers/read_only.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/read_only.lo: ../include/net-snmp/version.h
 ./helpers/read_only.lo: ../include/net-snmp/config_api.h
 ./helpers/read_only.lo: ../include/net-snmp/library/read_config.h
 ./helpers/read_only.lo: ../include/net-snmp/library/default_store.h
@@ -2652,39 +2834,17 @@
 ./helpers/read_only.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/read_only.lo: ../include/net-snmp/agent/mfd.h
 ./helpers/row_merge.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/row_merge.lo: ../include/net-snmp/system/linux.h
-./helpers/row_merge.lo: ../include/net-snmp/system/sysv.h
-./helpers/row_merge.lo: ../include/net-snmp/system/generic.h
-./helpers/row_merge.lo: ../include/net-snmp/machine/generic.h
 ./helpers/row_merge.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/row_merge.lo: ../include/net-snmp/definitions.h
 ./helpers/row_merge.lo: ../include/net-snmp/types.h
+./helpers/row_merge.lo: ../include/net-snmp/library/types.h
 ./helpers/row_merge.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/row_merge.lo: ../include/net-snmp/library/asn1.h
-./helpers/row_merge.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/row_merge.lo: ../include/net-snmp/library/snmp.h
-./helpers/row_merge.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/row_merge.lo: ../include/net-snmp/utilities.h
+./helpers/row_merge.lo: ../include/net-snmp/varbind_api.h
 ./helpers/row_merge.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/row_merge.lo: ../include/net-snmp/library/system.h
-./helpers/row_merge.lo: ../include/net-snmp/library/tools.h
-./helpers/row_merge.lo: ../include/net-snmp/library/int64.h
-./helpers/row_merge.lo: ../include/net-snmp/library/mt_support.h
-./helpers/row_merge.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/row_merge.lo: ../include/net-snmp/library/callback.h
-./helpers/row_merge.lo: ../include/net-snmp/library/data_list.h
-./helpers/row_merge.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/row_merge.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/row_merge.lo: ../include/net-snmp/library/container.h
-./helpers/row_merge.lo: ../include/net-snmp/library/factory.h
-./helpers/row_merge.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/row_merge.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/row_merge.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/row_merge.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/row_merge.lo: ../include/net-snmp/library/container.h
-./helpers/row_merge.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/row_merge.lo: ../include/net-snmp/version.h
+./helpers/row_merge.lo: ../include/net-snmp/pdu_api.h
+./helpers/row_merge.lo: ../include/net-snmp/library/asn1.h
 ./helpers/row_merge.lo: ../include/net-snmp/session_api.h
+./helpers/row_merge.lo: ../include/net-snmp/library/callback.h
 ./helpers/row_merge.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/row_merge.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/row_merge.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -2695,11 +2855,31 @@
 ./helpers/row_merge.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/row_merge.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/row_merge.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/row_merge.lo: ../include/net-snmp/pdu_api.h
-./helpers/row_merge.lo: ../include/net-snmp/mib_api.h
 ./helpers/row_merge.lo: ../include/net-snmp/library/mib.h
+./helpers/row_merge.lo: ../include/net-snmp/mib_api.h
 ./helpers/row_merge.lo: ../include/net-snmp/library/parse.h
-./helpers/row_merge.lo: ../include/net-snmp/varbind_api.h
+./helpers/row_merge.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/row_merge.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/row_merge.lo: ../include/net-snmp/library/snmp.h
+./helpers/row_merge.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/row_merge.lo: ../include/net-snmp/library/getopt.h
+./helpers/row_merge.lo: ../include/net-snmp/utilities.h
+./helpers/row_merge.lo: ../include/net-snmp/library/system.h
+./helpers/row_merge.lo: ../include/net-snmp/library/tools.h
+./helpers/row_merge.lo: ../include/net-snmp/library/int64.h
+./helpers/row_merge.lo: ../include/net-snmp/library/mt_support.h
+./helpers/row_merge.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/row_merge.lo: ../include/net-snmp/library/data_list.h
+./helpers/row_merge.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/row_merge.lo: ../include/net-snmp/library/container.h
+./helpers/row_merge.lo: ../include/net-snmp/library/factory.h
+./helpers/row_merge.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/row_merge.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/row_merge.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/row_merge.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/row_merge.lo: ../include/net-snmp/library/container.h
+./helpers/row_merge.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/row_merge.lo: ../include/net-snmp/version.h
 ./helpers/row_merge.lo: ../include/net-snmp/config_api.h
 ./helpers/row_merge.lo: ../include/net-snmp/library/read_config.h
 ./helpers/row_merge.lo: ../include/net-snmp/library/default_store.h
@@ -2754,39 +2934,17 @@
 ./helpers/row_merge.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/row_merge.lo: ../include/net-snmp/agent/mfd.h
 ./helpers/scalar.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/scalar.lo: ../include/net-snmp/system/linux.h
-./helpers/scalar.lo: ../include/net-snmp/system/sysv.h
-./helpers/scalar.lo: ../include/net-snmp/system/generic.h
-./helpers/scalar.lo: ../include/net-snmp/machine/generic.h
 ./helpers/scalar.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/scalar.lo: ../include/net-snmp/definitions.h
 ./helpers/scalar.lo: ../include/net-snmp/types.h
+./helpers/scalar.lo: ../include/net-snmp/library/types.h
 ./helpers/scalar.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/scalar.lo: ../include/net-snmp/library/asn1.h
-./helpers/scalar.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/scalar.lo: ../include/net-snmp/library/snmp.h
-./helpers/scalar.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/scalar.lo: ../include/net-snmp/utilities.h
+./helpers/scalar.lo: ../include/net-snmp/varbind_api.h
 ./helpers/scalar.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/scalar.lo: ../include/net-snmp/library/system.h
-./helpers/scalar.lo: ../include/net-snmp/library/tools.h
-./helpers/scalar.lo: ../include/net-snmp/library/int64.h
-./helpers/scalar.lo: ../include/net-snmp/library/mt_support.h
-./helpers/scalar.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/scalar.lo: ../include/net-snmp/library/callback.h
-./helpers/scalar.lo: ../include/net-snmp/library/data_list.h
-./helpers/scalar.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/scalar.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/scalar.lo: ../include/net-snmp/library/container.h
-./helpers/scalar.lo: ../include/net-snmp/library/factory.h
-./helpers/scalar.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/scalar.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/scalar.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/scalar.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/scalar.lo: ../include/net-snmp/library/container.h
-./helpers/scalar.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/scalar.lo: ../include/net-snmp/version.h
+./helpers/scalar.lo: ../include/net-snmp/pdu_api.h
+./helpers/scalar.lo: ../include/net-snmp/library/asn1.h
 ./helpers/scalar.lo: ../include/net-snmp/session_api.h
+./helpers/scalar.lo: ../include/net-snmp/library/callback.h
 ./helpers/scalar.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/scalar.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/scalar.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -2797,11 +2955,31 @@
 ./helpers/scalar.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/scalar.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/scalar.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/scalar.lo: ../include/net-snmp/pdu_api.h
-./helpers/scalar.lo: ../include/net-snmp/mib_api.h
 ./helpers/scalar.lo: ../include/net-snmp/library/mib.h
+./helpers/scalar.lo: ../include/net-snmp/mib_api.h
 ./helpers/scalar.lo: ../include/net-snmp/library/parse.h
-./helpers/scalar.lo: ../include/net-snmp/varbind_api.h
+./helpers/scalar.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/scalar.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/scalar.lo: ../include/net-snmp/library/snmp.h
+./helpers/scalar.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/scalar.lo: ../include/net-snmp/library/getopt.h
+./helpers/scalar.lo: ../include/net-snmp/utilities.h
+./helpers/scalar.lo: ../include/net-snmp/library/system.h
+./helpers/scalar.lo: ../include/net-snmp/library/tools.h
+./helpers/scalar.lo: ../include/net-snmp/library/int64.h
+./helpers/scalar.lo: ../include/net-snmp/library/mt_support.h
+./helpers/scalar.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/scalar.lo: ../include/net-snmp/library/data_list.h
+./helpers/scalar.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/scalar.lo: ../include/net-snmp/library/container.h
+./helpers/scalar.lo: ../include/net-snmp/library/factory.h
+./helpers/scalar.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/scalar.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/scalar.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/scalar.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/scalar.lo: ../include/net-snmp/library/container.h
+./helpers/scalar.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/scalar.lo: ../include/net-snmp/version.h
 ./helpers/scalar.lo: ../include/net-snmp/config_api.h
 ./helpers/scalar.lo: ../include/net-snmp/library/read_config.h
 ./helpers/scalar.lo: ../include/net-snmp/library/default_store.h
@@ -2856,39 +3034,17 @@
 ./helpers/scalar.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/scalar.lo: ../include/net-snmp/agent/mfd.h
 ./helpers/scalar_group.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/scalar_group.lo: ../include/net-snmp/system/linux.h
-./helpers/scalar_group.lo: ../include/net-snmp/system/sysv.h
-./helpers/scalar_group.lo: ../include/net-snmp/system/generic.h
-./helpers/scalar_group.lo: ../include/net-snmp/machine/generic.h
 ./helpers/scalar_group.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/scalar_group.lo: ../include/net-snmp/definitions.h
 ./helpers/scalar_group.lo: ../include/net-snmp/types.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/types.h
 ./helpers/scalar_group.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/scalar_group.lo: ../include/net-snmp/library/asn1.h
-./helpers/scalar_group.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/scalar_group.lo: ../include/net-snmp/library/snmp.h
-./helpers/scalar_group.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/scalar_group.lo: ../include/net-snmp/utilities.h
+./helpers/scalar_group.lo: ../include/net-snmp/varbind_api.h
 ./helpers/scalar_group.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/scalar_group.lo: ../include/net-snmp/library/system.h
-./helpers/scalar_group.lo: ../include/net-snmp/library/tools.h
-./helpers/scalar_group.lo: ../include/net-snmp/library/int64.h
-./helpers/scalar_group.lo: ../include/net-snmp/library/mt_support.h
-./helpers/scalar_group.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/scalar_group.lo: ../include/net-snmp/library/callback.h
-./helpers/scalar_group.lo: ../include/net-snmp/library/data_list.h
-./helpers/scalar_group.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/scalar_group.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/scalar_group.lo: ../include/net-snmp/library/container.h
-./helpers/scalar_group.lo: ../include/net-snmp/library/factory.h
-./helpers/scalar_group.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/scalar_group.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/scalar_group.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/scalar_group.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/scalar_group.lo: ../include/net-snmp/library/container.h
-./helpers/scalar_group.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/scalar_group.lo: ../include/net-snmp/version.h
+./helpers/scalar_group.lo: ../include/net-snmp/pdu_api.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/asn1.h
 ./helpers/scalar_group.lo: ../include/net-snmp/session_api.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/callback.h
 ./helpers/scalar_group.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/scalar_group.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/scalar_group.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -2899,11 +3055,31 @@
 ./helpers/scalar_group.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/scalar_group.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/scalar_group.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/scalar_group.lo: ../include/net-snmp/pdu_api.h
-./helpers/scalar_group.lo: ../include/net-snmp/mib_api.h
 ./helpers/scalar_group.lo: ../include/net-snmp/library/mib.h
+./helpers/scalar_group.lo: ../include/net-snmp/mib_api.h
 ./helpers/scalar_group.lo: ../include/net-snmp/library/parse.h
-./helpers/scalar_group.lo: ../include/net-snmp/varbind_api.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/snmp.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/getopt.h
+./helpers/scalar_group.lo: ../include/net-snmp/utilities.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/system.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/tools.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/int64.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/mt_support.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/data_list.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/container.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/factory.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/container.h
+./helpers/scalar_group.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/scalar_group.lo: ../include/net-snmp/version.h
 ./helpers/scalar_group.lo: ../include/net-snmp/config_api.h
 ./helpers/scalar_group.lo: ../include/net-snmp/library/read_config.h
 ./helpers/scalar_group.lo: ../include/net-snmp/library/default_store.h
@@ -2958,39 +3134,17 @@
 ./helpers/scalar_group.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/scalar_group.lo: ../include/net-snmp/agent/mfd.h
 ./helpers/serialize.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/serialize.lo: ../include/net-snmp/system/linux.h
-./helpers/serialize.lo: ../include/net-snmp/system/sysv.h
-./helpers/serialize.lo: ../include/net-snmp/system/generic.h
-./helpers/serialize.lo: ../include/net-snmp/machine/generic.h
 ./helpers/serialize.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/serialize.lo: ../include/net-snmp/definitions.h
 ./helpers/serialize.lo: ../include/net-snmp/types.h
+./helpers/serialize.lo: ../include/net-snmp/library/types.h
 ./helpers/serialize.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/serialize.lo: ../include/net-snmp/library/asn1.h
-./helpers/serialize.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/serialize.lo: ../include/net-snmp/library/snmp.h
-./helpers/serialize.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/serialize.lo: ../include/net-snmp/utilities.h
+./helpers/serialize.lo: ../include/net-snmp/varbind_api.h
 ./helpers/serialize.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/serialize.lo: ../include/net-snmp/library/system.h
-./helpers/serialize.lo: ../include/net-snmp/library/tools.h
-./helpers/serialize.lo: ../include/net-snmp/library/int64.h
-./helpers/serialize.lo: ../include/net-snmp/library/mt_support.h
-./helpers/serialize.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/serialize.lo: ../include/net-snmp/library/callback.h
-./helpers/serialize.lo: ../include/net-snmp/library/data_list.h
-./helpers/serialize.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/serialize.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/serialize.lo: ../include/net-snmp/library/container.h
-./helpers/serialize.lo: ../include/net-snmp/library/factory.h
-./helpers/serialize.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/serialize.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/serialize.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/serialize.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/serialize.lo: ../include/net-snmp/library/container.h
-./helpers/serialize.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/serialize.lo: ../include/net-snmp/version.h
+./helpers/serialize.lo: ../include/net-snmp/pdu_api.h
+./helpers/serialize.lo: ../include/net-snmp/library/asn1.h
 ./helpers/serialize.lo: ../include/net-snmp/session_api.h
+./helpers/serialize.lo: ../include/net-snmp/library/callback.h
 ./helpers/serialize.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/serialize.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/serialize.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -3001,11 +3155,31 @@
 ./helpers/serialize.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/serialize.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/serialize.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/serialize.lo: ../include/net-snmp/pdu_api.h
-./helpers/serialize.lo: ../include/net-snmp/mib_api.h
 ./helpers/serialize.lo: ../include/net-snmp/library/mib.h
+./helpers/serialize.lo: ../include/net-snmp/mib_api.h
 ./helpers/serialize.lo: ../include/net-snmp/library/parse.h
-./helpers/serialize.lo: ../include/net-snmp/varbind_api.h
+./helpers/serialize.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/serialize.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/serialize.lo: ../include/net-snmp/library/snmp.h
+./helpers/serialize.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/serialize.lo: ../include/net-snmp/library/getopt.h
+./helpers/serialize.lo: ../include/net-snmp/utilities.h
+./helpers/serialize.lo: ../include/net-snmp/library/system.h
+./helpers/serialize.lo: ../include/net-snmp/library/tools.h
+./helpers/serialize.lo: ../include/net-snmp/library/int64.h
+./helpers/serialize.lo: ../include/net-snmp/library/mt_support.h
+./helpers/serialize.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/serialize.lo: ../include/net-snmp/library/data_list.h
+./helpers/serialize.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/serialize.lo: ../include/net-snmp/library/container.h
+./helpers/serialize.lo: ../include/net-snmp/library/factory.h
+./helpers/serialize.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/serialize.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/serialize.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/serialize.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/serialize.lo: ../include/net-snmp/library/container.h
+./helpers/serialize.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/serialize.lo: ../include/net-snmp/version.h
 ./helpers/serialize.lo: ../include/net-snmp/config_api.h
 ./helpers/serialize.lo: ../include/net-snmp/library/read_config.h
 ./helpers/serialize.lo: ../include/net-snmp/library/default_store.h
@@ -3060,39 +3234,17 @@
 ./helpers/serialize.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/serialize.lo: ../include/net-snmp/agent/mfd.h
 ./helpers/stash_cache.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/stash_cache.lo: ../include/net-snmp/system/linux.h
-./helpers/stash_cache.lo: ../include/net-snmp/system/sysv.h
-./helpers/stash_cache.lo: ../include/net-snmp/system/generic.h
-./helpers/stash_cache.lo: ../include/net-snmp/machine/generic.h
 ./helpers/stash_cache.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/stash_cache.lo: ../include/net-snmp/definitions.h
 ./helpers/stash_cache.lo: ../include/net-snmp/types.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/types.h
 ./helpers/stash_cache.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/stash_cache.lo: ../include/net-snmp/library/asn1.h
-./helpers/stash_cache.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/stash_cache.lo: ../include/net-snmp/library/snmp.h
-./helpers/stash_cache.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/stash_cache.lo: ../include/net-snmp/utilities.h
+./helpers/stash_cache.lo: ../include/net-snmp/varbind_api.h
 ./helpers/stash_cache.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/stash_cache.lo: ../include/net-snmp/library/system.h
-./helpers/stash_cache.lo: ../include/net-snmp/library/tools.h
-./helpers/stash_cache.lo: ../include/net-snmp/library/int64.h
-./helpers/stash_cache.lo: ../include/net-snmp/library/mt_support.h
-./helpers/stash_cache.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/stash_cache.lo: ../include/net-snmp/library/callback.h
-./helpers/stash_cache.lo: ../include/net-snmp/library/data_list.h
-./helpers/stash_cache.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/stash_cache.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/stash_cache.lo: ../include/net-snmp/library/container.h
-./helpers/stash_cache.lo: ../include/net-snmp/library/factory.h
-./helpers/stash_cache.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/stash_cache.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/stash_cache.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/stash_cache.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/stash_cache.lo: ../include/net-snmp/library/container.h
-./helpers/stash_cache.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/stash_cache.lo: ../include/net-snmp/version.h
+./helpers/stash_cache.lo: ../include/net-snmp/pdu_api.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/asn1.h
 ./helpers/stash_cache.lo: ../include/net-snmp/session_api.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/callback.h
 ./helpers/stash_cache.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/stash_cache.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/stash_cache.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -3103,11 +3255,31 @@
 ./helpers/stash_cache.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/stash_cache.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/stash_cache.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/stash_cache.lo: ../include/net-snmp/pdu_api.h
-./helpers/stash_cache.lo: ../include/net-snmp/mib_api.h
 ./helpers/stash_cache.lo: ../include/net-snmp/library/mib.h
+./helpers/stash_cache.lo: ../include/net-snmp/mib_api.h
 ./helpers/stash_cache.lo: ../include/net-snmp/library/parse.h
-./helpers/stash_cache.lo: ../include/net-snmp/varbind_api.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/snmp.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/getopt.h
+./helpers/stash_cache.lo: ../include/net-snmp/utilities.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/system.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/tools.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/int64.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/mt_support.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/data_list.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/container.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/factory.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/container.h
+./helpers/stash_cache.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/stash_cache.lo: ../include/net-snmp/version.h
 ./helpers/stash_cache.lo: ../include/net-snmp/config_api.h
 ./helpers/stash_cache.lo: ../include/net-snmp/library/read_config.h
 ./helpers/stash_cache.lo: ../include/net-snmp/library/default_store.h
@@ -3164,39 +3336,17 @@
 ./helpers/stash_cache.lo: ../include/net-snmp/agent/stash_cache.h
 ./helpers/stash_cache.lo: ../include/net-snmp/agent/stash_to_next.h
 ./helpers/stash_to_next.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/stash_to_next.lo: ../include/net-snmp/system/linux.h
-./helpers/stash_to_next.lo: ../include/net-snmp/system/sysv.h
-./helpers/stash_to_next.lo: ../include/net-snmp/system/generic.h
-./helpers/stash_to_next.lo: ../include/net-snmp/machine/generic.h
 ./helpers/stash_to_next.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/stash_to_next.lo: ../include/net-snmp/definitions.h
 ./helpers/stash_to_next.lo: ../include/net-snmp/types.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/types.h
 ./helpers/stash_to_next.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/stash_to_next.lo: ../include/net-snmp/library/asn1.h
-./helpers/stash_to_next.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/stash_to_next.lo: ../include/net-snmp/library/snmp.h
-./helpers/stash_to_next.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/stash_to_next.lo: ../include/net-snmp/utilities.h
+./helpers/stash_to_next.lo: ../include/net-snmp/varbind_api.h
 ./helpers/stash_to_next.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/stash_to_next.lo: ../include/net-snmp/library/system.h
-./helpers/stash_to_next.lo: ../include/net-snmp/library/tools.h
-./helpers/stash_to_next.lo: ../include/net-snmp/library/int64.h
-./helpers/stash_to_next.lo: ../include/net-snmp/library/mt_support.h
-./helpers/stash_to_next.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/stash_to_next.lo: ../include/net-snmp/library/callback.h
-./helpers/stash_to_next.lo: ../include/net-snmp/library/data_list.h
-./helpers/stash_to_next.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/stash_to_next.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/stash_to_next.lo: ../include/net-snmp/library/container.h
-./helpers/stash_to_next.lo: ../include/net-snmp/library/factory.h
-./helpers/stash_to_next.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/stash_to_next.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/stash_to_next.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/stash_to_next.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/stash_to_next.lo: ../include/net-snmp/library/container.h
-./helpers/stash_to_next.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/stash_to_next.lo: ../include/net-snmp/version.h
+./helpers/stash_to_next.lo: ../include/net-snmp/pdu_api.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/asn1.h
 ./helpers/stash_to_next.lo: ../include/net-snmp/session_api.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/callback.h
 ./helpers/stash_to_next.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/stash_to_next.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/stash_to_next.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -3207,11 +3357,31 @@
 ./helpers/stash_to_next.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/stash_to_next.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/stash_to_next.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/stash_to_next.lo: ../include/net-snmp/pdu_api.h
-./helpers/stash_to_next.lo: ../include/net-snmp/mib_api.h
 ./helpers/stash_to_next.lo: ../include/net-snmp/library/mib.h
+./helpers/stash_to_next.lo: ../include/net-snmp/mib_api.h
 ./helpers/stash_to_next.lo: ../include/net-snmp/library/parse.h
-./helpers/stash_to_next.lo: ../include/net-snmp/varbind_api.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/snmp.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/getopt.h
+./helpers/stash_to_next.lo: ../include/net-snmp/utilities.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/system.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/tools.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/int64.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/mt_support.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/data_list.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/container.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/factory.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/container.h
+./helpers/stash_to_next.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/stash_to_next.lo: ../include/net-snmp/version.h
 ./helpers/stash_to_next.lo: ../include/net-snmp/config_api.h
 ./helpers/stash_to_next.lo: ../include/net-snmp/library/read_config.h
 ./helpers/stash_to_next.lo: ../include/net-snmp/library/default_store.h
@@ -3265,144 +3435,20 @@
 ./helpers/stash_to_next.lo: ../include/net-snmp/agent/table_container.h
 ./helpers/stash_to_next.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/stash_to_next.lo: ../include/net-snmp/agent/mfd.h
-./helpers/stash_to_next.lo: ../include/net-snmp/agent/stash_cache.h
 ./helpers/stash_to_next.lo: ../include/net-snmp/agent/stash_to_next.h
-./helpers/table.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/table.lo: ../include/net-snmp/system/linux.h
-./helpers/table.lo: ../include/net-snmp/system/sysv.h
-./helpers/table.lo: ../include/net-snmp/system/generic.h
-./helpers/table.lo: ../include/net-snmp/machine/generic.h
-./helpers/table.lo: ../include/net-snmp/net-snmp-includes.h
-./helpers/table.lo: ../include/net-snmp/definitions.h
-./helpers/table.lo: ../include/net-snmp/types.h
-./helpers/table.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/table.lo: ../include/net-snmp/library/asn1.h
-./helpers/table.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/table.lo: ../include/net-snmp/library/snmp.h
-./helpers/table.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/table.lo: ../include/net-snmp/utilities.h
-./helpers/table.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/table.lo: ../include/net-snmp/library/system.h
-./helpers/table.lo: ../include/net-snmp/library/tools.h
-./helpers/table.lo: ../include/net-snmp/library/int64.h
-./helpers/table.lo: ../include/net-snmp/library/mt_support.h
-./helpers/table.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/table.lo: ../include/net-snmp/library/callback.h
-./helpers/table.lo: ../include/net-snmp/library/data_list.h
-./helpers/table.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/table.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/table.lo: ../include/net-snmp/library/container.h
-./helpers/table.lo: ../include/net-snmp/library/factory.h
-./helpers/table.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/table.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/table.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/table.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/table.lo: ../include/net-snmp/library/container.h
-./helpers/table.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/table.lo: ../include/net-snmp/version.h
-./helpers/table.lo: ../include/net-snmp/session_api.h
-./helpers/table.lo: ../include/net-snmp/library/snmp_transport.h
-./helpers/table.lo: ../include/net-snmp/library/snmp_service.h
-./helpers/table.lo: ../include/net-snmp/library/snmpCallbackDomain.h
-./helpers/table.lo: ../include/net-snmp/library/snmpUnixDomain.h
-./helpers/table.lo: ../include/net-snmp/library/snmpUDPDomain.h
-./helpers/table.lo: ../include/net-snmp/library/snmpTCPDomain.h
-./helpers/table.lo: ../include/net-snmp/library/snmpUDPIPv6Domain.h
-./helpers/table.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
-./helpers/table.lo: ../include/net-snmp/library/snmpIPXDomain.h
-./helpers/table.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/table.lo: ../include/net-snmp/pdu_api.h
-./helpers/table.lo: ../include/net-snmp/mib_api.h
-./helpers/table.lo: ../include/net-snmp/library/mib.h
-./helpers/table.lo: ../include/net-snmp/library/parse.h
-./helpers/table.lo: ../include/net-snmp/varbind_api.h
-./helpers/table.lo: ../include/net-snmp/config_api.h
-./helpers/table.lo: ../include/net-snmp/library/read_config.h
-./helpers/table.lo: ../include/net-snmp/library/default_store.h
-./helpers/table.lo: ../include/net-snmp/library/snmp_parse_args.h
-./helpers/table.lo: ../include/net-snmp/library/snmp_enum.h
-./helpers/table.lo: ../include/net-snmp/library/vacm.h
-./helpers/table.lo: ../include/net-snmp/output_api.h
-./helpers/table.lo: ../include/net-snmp/library/snmp_debug.h
-./helpers/table.lo: ../include/net-snmp/snmpv3_api.h
-./helpers/table.lo: ../include/net-snmp/library/snmpv3.h
-./helpers/table.lo: ../include/net-snmp/library/transform_oids.h
-./helpers/table.lo: ../include/net-snmp/library/keytools.h
-./helpers/table.lo: ../include/net-snmp/library/scapi.h
-./helpers/table.lo: ../include/net-snmp/library/lcd_time.h
-./helpers/table.lo: ../include/net-snmp/library/snmp_secmod.h
-./helpers/table.lo: ../include/net-snmp/library/snmpv3-security-includes.h
-./helpers/table.lo: ../include/net-snmp/library/snmpusm.h
-./helpers/table.lo: ../include/net-snmp/agent/net-snmp-agent-includes.h
-./helpers/table.lo: ../include/net-snmp/agent/mib_module_config.h
-./helpers/table.lo: ../include/net-snmp/agent/agent_module_config.h
-./helpers/table.lo: ../include/net-snmp/agent/snmp_agent.h
-./helpers/table.lo: ../include/net-snmp/agent/snmp_vars.h
-./helpers/table.lo: ../include/net-snmp/agent/agent_handler.h
-./helpers/table.lo: ../include/net-snmp/agent/var_struct.h
-./helpers/table.lo: ../include/net-snmp/agent/agent_registry.h
-./helpers/table.lo: ../include/net-snmp/library/fd_event_manager.h
-./helpers/table.lo: ../include/net-snmp/agent/ds_agent.h
-./helpers/table.lo: ../include/net-snmp/agent/agent_read_config.h
-./helpers/table.lo: ../include/net-snmp/agent/agent_trap.h
-./helpers/table.lo: ../include/net-snmp/agent/all_helpers.h
-./helpers/table.lo: ../include/net-snmp/agent/instance.h
-./helpers/table.lo: ../include/net-snmp/agent/baby_steps.h
-./helpers/table.lo: ../include/net-snmp/agent/scalar.h
-./helpers/table.lo: ../include/net-snmp/agent/scalar_group.h
-./helpers/table.lo: ../include/net-snmp/agent/watcher.h
-./helpers/table.lo: ../include/net-snmp/agent/multiplexer.h
-./helpers/table.lo: ../include/net-snmp/agent/null.h
-./helpers/table.lo: ../include/net-snmp/agent/debug_handler.h
-./helpers/table.lo: ../include/net-snmp/agent/cache_handler.h
-./helpers/table.lo: ../include/net-snmp/agent/old_api.h
-./helpers/table.lo: ../include/net-snmp/agent/read_only.h
-./helpers/table.lo: ../include/net-snmp/agent/row_merge.h
-./helpers/table.lo: ../include/net-snmp/agent/serialize.h
-./helpers/table.lo: ../include/net-snmp/agent/bulk_to_next.h
-./helpers/table.lo: ../include/net-snmp/agent/mode_end_call.h
-./helpers/table.lo: ../include/net-snmp/agent/table.h
-./helpers/table.lo: ../include/net-snmp/agent/table_data.h
-./helpers/table.lo: ../include/net-snmp/agent/table_dataset.h
-./helpers/table.lo: ../include/net-snmp/agent/table_tdata.h
-./helpers/table.lo: ../include/net-snmp/agent/table_iterator.h
-./helpers/table.lo: ../include/net-snmp/agent/table_container.h
-./helpers/table.lo: ../include/net-snmp/agent/table_array.h
-./helpers/table.lo: ../include/net-snmp/agent/mfd.h
+./helpers/stash_to_next.lo: ../include/net-snmp/agent/stash_cache.h
 ./helpers/table_array.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/table_array.lo: ../include/net-snmp/system/linux.h
-./helpers/table_array.lo: ../include/net-snmp/system/sysv.h
-./helpers/table_array.lo: ../include/net-snmp/system/generic.h
-./helpers/table_array.lo: ../include/net-snmp/machine/generic.h
 ./helpers/table_array.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/table_array.lo: ../include/net-snmp/definitions.h
 ./helpers/table_array.lo: ../include/net-snmp/types.h
+./helpers/table_array.lo: ../include/net-snmp/library/types.h
 ./helpers/table_array.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/table_array.lo: ../include/net-snmp/library/asn1.h
-./helpers/table_array.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/table_array.lo: ../include/net-snmp/library/snmp.h
-./helpers/table_array.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/table_array.lo: ../include/net-snmp/utilities.h
+./helpers/table_array.lo: ../include/net-snmp/varbind_api.h
 ./helpers/table_array.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/table_array.lo: ../include/net-snmp/library/system.h
-./helpers/table_array.lo: ../include/net-snmp/library/tools.h
-./helpers/table_array.lo: ../include/net-snmp/library/int64.h
-./helpers/table_array.lo: ../include/net-snmp/library/mt_support.h
-./helpers/table_array.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/table_array.lo: ../include/net-snmp/library/callback.h
-./helpers/table_array.lo: ../include/net-snmp/library/data_list.h
-./helpers/table_array.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/table_array.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/table_array.lo: ../include/net-snmp/library/container.h
-./helpers/table_array.lo: ../include/net-snmp/library/factory.h
-./helpers/table_array.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/table_array.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/table_array.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/table_array.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/table_array.lo: ../include/net-snmp/library/container.h
-./helpers/table_array.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/table_array.lo: ../include/net-snmp/version.h
+./helpers/table_array.lo: ../include/net-snmp/pdu_api.h
+./helpers/table_array.lo: ../include/net-snmp/library/asn1.h
 ./helpers/table_array.lo: ../include/net-snmp/session_api.h
+./helpers/table_array.lo: ../include/net-snmp/library/callback.h
 ./helpers/table_array.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/table_array.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/table_array.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -3413,11 +3459,31 @@
 ./helpers/table_array.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/table_array.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/table_array.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/table_array.lo: ../include/net-snmp/pdu_api.h
-./helpers/table_array.lo: ../include/net-snmp/mib_api.h
 ./helpers/table_array.lo: ../include/net-snmp/library/mib.h
+./helpers/table_array.lo: ../include/net-snmp/mib_api.h
 ./helpers/table_array.lo: ../include/net-snmp/library/parse.h
-./helpers/table_array.lo: ../include/net-snmp/varbind_api.h
+./helpers/table_array.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/table_array.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/table_array.lo: ../include/net-snmp/library/snmp.h
+./helpers/table_array.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/table_array.lo: ../include/net-snmp/library/getopt.h
+./helpers/table_array.lo: ../include/net-snmp/utilities.h
+./helpers/table_array.lo: ../include/net-snmp/library/system.h
+./helpers/table_array.lo: ../include/net-snmp/library/tools.h
+./helpers/table_array.lo: ../include/net-snmp/library/int64.h
+./helpers/table_array.lo: ../include/net-snmp/library/mt_support.h
+./helpers/table_array.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/table_array.lo: ../include/net-snmp/library/data_list.h
+./helpers/table_array.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/table_array.lo: ../include/net-snmp/library/container.h
+./helpers/table_array.lo: ../include/net-snmp/library/factory.h
+./helpers/table_array.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/table_array.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/table_array.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/table_array.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/table_array.lo: ../include/net-snmp/library/container.h
+./helpers/table_array.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/table_array.lo: ../include/net-snmp/version.h
 ./helpers/table_array.lo: ../include/net-snmp/config_api.h
 ./helpers/table_array.lo: ../include/net-snmp/library/read_config.h
 ./helpers/table_array.lo: ../include/net-snmp/library/default_store.h
@@ -3471,40 +3537,118 @@
 ./helpers/table_array.lo: ../include/net-snmp/agent/table_container.h
 ./helpers/table_array.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/table_array.lo: ../include/net-snmp/agent/mfd.h
+./helpers/table.lo: ../include/net-snmp/net-snmp-config.h
+./helpers/table.lo: ../include/net-snmp/net-snmp-includes.h
+./helpers/table.lo: ../include/net-snmp/definitions.h
+./helpers/table.lo: ../include/net-snmp/types.h
+./helpers/table.lo: ../include/net-snmp/library/types.h
+./helpers/table.lo: ../include/net-snmp/library/snmp_api.h
+./helpers/table.lo: ../include/net-snmp/varbind_api.h
+./helpers/table.lo: ../include/net-snmp/library/snmp_client.h
+./helpers/table.lo: ../include/net-snmp/pdu_api.h
+./helpers/table.lo: ../include/net-snmp/library/asn1.h
+./helpers/table.lo: ../include/net-snmp/session_api.h
+./helpers/table.lo: ../include/net-snmp/library/callback.h
+./helpers/table.lo: ../include/net-snmp/library/snmp_transport.h
+./helpers/table.lo: ../include/net-snmp/library/snmp_service.h
+./helpers/table.lo: ../include/net-snmp/library/snmpCallbackDomain.h
+./helpers/table.lo: ../include/net-snmp/library/snmpUnixDomain.h
+./helpers/table.lo: ../include/net-snmp/library/snmpUDPDomain.h
+./helpers/table.lo: ../include/net-snmp/library/snmpTCPDomain.h
+./helpers/table.lo: ../include/net-snmp/library/snmpUDPIPv6Domain.h
+./helpers/table.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
+./helpers/table.lo: ../include/net-snmp/library/snmpIPXDomain.h
+./helpers/table.lo: ../include/net-snmp/library/ucd_compat.h
+./helpers/table.lo: ../include/net-snmp/library/mib.h
+./helpers/table.lo: ../include/net-snmp/mib_api.h
+./helpers/table.lo: ../include/net-snmp/library/parse.h
+./helpers/table.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/table.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/table.lo: ../include/net-snmp/library/snmp.h
+./helpers/table.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/table.lo: ../include/net-snmp/library/getopt.h
+./helpers/table.lo: ../include/net-snmp/utilities.h
+./helpers/table.lo: ../include/net-snmp/library/system.h
+./helpers/table.lo: ../include/net-snmp/library/tools.h
+./helpers/table.lo: ../include/net-snmp/library/int64.h
+./helpers/table.lo: ../include/net-snmp/library/mt_support.h
+./helpers/table.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/table.lo: ../include/net-snmp/library/data_list.h
+./helpers/table.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/table.lo: ../include/net-snmp/library/container.h
+./helpers/table.lo: ../include/net-snmp/library/factory.h
+./helpers/table.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/table.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/table.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/table.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/table.lo: ../include/net-snmp/library/container.h
+./helpers/table.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/table.lo: ../include/net-snmp/version.h
+./helpers/table.lo: ../include/net-snmp/config_api.h
+./helpers/table.lo: ../include/net-snmp/library/read_config.h
+./helpers/table.lo: ../include/net-snmp/library/default_store.h
+./helpers/table.lo: ../include/net-snmp/library/snmp_parse_args.h
+./helpers/table.lo: ../include/net-snmp/library/snmp_enum.h
+./helpers/table.lo: ../include/net-snmp/library/vacm.h
+./helpers/table.lo: ../include/net-snmp/output_api.h
+./helpers/table.lo: ../include/net-snmp/library/snmp_debug.h
+./helpers/table.lo: ../include/net-snmp/snmpv3_api.h
+./helpers/table.lo: ../include/net-snmp/library/snmpv3.h
+./helpers/table.lo: ../include/net-snmp/library/transform_oids.h
+./helpers/table.lo: ../include/net-snmp/library/keytools.h
+./helpers/table.lo: ../include/net-snmp/library/scapi.h
+./helpers/table.lo: ../include/net-snmp/library/lcd_time.h
+./helpers/table.lo: ../include/net-snmp/library/snmp_secmod.h
+./helpers/table.lo: ../include/net-snmp/library/snmpv3-security-includes.h
+./helpers/table.lo: ../include/net-snmp/library/snmpusm.h
+./helpers/table.lo: ../include/net-snmp/agent/net-snmp-agent-includes.h
+./helpers/table.lo: ../include/net-snmp/agent/mib_module_config.h
+./helpers/table.lo: ../include/net-snmp/agent/agent_module_config.h
+./helpers/table.lo: ../include/net-snmp/agent/snmp_agent.h
+./helpers/table.lo: ../include/net-snmp/agent/snmp_vars.h
+./helpers/table.lo: ../include/net-snmp/agent/agent_handler.h
+./helpers/table.lo: ../include/net-snmp/agent/var_struct.h
+./helpers/table.lo: ../include/net-snmp/agent/agent_registry.h
+./helpers/table.lo: ../include/net-snmp/library/fd_event_manager.h
+./helpers/table.lo: ../include/net-snmp/agent/ds_agent.h
+./helpers/table.lo: ../include/net-snmp/agent/agent_read_config.h
+./helpers/table.lo: ../include/net-snmp/agent/agent_trap.h
+./helpers/table.lo: ../include/net-snmp/agent/all_helpers.h
+./helpers/table.lo: ../include/net-snmp/agent/instance.h
+./helpers/table.lo: ../include/net-snmp/agent/baby_steps.h
+./helpers/table.lo: ../include/net-snmp/agent/scalar.h
+./helpers/table.lo: ../include/net-snmp/agent/scalar_group.h
+./helpers/table.lo: ../include/net-snmp/agent/watcher.h
+./helpers/table.lo: ../include/net-snmp/agent/multiplexer.h
+./helpers/table.lo: ../include/net-snmp/agent/null.h
+./helpers/table.lo: ../include/net-snmp/agent/debug_handler.h
+./helpers/table.lo: ../include/net-snmp/agent/cache_handler.h
+./helpers/table.lo: ../include/net-snmp/agent/old_api.h
+./helpers/table.lo: ../include/net-snmp/agent/read_only.h
+./helpers/table.lo: ../include/net-snmp/agent/row_merge.h
+./helpers/table.lo: ../include/net-snmp/agent/serialize.h
+./helpers/table.lo: ../include/net-snmp/agent/bulk_to_next.h
+./helpers/table.lo: ../include/net-snmp/agent/mode_end_call.h
+./helpers/table.lo: ../include/net-snmp/agent/table.h
+./helpers/table.lo: ../include/net-snmp/agent/table_data.h
+./helpers/table.lo: ../include/net-snmp/agent/table_dataset.h
+./helpers/table.lo: ../include/net-snmp/agent/table_tdata.h
+./helpers/table.lo: ../include/net-snmp/agent/table_iterator.h
+./helpers/table.lo: ../include/net-snmp/agent/table_container.h
+./helpers/table.lo: ../include/net-snmp/agent/table_array.h
+./helpers/table.lo: ../include/net-snmp/agent/mfd.h
 ./helpers/table_container.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/table_container.lo: ../include/net-snmp/system/linux.h
-./helpers/table_container.lo: ../include/net-snmp/system/sysv.h
-./helpers/table_container.lo: ../include/net-snmp/system/generic.h
-./helpers/table_container.lo: ../include/net-snmp/machine/generic.h
 ./helpers/table_container.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/table_container.lo: ../include/net-snmp/definitions.h
 ./helpers/table_container.lo: ../include/net-snmp/types.h
+./helpers/table_container.lo: ../include/net-snmp/library/types.h
 ./helpers/table_container.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/table_container.lo: ../include/net-snmp/library/asn1.h
-./helpers/table_container.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/table_container.lo: ../include/net-snmp/library/snmp.h
-./helpers/table_container.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/table_container.lo: ../include/net-snmp/utilities.h
+./helpers/table_container.lo: ../include/net-snmp/varbind_api.h
 ./helpers/table_container.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/table_container.lo: ../include/net-snmp/library/system.h
-./helpers/table_container.lo: ../include/net-snmp/library/tools.h
-./helpers/table_container.lo: ../include/net-snmp/library/int64.h
-./helpers/table_container.lo: ../include/net-snmp/library/mt_support.h
-./helpers/table_container.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/table_container.lo: ../include/net-snmp/library/callback.h
-./helpers/table_container.lo: ../include/net-snmp/library/data_list.h
-./helpers/table_container.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/table_container.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/table_container.lo: ../include/net-snmp/library/container.h
-./helpers/table_container.lo: ../include/net-snmp/library/factory.h
-./helpers/table_container.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/table_container.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/table_container.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/table_container.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/table_container.lo: ../include/net-snmp/library/container.h
-./helpers/table_container.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/table_container.lo: ../include/net-snmp/version.h
+./helpers/table_container.lo: ../include/net-snmp/pdu_api.h
+./helpers/table_container.lo: ../include/net-snmp/library/asn1.h
 ./helpers/table_container.lo: ../include/net-snmp/session_api.h
+./helpers/table_container.lo: ../include/net-snmp/library/callback.h
 ./helpers/table_container.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/table_container.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/table_container.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -3515,11 +3659,31 @@
 ./helpers/table_container.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/table_container.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/table_container.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/table_container.lo: ../include/net-snmp/pdu_api.h
-./helpers/table_container.lo: ../include/net-snmp/mib_api.h
 ./helpers/table_container.lo: ../include/net-snmp/library/mib.h
+./helpers/table_container.lo: ../include/net-snmp/mib_api.h
 ./helpers/table_container.lo: ../include/net-snmp/library/parse.h
-./helpers/table_container.lo: ../include/net-snmp/varbind_api.h
+./helpers/table_container.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/table_container.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/table_container.lo: ../include/net-snmp/library/snmp.h
+./helpers/table_container.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/table_container.lo: ../include/net-snmp/library/getopt.h
+./helpers/table_container.lo: ../include/net-snmp/utilities.h
+./helpers/table_container.lo: ../include/net-snmp/library/system.h
+./helpers/table_container.lo: ../include/net-snmp/library/tools.h
+./helpers/table_container.lo: ../include/net-snmp/library/int64.h
+./helpers/table_container.lo: ../include/net-snmp/library/mt_support.h
+./helpers/table_container.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/table_container.lo: ../include/net-snmp/library/data_list.h
+./helpers/table_container.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/table_container.lo: ../include/net-snmp/library/container.h
+./helpers/table_container.lo: ../include/net-snmp/library/factory.h
+./helpers/table_container.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/table_container.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/table_container.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/table_container.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/table_container.lo: ../include/net-snmp/library/container.h
+./helpers/table_container.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/table_container.lo: ../include/net-snmp/version.h
 ./helpers/table_container.lo: ../include/net-snmp/config_api.h
 ./helpers/table_container.lo: ../include/net-snmp/library/read_config.h
 ./helpers/table_container.lo: ../include/net-snmp/library/default_store.h
@@ -3574,39 +3738,17 @@
 ./helpers/table_container.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/table_container.lo: ../include/net-snmp/agent/mfd.h
 ./helpers/table_data.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/table_data.lo: ../include/net-snmp/system/linux.h
-./helpers/table_data.lo: ../include/net-snmp/system/sysv.h
-./helpers/table_data.lo: ../include/net-snmp/system/generic.h
-./helpers/table_data.lo: ../include/net-snmp/machine/generic.h
 ./helpers/table_data.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/table_data.lo: ../include/net-snmp/definitions.h
 ./helpers/table_data.lo: ../include/net-snmp/types.h
+./helpers/table_data.lo: ../include/net-snmp/library/types.h
 ./helpers/table_data.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/table_data.lo: ../include/net-snmp/library/asn1.h
-./helpers/table_data.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/table_data.lo: ../include/net-snmp/library/snmp.h
-./helpers/table_data.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/table_data.lo: ../include/net-snmp/utilities.h
+./helpers/table_data.lo: ../include/net-snmp/varbind_api.h
 ./helpers/table_data.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/table_data.lo: ../include/net-snmp/library/system.h
-./helpers/table_data.lo: ../include/net-snmp/library/tools.h
-./helpers/table_data.lo: ../include/net-snmp/library/int64.h
-./helpers/table_data.lo: ../include/net-snmp/library/mt_support.h
-./helpers/table_data.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/table_data.lo: ../include/net-snmp/library/callback.h
-./helpers/table_data.lo: ../include/net-snmp/library/data_list.h
-./helpers/table_data.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/table_data.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/table_data.lo: ../include/net-snmp/library/container.h
-./helpers/table_data.lo: ../include/net-snmp/library/factory.h
-./helpers/table_data.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/table_data.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/table_data.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/table_data.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/table_data.lo: ../include/net-snmp/library/container.h
-./helpers/table_data.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/table_data.lo: ../include/net-snmp/version.h
+./helpers/table_data.lo: ../include/net-snmp/pdu_api.h
+./helpers/table_data.lo: ../include/net-snmp/library/asn1.h
 ./helpers/table_data.lo: ../include/net-snmp/session_api.h
+./helpers/table_data.lo: ../include/net-snmp/library/callback.h
 ./helpers/table_data.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/table_data.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/table_data.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -3617,11 +3759,31 @@
 ./helpers/table_data.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/table_data.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/table_data.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/table_data.lo: ../include/net-snmp/pdu_api.h
-./helpers/table_data.lo: ../include/net-snmp/mib_api.h
 ./helpers/table_data.lo: ../include/net-snmp/library/mib.h
+./helpers/table_data.lo: ../include/net-snmp/mib_api.h
 ./helpers/table_data.lo: ../include/net-snmp/library/parse.h
-./helpers/table_data.lo: ../include/net-snmp/varbind_api.h
+./helpers/table_data.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/table_data.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/table_data.lo: ../include/net-snmp/library/snmp.h
+./helpers/table_data.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/table_data.lo: ../include/net-snmp/library/getopt.h
+./helpers/table_data.lo: ../include/net-snmp/utilities.h
+./helpers/table_data.lo: ../include/net-snmp/library/system.h
+./helpers/table_data.lo: ../include/net-snmp/library/tools.h
+./helpers/table_data.lo: ../include/net-snmp/library/int64.h
+./helpers/table_data.lo: ../include/net-snmp/library/mt_support.h
+./helpers/table_data.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/table_data.lo: ../include/net-snmp/library/data_list.h
+./helpers/table_data.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/table_data.lo: ../include/net-snmp/library/container.h
+./helpers/table_data.lo: ../include/net-snmp/library/factory.h
+./helpers/table_data.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/table_data.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/table_data.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/table_data.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/table_data.lo: ../include/net-snmp/library/container.h
+./helpers/table_data.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/table_data.lo: ../include/net-snmp/version.h
 ./helpers/table_data.lo: ../include/net-snmp/config_api.h
 ./helpers/table_data.lo: ../include/net-snmp/library/read_config.h
 ./helpers/table_data.lo: ../include/net-snmp/library/default_store.h
@@ -3676,39 +3838,17 @@
 ./helpers/table_data.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/table_data.lo: ../include/net-snmp/agent/mfd.h
 ./helpers/table_dataset.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/table_dataset.lo: ../include/net-snmp/system/linux.h
-./helpers/table_dataset.lo: ../include/net-snmp/system/sysv.h
-./helpers/table_dataset.lo: ../include/net-snmp/system/generic.h
-./helpers/table_dataset.lo: ../include/net-snmp/machine/generic.h
 ./helpers/table_dataset.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/table_dataset.lo: ../include/net-snmp/definitions.h
 ./helpers/table_dataset.lo: ../include/net-snmp/types.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/types.h
 ./helpers/table_dataset.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/table_dataset.lo: ../include/net-snmp/library/asn1.h
-./helpers/table_dataset.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/table_dataset.lo: ../include/net-snmp/library/snmp.h
-./helpers/table_dataset.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/table_dataset.lo: ../include/net-snmp/utilities.h
+./helpers/table_dataset.lo: ../include/net-snmp/varbind_api.h
 ./helpers/table_dataset.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/table_dataset.lo: ../include/net-snmp/library/system.h
-./helpers/table_dataset.lo: ../include/net-snmp/library/tools.h
-./helpers/table_dataset.lo: ../include/net-snmp/library/int64.h
-./helpers/table_dataset.lo: ../include/net-snmp/library/mt_support.h
-./helpers/table_dataset.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/table_dataset.lo: ../include/net-snmp/library/callback.h
-./helpers/table_dataset.lo: ../include/net-snmp/library/data_list.h
-./helpers/table_dataset.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/table_dataset.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/table_dataset.lo: ../include/net-snmp/library/container.h
-./helpers/table_dataset.lo: ../include/net-snmp/library/factory.h
-./helpers/table_dataset.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/table_dataset.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/table_dataset.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/table_dataset.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/table_dataset.lo: ../include/net-snmp/library/container.h
-./helpers/table_dataset.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/table_dataset.lo: ../include/net-snmp/version.h
+./helpers/table_dataset.lo: ../include/net-snmp/pdu_api.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/asn1.h
 ./helpers/table_dataset.lo: ../include/net-snmp/session_api.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/callback.h
 ./helpers/table_dataset.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/table_dataset.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/table_dataset.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -3719,11 +3859,31 @@
 ./helpers/table_dataset.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/table_dataset.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/table_dataset.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/table_dataset.lo: ../include/net-snmp/pdu_api.h
-./helpers/table_dataset.lo: ../include/net-snmp/mib_api.h
 ./helpers/table_dataset.lo: ../include/net-snmp/library/mib.h
+./helpers/table_dataset.lo: ../include/net-snmp/mib_api.h
 ./helpers/table_dataset.lo: ../include/net-snmp/library/parse.h
-./helpers/table_dataset.lo: ../include/net-snmp/varbind_api.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/snmp.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/getopt.h
+./helpers/table_dataset.lo: ../include/net-snmp/utilities.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/system.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/tools.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/int64.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/mt_support.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/data_list.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/container.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/factory.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/container.h
+./helpers/table_dataset.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/table_dataset.lo: ../include/net-snmp/version.h
 ./helpers/table_dataset.lo: ../include/net-snmp/config_api.h
 ./helpers/table_dataset.lo: ../include/net-snmp/library/read_config.h
 ./helpers/table_dataset.lo: ../include/net-snmp/library/default_store.h
@@ -3778,39 +3938,17 @@
 ./helpers/table_dataset.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/table_dataset.lo: ../include/net-snmp/agent/mfd.h
 ./helpers/table_iterator.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/table_iterator.lo: ../include/net-snmp/system/linux.h
-./helpers/table_iterator.lo: ../include/net-snmp/system/sysv.h
-./helpers/table_iterator.lo: ../include/net-snmp/system/generic.h
-./helpers/table_iterator.lo: ../include/net-snmp/machine/generic.h
 ./helpers/table_iterator.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/table_iterator.lo: ../include/net-snmp/definitions.h
 ./helpers/table_iterator.lo: ../include/net-snmp/types.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/types.h
 ./helpers/table_iterator.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/table_iterator.lo: ../include/net-snmp/library/asn1.h
-./helpers/table_iterator.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/table_iterator.lo: ../include/net-snmp/library/snmp.h
-./helpers/table_iterator.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/table_iterator.lo: ../include/net-snmp/utilities.h
+./helpers/table_iterator.lo: ../include/net-snmp/varbind_api.h
 ./helpers/table_iterator.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/table_iterator.lo: ../include/net-snmp/library/system.h
-./helpers/table_iterator.lo: ../include/net-snmp/library/tools.h
-./helpers/table_iterator.lo: ../include/net-snmp/library/int64.h
-./helpers/table_iterator.lo: ../include/net-snmp/library/mt_support.h
-./helpers/table_iterator.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/table_iterator.lo: ../include/net-snmp/library/callback.h
-./helpers/table_iterator.lo: ../include/net-snmp/library/data_list.h
-./helpers/table_iterator.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/table_iterator.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/table_iterator.lo: ../include/net-snmp/library/container.h
-./helpers/table_iterator.lo: ../include/net-snmp/library/factory.h
-./helpers/table_iterator.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/table_iterator.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/table_iterator.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/table_iterator.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/table_iterator.lo: ../include/net-snmp/library/container.h
-./helpers/table_iterator.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/table_iterator.lo: ../include/net-snmp/version.h
+./helpers/table_iterator.lo: ../include/net-snmp/pdu_api.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/asn1.h
 ./helpers/table_iterator.lo: ../include/net-snmp/session_api.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/callback.h
 ./helpers/table_iterator.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/table_iterator.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/table_iterator.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -3821,11 +3959,31 @@
 ./helpers/table_iterator.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/table_iterator.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/table_iterator.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/table_iterator.lo: ../include/net-snmp/pdu_api.h
-./helpers/table_iterator.lo: ../include/net-snmp/mib_api.h
 ./helpers/table_iterator.lo: ../include/net-snmp/library/mib.h
+./helpers/table_iterator.lo: ../include/net-snmp/mib_api.h
 ./helpers/table_iterator.lo: ../include/net-snmp/library/parse.h
-./helpers/table_iterator.lo: ../include/net-snmp/varbind_api.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/snmp.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/getopt.h
+./helpers/table_iterator.lo: ../include/net-snmp/utilities.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/system.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/tools.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/int64.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/mt_support.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/data_list.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/container.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/factory.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/container.h
+./helpers/table_iterator.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/table_iterator.lo: ../include/net-snmp/version.h
 ./helpers/table_iterator.lo: ../include/net-snmp/config_api.h
 ./helpers/table_iterator.lo: ../include/net-snmp/library/read_config.h
 ./helpers/table_iterator.lo: ../include/net-snmp/library/default_store.h
@@ -3881,39 +4039,17 @@
 ./helpers/table_iterator.lo: ../include/net-snmp/agent/mfd.h
 ./helpers/table_iterator.lo: ../include/net-snmp/agent/stash_cache.h
 ./helpers/table_row.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/table_row.lo: ../include/net-snmp/system/linux.h
-./helpers/table_row.lo: ../include/net-snmp/system/sysv.h
-./helpers/table_row.lo: ../include/net-snmp/system/generic.h
-./helpers/table_row.lo: ../include/net-snmp/machine/generic.h
 ./helpers/table_row.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/table_row.lo: ../include/net-snmp/definitions.h
 ./helpers/table_row.lo: ../include/net-snmp/types.h
+./helpers/table_row.lo: ../include/net-snmp/library/types.h
 ./helpers/table_row.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/table_row.lo: ../include/net-snmp/library/asn1.h
-./helpers/table_row.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/table_row.lo: ../include/net-snmp/library/snmp.h
-./helpers/table_row.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/table_row.lo: ../include/net-snmp/utilities.h
+./helpers/table_row.lo: ../include/net-snmp/varbind_api.h
 ./helpers/table_row.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/table_row.lo: ../include/net-snmp/library/system.h
-./helpers/table_row.lo: ../include/net-snmp/library/tools.h
-./helpers/table_row.lo: ../include/net-snmp/library/int64.h
-./helpers/table_row.lo: ../include/net-snmp/library/mt_support.h
-./helpers/table_row.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/table_row.lo: ../include/net-snmp/library/callback.h
-./helpers/table_row.lo: ../include/net-snmp/library/data_list.h
-./helpers/table_row.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/table_row.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/table_row.lo: ../include/net-snmp/library/container.h
-./helpers/table_row.lo: ../include/net-snmp/library/factory.h
-./helpers/table_row.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/table_row.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/table_row.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/table_row.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/table_row.lo: ../include/net-snmp/library/container.h
-./helpers/table_row.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/table_row.lo: ../include/net-snmp/version.h
+./helpers/table_row.lo: ../include/net-snmp/pdu_api.h
+./helpers/table_row.lo: ../include/net-snmp/library/asn1.h
 ./helpers/table_row.lo: ../include/net-snmp/session_api.h
+./helpers/table_row.lo: ../include/net-snmp/library/callback.h
 ./helpers/table_row.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/table_row.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/table_row.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -3924,11 +4060,31 @@
 ./helpers/table_row.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/table_row.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/table_row.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/table_row.lo: ../include/net-snmp/pdu_api.h
-./helpers/table_row.lo: ../include/net-snmp/mib_api.h
 ./helpers/table_row.lo: ../include/net-snmp/library/mib.h
+./helpers/table_row.lo: ../include/net-snmp/mib_api.h
 ./helpers/table_row.lo: ../include/net-snmp/library/parse.h
-./helpers/table_row.lo: ../include/net-snmp/varbind_api.h
+./helpers/table_row.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/table_row.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/table_row.lo: ../include/net-snmp/library/snmp.h
+./helpers/table_row.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/table_row.lo: ../include/net-snmp/library/getopt.h
+./helpers/table_row.lo: ../include/net-snmp/utilities.h
+./helpers/table_row.lo: ../include/net-snmp/library/system.h
+./helpers/table_row.lo: ../include/net-snmp/library/tools.h
+./helpers/table_row.lo: ../include/net-snmp/library/int64.h
+./helpers/table_row.lo: ../include/net-snmp/library/mt_support.h
+./helpers/table_row.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/table_row.lo: ../include/net-snmp/library/data_list.h
+./helpers/table_row.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/table_row.lo: ../include/net-snmp/library/container.h
+./helpers/table_row.lo: ../include/net-snmp/library/factory.h
+./helpers/table_row.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/table_row.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/table_row.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/table_row.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/table_row.lo: ../include/net-snmp/library/container.h
+./helpers/table_row.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/table_row.lo: ../include/net-snmp/version.h
 ./helpers/table_row.lo: ../include/net-snmp/config_api.h
 ./helpers/table_row.lo: ../include/net-snmp/library/read_config.h
 ./helpers/table_row.lo: ../include/net-snmp/library/default_store.h
@@ -3983,39 +4139,17 @@
 ./helpers/table_row.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/table_row.lo: ../include/net-snmp/agent/mfd.h
 ./helpers/table_tdata.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/table_tdata.lo: ../include/net-snmp/system/linux.h
-./helpers/table_tdata.lo: ../include/net-snmp/system/sysv.h
-./helpers/table_tdata.lo: ../include/net-snmp/system/generic.h
-./helpers/table_tdata.lo: ../include/net-snmp/machine/generic.h
 ./helpers/table_tdata.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/table_tdata.lo: ../include/net-snmp/definitions.h
 ./helpers/table_tdata.lo: ../include/net-snmp/types.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/types.h
 ./helpers/table_tdata.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/table_tdata.lo: ../include/net-snmp/library/asn1.h
-./helpers/table_tdata.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/table_tdata.lo: ../include/net-snmp/library/snmp.h
-./helpers/table_tdata.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/table_tdata.lo: ../include/net-snmp/utilities.h
+./helpers/table_tdata.lo: ../include/net-snmp/varbind_api.h
 ./helpers/table_tdata.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/table_tdata.lo: ../include/net-snmp/library/system.h
-./helpers/table_tdata.lo: ../include/net-snmp/library/tools.h
-./helpers/table_tdata.lo: ../include/net-snmp/library/int64.h
-./helpers/table_tdata.lo: ../include/net-snmp/library/mt_support.h
-./helpers/table_tdata.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/table_tdata.lo: ../include/net-snmp/library/callback.h
-./helpers/table_tdata.lo: ../include/net-snmp/library/data_list.h
-./helpers/table_tdata.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/table_tdata.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/table_tdata.lo: ../include/net-snmp/library/container.h
-./helpers/table_tdata.lo: ../include/net-snmp/library/factory.h
-./helpers/table_tdata.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/table_tdata.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/table_tdata.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/table_tdata.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/table_tdata.lo: ../include/net-snmp/library/container.h
-./helpers/table_tdata.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/table_tdata.lo: ../include/net-snmp/version.h
+./helpers/table_tdata.lo: ../include/net-snmp/pdu_api.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/asn1.h
 ./helpers/table_tdata.lo: ../include/net-snmp/session_api.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/callback.h
 ./helpers/table_tdata.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/table_tdata.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/table_tdata.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -4026,11 +4160,31 @@
 ./helpers/table_tdata.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/table_tdata.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/table_tdata.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/table_tdata.lo: ../include/net-snmp/pdu_api.h
-./helpers/table_tdata.lo: ../include/net-snmp/mib_api.h
 ./helpers/table_tdata.lo: ../include/net-snmp/library/mib.h
+./helpers/table_tdata.lo: ../include/net-snmp/mib_api.h
 ./helpers/table_tdata.lo: ../include/net-snmp/library/parse.h
-./helpers/table_tdata.lo: ../include/net-snmp/varbind_api.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/snmp.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/getopt.h
+./helpers/table_tdata.lo: ../include/net-snmp/utilities.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/system.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/tools.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/int64.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/mt_support.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/data_list.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/container.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/factory.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/container.h
+./helpers/table_tdata.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/table_tdata.lo: ../include/net-snmp/version.h
 ./helpers/table_tdata.lo: ../include/net-snmp/config_api.h
 ./helpers/table_tdata.lo: ../include/net-snmp/library/read_config.h
 ./helpers/table_tdata.lo: ../include/net-snmp/library/default_store.h
@@ -4085,39 +4239,17 @@
 ./helpers/table_tdata.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/table_tdata.lo: ../include/net-snmp/agent/mfd.h
 ./helpers/watcher.lo: ../include/net-snmp/net-snmp-config.h
-./helpers/watcher.lo: ../include/net-snmp/system/linux.h
-./helpers/watcher.lo: ../include/net-snmp/system/sysv.h
-./helpers/watcher.lo: ../include/net-snmp/system/generic.h
-./helpers/watcher.lo: ../include/net-snmp/machine/generic.h
 ./helpers/watcher.lo: ../include/net-snmp/net-snmp-includes.h
 ./helpers/watcher.lo: ../include/net-snmp/definitions.h
 ./helpers/watcher.lo: ../include/net-snmp/types.h
+./helpers/watcher.lo: ../include/net-snmp/library/types.h
 ./helpers/watcher.lo: ../include/net-snmp/library/snmp_api.h
-./helpers/watcher.lo: ../include/net-snmp/library/asn1.h
-./helpers/watcher.lo: ../include/net-snmp/library/snmp_impl.h
-./helpers/watcher.lo: ../include/net-snmp/library/snmp.h
-./helpers/watcher.lo: ../include/net-snmp/library/snmp-tc.h
-./helpers/watcher.lo: ../include/net-snmp/utilities.h
+./helpers/watcher.lo: ../include/net-snmp/varbind_api.h
 ./helpers/watcher.lo: ../include/net-snmp/library/snmp_client.h
-./helpers/watcher.lo: ../include/net-snmp/library/system.h
-./helpers/watcher.lo: ../include/net-snmp/library/tools.h
-./helpers/watcher.lo: ../include/net-snmp/library/int64.h
-./helpers/watcher.lo: ../include/net-snmp/library/mt_support.h
-./helpers/watcher.lo: ../include/net-snmp/library/snmp_alarm.h
-./helpers/watcher.lo: ../include/net-snmp/library/callback.h
-./helpers/watcher.lo: ../include/net-snmp/library/data_list.h
-./helpers/watcher.lo: ../include/net-snmp/library/oid_stash.h
-./helpers/watcher.lo: ../include/net-snmp/library/check_varbind.h
-./helpers/watcher.lo: ../include/net-snmp/library/container.h
-./helpers/watcher.lo: ../include/net-snmp/library/factory.h
-./helpers/watcher.lo: ../include/net-snmp/library/snmp_logging.h
-./helpers/watcher.lo: ../include/net-snmp/library/container_binary_array.h
-./helpers/watcher.lo: ../include/net-snmp/library/container_list_ssll.h
-./helpers/watcher.lo: ../include/net-snmp/library/container_iterator.h
-./helpers/watcher.lo: ../include/net-snmp/library/container.h
-./helpers/watcher.lo: ../include/net-snmp/library/snmp_assert.h
-./helpers/watcher.lo: ../include/net-snmp/version.h
+./helpers/watcher.lo: ../include/net-snmp/pdu_api.h
+./helpers/watcher.lo: ../include/net-snmp/library/asn1.h
 ./helpers/watcher.lo: ../include/net-snmp/session_api.h
+./helpers/watcher.lo: ../include/net-snmp/library/callback.h
 ./helpers/watcher.lo: ../include/net-snmp/library/snmp_transport.h
 ./helpers/watcher.lo: ../include/net-snmp/library/snmp_service.h
 ./helpers/watcher.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -4128,11 +4260,31 @@
 ./helpers/watcher.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./helpers/watcher.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./helpers/watcher.lo: ../include/net-snmp/library/ucd_compat.h
-./helpers/watcher.lo: ../include/net-snmp/pdu_api.h
-./helpers/watcher.lo: ../include/net-snmp/mib_api.h
 ./helpers/watcher.lo: ../include/net-snmp/library/mib.h
+./helpers/watcher.lo: ../include/net-snmp/mib_api.h
 ./helpers/watcher.lo: ../include/net-snmp/library/parse.h
-./helpers/watcher.lo: ../include/net-snmp/varbind_api.h
+./helpers/watcher.lo: ../include/net-snmp/library/oid_stash.h
+./helpers/watcher.lo: ../include/net-snmp/library/snmp_impl.h
+./helpers/watcher.lo: ../include/net-snmp/library/snmp.h
+./helpers/watcher.lo: ../include/net-snmp/library/snmp-tc.h
+./helpers/watcher.lo: ../include/net-snmp/library/getopt.h
+./helpers/watcher.lo: ../include/net-snmp/utilities.h
+./helpers/watcher.lo: ../include/net-snmp/library/system.h
+./helpers/watcher.lo: ../include/net-snmp/library/tools.h
+./helpers/watcher.lo: ../include/net-snmp/library/int64.h
+./helpers/watcher.lo: ../include/net-snmp/library/mt_support.h
+./helpers/watcher.lo: ../include/net-snmp/library/snmp_alarm.h
+./helpers/watcher.lo: ../include/net-snmp/library/data_list.h
+./helpers/watcher.lo: ../include/net-snmp/library/check_varbind.h
+./helpers/watcher.lo: ../include/net-snmp/library/container.h
+./helpers/watcher.lo: ../include/net-snmp/library/factory.h
+./helpers/watcher.lo: ../include/net-snmp/library/snmp_logging.h
+./helpers/watcher.lo: ../include/net-snmp/library/container_binary_array.h
+./helpers/watcher.lo: ../include/net-snmp/library/container_list_ssll.h
+./helpers/watcher.lo: ../include/net-snmp/library/container_iterator.h
+./helpers/watcher.lo: ../include/net-snmp/library/container.h
+./helpers/watcher.lo: ../include/net-snmp/library/snmp_assert.h
+./helpers/watcher.lo: ../include/net-snmp/version.h
 ./helpers/watcher.lo: ../include/net-snmp/config_api.h
 ./helpers/watcher.lo: ../include/net-snmp/library/read_config.h
 ./helpers/watcher.lo: ../include/net-snmp/library/default_store.h
@@ -4187,39 +4339,17 @@
 ./helpers/watcher.lo: ../include/net-snmp/agent/table_array.h
 ./helpers/watcher.lo: ../include/net-snmp/agent/mfd.h
 ./mibgroup/header_complex.lo: ../include/net-snmp/net-snmp-config.h
-./mibgroup/header_complex.lo: ../include/net-snmp/system/linux.h
-./mibgroup/header_complex.lo: ../include/net-snmp/system/sysv.h
-./mibgroup/header_complex.lo: ../include/net-snmp/system/generic.h
-./mibgroup/header_complex.lo: ../include/net-snmp/machine/generic.h
 ./mibgroup/header_complex.lo: ../include/net-snmp/net-snmp-includes.h
 ./mibgroup/header_complex.lo: ../include/net-snmp/definitions.h
 ./mibgroup/header_complex.lo: ../include/net-snmp/types.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/types.h
 ./mibgroup/header_complex.lo: ../include/net-snmp/library/snmp_api.h
-./mibgroup/header_complex.lo: ../include/net-snmp/library/asn1.h
-./mibgroup/header_complex.lo: ../include/net-snmp/library/snmp_impl.h
-./mibgroup/header_complex.lo: ../include/net-snmp/library/snmp.h
-./mibgroup/header_complex.lo: ../include/net-snmp/library/snmp-tc.h
-./mibgroup/header_complex.lo: ../include/net-snmp/utilities.h
+./mibgroup/header_complex.lo: ../include/net-snmp/varbind_api.h
 ./mibgroup/header_complex.lo: ../include/net-snmp/library/snmp_client.h
-./mibgroup/header_complex.lo: ../include/net-snmp/library/system.h
-./mibgroup/header_complex.lo: ../include/net-snmp/library/tools.h
-./mibgroup/header_complex.lo: ../include/net-snmp/library/int64.h
-./mibgroup/header_complex.lo: ../include/net-snmp/library/mt_support.h
-./mibgroup/header_complex.lo: ../include/net-snmp/library/snmp_alarm.h
-./mibgroup/header_complex.lo: ../include/net-snmp/library/callback.h
-./mibgroup/header_complex.lo: ../include/net-snmp/library/data_list.h
-./mibgroup/header_complex.lo: ../include/net-snmp/library/oid_stash.h
-./mibgroup/header_complex.lo: ../include/net-snmp/library/check_varbind.h
-./mibgroup/header_complex.lo: ../include/net-snmp/library/container.h
-./mibgroup/header_complex.lo: ../include/net-snmp/library/factory.h
-./mibgroup/header_complex.lo: ../include/net-snmp/library/snmp_logging.h
-./mibgroup/header_complex.lo: ../include/net-snmp/library/container_binary_array.h
-./mibgroup/header_complex.lo: ../include/net-snmp/library/container_list_ssll.h
-./mibgroup/header_complex.lo: ../include/net-snmp/library/container_iterator.h
-./mibgroup/header_complex.lo: ../include/net-snmp/library/container.h
-./mibgroup/header_complex.lo: ../include/net-snmp/library/snmp_assert.h
-./mibgroup/header_complex.lo: ../include/net-snmp/version.h
+./mibgroup/header_complex.lo: ../include/net-snmp/pdu_api.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/asn1.h
 ./mibgroup/header_complex.lo: ../include/net-snmp/session_api.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/callback.h
 ./mibgroup/header_complex.lo: ../include/net-snmp/library/snmp_transport.h
 ./mibgroup/header_complex.lo: ../include/net-snmp/library/snmp_service.h
 ./mibgroup/header_complex.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -4230,11 +4360,31 @@
 ./mibgroup/header_complex.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibgroup/header_complex.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./mibgroup/header_complex.lo: ../include/net-snmp/library/ucd_compat.h
-./mibgroup/header_complex.lo: ../include/net-snmp/pdu_api.h
-./mibgroup/header_complex.lo: ../include/net-snmp/mib_api.h
 ./mibgroup/header_complex.lo: ../include/net-snmp/library/mib.h
+./mibgroup/header_complex.lo: ../include/net-snmp/mib_api.h
 ./mibgroup/header_complex.lo: ../include/net-snmp/library/parse.h
-./mibgroup/header_complex.lo: ../include/net-snmp/varbind_api.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/oid_stash.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/snmp_impl.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/snmp.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/snmp-tc.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/getopt.h
+./mibgroup/header_complex.lo: ../include/net-snmp/utilities.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/system.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/tools.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/int64.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/mt_support.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/snmp_alarm.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/data_list.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/check_varbind.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/container.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/factory.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/snmp_logging.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/container_binary_array.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/container_list_ssll.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/container_iterator.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/container.h
+./mibgroup/header_complex.lo: ../include/net-snmp/library/snmp_assert.h
+./mibgroup/header_complex.lo: ../include/net-snmp/version.h
 ./mibgroup/header_complex.lo: ../include/net-snmp/config_api.h
 ./mibgroup/header_complex.lo: ../include/net-snmp/library/read_config.h
 ./mibgroup/header_complex.lo: ../include/net-snmp/library/default_store.h
@@ -4290,44 +4440,18 @@
 ./mibgroup/header_complex.lo: ../include/net-snmp/agent/mfd.h
 ./mibgroup/header_complex.lo: ./mibgroup/header_complex.h
 ./mibgroup/kernel_sunos5.lo: ../include/net-snmp/net-snmp-config.h
-./mibgroup/kernel_sunos5.lo: ../include/net-snmp/system/linux.h
-./mibgroup/kernel_sunos5.lo: ../include/net-snmp/system/sysv.h
-./mibgroup/kernel_sunos5.lo: ../include/net-snmp/system/generic.h
-./mibgroup/kernel_sunos5.lo: ../include/net-snmp/machine/generic.h
 ./mibgroup/testhandler.lo: ../include/net-snmp/net-snmp-config.h
-./mibgroup/testhandler.lo: ../include/net-snmp/system/linux.h
-./mibgroup/testhandler.lo: ../include/net-snmp/system/sysv.h
-./mibgroup/testhandler.lo: ../include/net-snmp/system/generic.h
-./mibgroup/testhandler.lo: ../include/net-snmp/machine/generic.h
 ./mibgroup/testhandler.lo: ../include/net-snmp/net-snmp-includes.h
 ./mibgroup/testhandler.lo: ../include/net-snmp/definitions.h
 ./mibgroup/testhandler.lo: ../include/net-snmp/types.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/types.h
 ./mibgroup/testhandler.lo: ../include/net-snmp/library/snmp_api.h
-./mibgroup/testhandler.lo: ../include/net-snmp/library/asn1.h
-./mibgroup/testhandler.lo: ../include/net-snmp/library/snmp_impl.h
-./mibgroup/testhandler.lo: ../include/net-snmp/library/snmp.h
-./mibgroup/testhandler.lo: ../include/net-snmp/library/snmp-tc.h
-./mibgroup/testhandler.lo: ../include/net-snmp/utilities.h
+./mibgroup/testhandler.lo: ../include/net-snmp/varbind_api.h
 ./mibgroup/testhandler.lo: ../include/net-snmp/library/snmp_client.h
-./mibgroup/testhandler.lo: ../include/net-snmp/library/system.h
-./mibgroup/testhandler.lo: ../include/net-snmp/library/tools.h
-./mibgroup/testhandler.lo: ../include/net-snmp/library/int64.h
-./mibgroup/testhandler.lo: ../include/net-snmp/library/mt_support.h
-./mibgroup/testhandler.lo: ../include/net-snmp/library/snmp_alarm.h
-./mibgroup/testhandler.lo: ../include/net-snmp/library/callback.h
-./mibgroup/testhandler.lo: ../include/net-snmp/library/data_list.h
-./mibgroup/testhandler.lo: ../include/net-snmp/library/oid_stash.h
-./mibgroup/testhandler.lo: ../include/net-snmp/library/check_varbind.h
-./mibgroup/testhandler.lo: ../include/net-snmp/library/container.h
-./mibgroup/testhandler.lo: ../include/net-snmp/library/factory.h
-./mibgroup/testhandler.lo: ../include/net-snmp/library/snmp_logging.h
-./mibgroup/testhandler.lo: ../include/net-snmp/library/container_binary_array.h
-./mibgroup/testhandler.lo: ../include/net-snmp/library/container_list_ssll.h
-./mibgroup/testhandler.lo: ../include/net-snmp/library/container_iterator.h
-./mibgroup/testhandler.lo: ../include/net-snmp/library/container.h
-./mibgroup/testhandler.lo: ../include/net-snmp/library/snmp_assert.h
-./mibgroup/testhandler.lo: ../include/net-snmp/version.h
+./mibgroup/testhandler.lo: ../include/net-snmp/pdu_api.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/asn1.h
 ./mibgroup/testhandler.lo: ../include/net-snmp/session_api.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/callback.h
 ./mibgroup/testhandler.lo: ../include/net-snmp/library/snmp_transport.h
 ./mibgroup/testhandler.lo: ../include/net-snmp/library/snmp_service.h
 ./mibgroup/testhandler.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -4338,11 +4462,31 @@
 ./mibgroup/testhandler.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibgroup/testhandler.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./mibgroup/testhandler.lo: ../include/net-snmp/library/ucd_compat.h
-./mibgroup/testhandler.lo: ../include/net-snmp/pdu_api.h
-./mibgroup/testhandler.lo: ../include/net-snmp/mib_api.h
 ./mibgroup/testhandler.lo: ../include/net-snmp/library/mib.h
+./mibgroup/testhandler.lo: ../include/net-snmp/mib_api.h
 ./mibgroup/testhandler.lo: ../include/net-snmp/library/parse.h
-./mibgroup/testhandler.lo: ../include/net-snmp/varbind_api.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/oid_stash.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/snmp_impl.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/snmp.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/snmp-tc.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/getopt.h
+./mibgroup/testhandler.lo: ../include/net-snmp/utilities.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/system.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/tools.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/int64.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/mt_support.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/snmp_alarm.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/data_list.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/check_varbind.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/container.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/factory.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/snmp_logging.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/container_binary_array.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/container_list_ssll.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/container_iterator.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/container.h
+./mibgroup/testhandler.lo: ../include/net-snmp/library/snmp_assert.h
+./mibgroup/testhandler.lo: ../include/net-snmp/version.h
 ./mibgroup/testhandler.lo: ../include/net-snmp/config_api.h
 ./mibgroup/testhandler.lo: ../include/net-snmp/library/read_config.h
 ./mibgroup/testhandler.lo: ../include/net-snmp/library/default_store.h
@@ -4398,39 +4542,17 @@
 ./mibgroup/testhandler.lo: ../include/net-snmp/agent/mfd.h
 ./mibgroup/testhandler.lo: ./mibgroup/testhandler.h
 ./mibgroup/util_funcs.lo: ../include/net-snmp/net-snmp-config.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/system/linux.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/system/sysv.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/system/generic.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/machine/generic.h
 ./mibgroup/util_funcs.lo: ../include/net-snmp/net-snmp-includes.h
 ./mibgroup/util_funcs.lo: ../include/net-snmp/definitions.h
 ./mibgroup/util_funcs.lo: ../include/net-snmp/types.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/types.h
 ./mibgroup/util_funcs.lo: ../include/net-snmp/library/snmp_api.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/library/asn1.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/library/snmp_impl.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/library/snmp.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/library/snmp-tc.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/utilities.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/varbind_api.h
 ./mibgroup/util_funcs.lo: ../include/net-snmp/library/snmp_client.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/library/system.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/library/tools.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/library/int64.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/library/mt_support.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/library/snmp_alarm.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/library/callback.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/library/data_list.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/library/oid_stash.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/library/check_varbind.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/library/container.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/library/factory.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/library/snmp_logging.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/library/container_binary_array.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/library/container_list_ssll.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/library/container_iterator.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/library/container.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/library/snmp_assert.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/version.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/pdu_api.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/asn1.h
 ./mibgroup/util_funcs.lo: ../include/net-snmp/session_api.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/callback.h
 ./mibgroup/util_funcs.lo: ../include/net-snmp/library/snmp_transport.h
 ./mibgroup/util_funcs.lo: ../include/net-snmp/library/snmp_service.h
 ./mibgroup/util_funcs.lo: ../include/net-snmp/library/snmpCallbackDomain.h
@@ -4441,11 +4563,31 @@
 ./mibgroup/util_funcs.lo: ../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibgroup/util_funcs.lo: ../include/net-snmp/library/snmpIPXDomain.h
 ./mibgroup/util_funcs.lo: ../include/net-snmp/library/ucd_compat.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/pdu_api.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/mib_api.h
 ./mibgroup/util_funcs.lo: ../include/net-snmp/library/mib.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/mib_api.h
 ./mibgroup/util_funcs.lo: ../include/net-snmp/library/parse.h
-./mibgroup/util_funcs.lo: ../include/net-snmp/varbind_api.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/oid_stash.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/snmp_impl.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/snmp.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/snmp-tc.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/getopt.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/utilities.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/system.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/tools.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/int64.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/mt_support.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/snmp_alarm.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/data_list.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/check_varbind.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/container.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/factory.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/snmp_logging.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/container_binary_array.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/container_list_ssll.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/container_iterator.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/container.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/library/snmp_assert.h
+./mibgroup/util_funcs.lo: ../include/net-snmp/version.h
 ./mibgroup/util_funcs.lo: ../include/net-snmp/config_api.h
 ./mibgroup/util_funcs.lo: ../include/net-snmp/library/read_config.h
 ./mibgroup/util_funcs.lo: ../include/net-snmp/library/default_store.h
@@ -4500,12 +4642,11 @@
 ./mibgroup/util_funcs.lo: ../include/net-snmp/agent/table_array.h
 ./mibgroup/util_funcs.lo: ../include/net-snmp/agent/mfd.h mibgroup/struct.h
 ./mibgroup/util_funcs.lo: ./mibgroup/util_funcs.h
+./mibgroup/util_funcs.lo: mibgroup/util_funcs/header_generic.h
+./mibgroup/util_funcs.lo: mibgroup/util_funcs/header_simple_table.h
+./mibgroup/util_funcs.lo: mibgroup/util_funcs/MIB_STATS_CACHE_TIMEOUT.h
 ./mibgroup/util_funcs.lo: ./mibgroup/utilities/execute.h
 ./mibgroup/util_funcs.lo: ./mibgroup/ucd-snmp/errormib.h
 ./mibgroup/util_funcs.lo: ../agent/mibgroup/mibdefs.h
 ./mibgroup/winExtDLL.lo: ../include/net-snmp/net-snmp-config.h
-./mibgroup/winExtDLL.lo: ../include/net-snmp/system/linux.h
-./mibgroup/winExtDLL.lo: ../include/net-snmp/system/sysv.h
-./mibgroup/winExtDLL.lo: ../include/net-snmp/system/generic.h
-./mibgroup/winExtDLL.lo: ../include/net-snmp/machine/generic.h
 ./mibgroup/winExtDLL.lo: ../include/net-snmp/agent/mib_module_config.h
diff --git a/agent/Makefile.in b/agent/Makefile.in
index a6448f8..766e5c6 100644
--- a/agent/Makefile.in
+++ b/agent/Makefile.in
@@ -25,6 +25,7 @@
 INCLUDESUBDIRHEADERS=agent_read_config.h \
 	agent_registry.h \
 	agent_index.h \
+	agent_sysORTable.h \
 	agent_trap.h \
 	auto_nlist.h \
 	ds_agent.h \
@@ -34,7 +35,8 @@
 	agent_handler.h \
 	net-snmp-agent-includes.h \
 	mib_modules.h \
-	agent_callbacks.h
+	agent_callbacks.h \
+	sysORTable.h
 
 INSTALLBUILTSUBDIRHEADERS=../include/net-snmp/agent/mib_module_config.h \
 			  ../include/net-snmp/agent/agent_module_config.h \
@@ -42,7 +44,8 @@
 INSTALLBUILTSUBDIR=agent
 
 INCLUDEMIBGROUPDIR=agent/mibgroup
-INCLUDEMIBGROUPDIRHEADERS=util_funcs.h
+INCLUDEMIBGROUPDIRHEADERS=struct.h util_funcs.h util_funcs/header_generic.h \
+	util_funcs/header_simple_table.h util_funcs/MIB_STATS_CACHE_TIMEOUT.h
 
 OTHERINSTALL=installmibgroupheaders @EMBEDPERLINSTALL@
 OTHERUNINSTALL=@EMBEDPERLUNINSTALL@
@@ -60,6 +63,7 @@
 	agent_index.h	\
 	agent_read_config.h \
 	agent_registry.h \
+	agent_sysORTable.h \
 	agent_trap.h	\
 	auto_nlist.h	\
 	ds_agent.h	\
@@ -103,11 +107,11 @@
 
 # libnetsnmpagent objects
 LIBAGENTOBJS=snmp_agent.o snmp_vars.o agent_read_config.o \
-	agent_registry.o agent_index.o agent_trap.o kernel.o \
-	 agent_handler.o $(agentgroup_list_o) @OTHERAGENTLIBOBJS@
+	agent_registry.o agent_index.o agent_sysORTable.o agent_trap.o \
+	kernel.o agent_handler.o $(agentgroup_list_o) @OTHERAGENTLIBOBJS@
 LLIBAGENTOBJS=snmp_agent.lo snmp_vars.lo agent_read_config.lo \
-	agent_registry.lo agent_index.lo agent_trap.lo kernel.lo \
-	agent_handler.lo $(agentgroup_list_lo) @OTHERAGENTLIBLOBJS@
+	agent_registry.lo agent_index.lo agent_sysORTable.lo agent_trap.lo \
+	kernel.lo agent_handler.lo $(agentgroup_list_lo) @OTHERAGENTLIBLOBJS@
 
 # The agent objects.
 AGENTOBJS=snmpd.o @other_agentobjs@
@@ -146,7 +150,7 @@
 	$(RANLIB) $(AGENTLIB)
 
 libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS)
-	$(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS) ${LMIBLIBS} $(LDFLAGS) $(LIB_LD_LIBS)
+	$(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS) $(LDFLAGS) ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS)
 	$(RANLIB) $(MIBLIB)
 
 agentlib: $(AGENTLIB)
@@ -165,15 +169,16 @@
 	  @echo "removed snmp_perl.pl from $(INSTALL_PREFIX)$(snmplibdir)"
 
 installmibgroupheaders:
-	@if test "$(INCLUDEMIBGROUPDIRHEADERS)" != "" ; then \
-                echo creating directory $(INSTALL_PREFIX)$(includedir)/agent ; \
-                it="$(INCLUDEMIBGROUPDIRHEADERS)" ; \
-                $(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(includedir)/agent ; \
-                for i in $$it ; do \
-                        $(INSTALL_DATA) $(top_srcdir)/$(INCLUDEMIBGROUPDIR)/$$i $(INSTALL_PREFIX)$(includedir)/agent ; \
-                        echo "installing $$i in $(INSTALL_PREFIX)$(includedir)/agent" ; \
-                done \
-        fi
+	@for it in $(INCLUDEMIBGROUPDIRHEADERS) ; do \
+		itd=`dirname "$(INSTALL_PREFIX)$(includedir)/agent/$$it"` ; \
+		if [ ! -d "$$itd" ] ; then \
+			echo "creating directory $$itd" ; \
+			$(SHELL) "$(top_srcdir)/mkinstalldirs" "$$itd" ; \
+		fi ; \
+		$(INSTALL_DATA) "$(top_srcdir)/$(INCLUDEMIBGROUPDIR)/$$it" \
+			"$$itd" ; \
+		echo "installing $$it in $$itd" ; \
+	done
 
 @module_list_deps@
 @agent_module_list_deps@
diff --git a/agent/agent_handler.c b/agent/agent_handler.c
index fcbc6dd..2a2f2d9 100644
--- a/agent/agent_handler.c
+++ b/agent/agent_handler.c
@@ -162,7 +162,7 @@
 netsnmp_handler_registration *
 netsnmp_handler_registration_create(const char *name,
                                     netsnmp_mib_handler *handler,
-                                    oid * reg_oid, size_t reg_oid_len,
+                                    const oid * reg_oid, size_t reg_oid_len,
                                     int modes)
 {
     netsnmp_handler_registration *the_reg;
@@ -179,7 +179,7 @@
     the_reg->priority = DEFAULT_MIB_PRIORITY;
     if (name)
         the_reg->handlerName = strdup(name);
-    the_reg->rootoid = netsnmp_memdup(reg_oid, reg_oid_len * sizeof(oid));
+    the_reg->rootoid = snmp_duplicate_objid(reg_oid, reg_oid_len);
     the_reg->rootoid_len = reg_oid_len;
     return the_reg;
 }
@@ -187,13 +187,19 @@
 netsnmp_handler_registration *
 netsnmp_create_handler_registration(const char *name,
                                     Netsnmp_Node_Handler *
-                                    handler_access_method, oid * reg_oid,
+                                    handler_access_method, const oid * reg_oid,
                                     size_t reg_oid_len, int modes)
 {
-    return
-        netsnmp_handler_registration_create(name,
-                                            netsnmp_create_handler(name, handler_access_method),
-                                            reg_oid, reg_oid_len, modes);
+    netsnmp_handler_registration *rv = NULL;
+    netsnmp_mib_handler *handler =
+        netsnmp_create_handler(name, handler_access_method);
+    if (handler) {
+        rv = netsnmp_handler_registration_create(
+            name, handler, reg_oid, reg_oid_len, modes);
+        if (!rv)
+            netsnmp_handler_free(handler);
+    }
+    return rv;
 }
 
 /** register a handler, as defined by the netsnmp_handler_registration pointer. */
@@ -669,8 +675,8 @@
         }
 
         if (reginfo->rootoid != NULL) {
-            r->rootoid = netsnmp_memdup(reginfo->rootoid,
-                                        reginfo->rootoid_len * sizeof(oid));
+            r->rootoid =
+                snmp_duplicate_objid(reginfo->rootoid, reginfo->rootoid_len);
             if (r->rootoid == NULL) {
                 netsnmp_handler_registration_free(r);
                 return NULL;
@@ -977,7 +983,8 @@
     cptr = copy_nword(cptr, handler_to_insert, sizeof(handler_to_insert));
     handler = netsnmp_get_list_data(handler_reg, handler_to_insert);
     if (!handler) {
-        config_perror("no such \"%s\" handler registered.");
+	netsnmp_config_error("no \"%s\" handler registered.",
+			     handler_to_insert);
         return;
     }
 
diff --git a/agent/agent_index.c b/agent/agent_index.c
index ed9ba14..8e349dc 100644
--- a/agent/agent_index.c
+++ b/agent/agent_index.c
@@ -163,7 +163,7 @@
 
     DEBUGMSGTL(("register_index", "register "));
     DEBUGMSGVAR(("register_index", varbind));
-    DEBUGMSG(("register_index", "for session %08p\n", ss));
+    DEBUGMSG(("register_index", "for session %8p\n", ss));
 
 #if defined(USING_AGENTX_SUBAGENT_MODULE) && !defined(TESTING)
     if (netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, 
@@ -301,12 +301,12 @@
     if (new_index == NULL)
         return NULL;
 
-    if (0 == snmp_varlist_add_variable(&new_index->varbind,
-                                       varbind->name,
-                                       varbind->name_length,
-                                       varbind->type,
-                                       varbind->val.string,
-                                       varbind->val_len)) {
+    if (NULL == snmp_varlist_add_variable(&new_index->varbind,
+                                          varbind->name,
+                                          varbind->name_length,
+                                          varbind->type,
+                                          varbind->val.string,
+                                          varbind->val_len)) {
         /*
          * if (snmp_clone_var( varbind, new_index->varbind ) != 0 ) 
          */
diff --git a/agent/agent_read_config.c b/agent/agent_read_config.c
index 533042a..07861ad 100644
--- a/agent/agent_read_config.c
+++ b/agent/agent_read_config.c
@@ -245,6 +245,9 @@
                                 snmpd_free_trapcommunity,
                                 "community-string");
 #endif /* support for community based SNMP */
+    netsnmp_ds_register_config(ASN_OCTET_STR, app, "v1trapaddress", 
+                               NETSNMP_DS_APPLICATION_ID, 
+                               NETSNMP_DS_AGENT_TRAP_ADDR);
 #ifdef HAVE_UNISTD_H
     register_app_config_handler("agentuser",
                                 snmpd_set_agent_user, NULL, "userid");
@@ -284,9 +287,6 @@
     snmp_call_callbacks(SNMP_CALLBACK_APPLICATION,
                         SNMPD_CALLBACK_PRE_UPDATE_CONFIG, NULL);
     free_config();
-#ifdef USING_MIBII_VACM_CONF_MODULE
-    vacm_standard_views(0,0,NULL,NULL);
-#endif
     read_configs();
 }
 
diff --git a/agent/agent_registry.c b/agent/agent_registry.c
index d0d35b7..7aa8d23 100644
--- a/agent/agent_registry.c
+++ b/agent/agent_registry.c
@@ -68,11 +68,143 @@
 #include "agentx/client.h"
 #endif
 
-static void register_mib_detach_node(netsnmp_subtree *s);
-NETSNMP_STATIC_INLINE void invalidate_lookup_cache(const char *context);
-void netsnmp_set_lookup_cache_size(int newsize);
-int netsnmp_get_lookup_cache_size(void);
+/* Lookup cache code */
 
+#define SUBTREE_DEFAULT_CACHE_SIZE 8
+#define SUBTREE_MAX_CACHE_SIZE     32
+int lookup_cache_size = 0; /*enabled later after registrations are loaded */
+
+typedef struct lookup_cache_s {
+   netsnmp_subtree *next;
+   netsnmp_subtree *previous;
+} lookup_cache;
+
+typedef struct lookup_cache_context_s {
+   char *context;
+   struct lookup_cache_context_s *next;
+   int thecachecount;
+   int currentpos;
+   lookup_cache cache[SUBTREE_MAX_CACHE_SIZE];
+} lookup_cache_context;
+
+static lookup_cache_context *thecontextcache = NULL;
+
+/** set the lookup cache size for optimized agent registration performance.
+ * @param newsize set to the maximum size of a cache for a given
+ * context.  Set to 0 to completely disable caching, or to -1 to set
+ * to the default cache size (8), or to a number of your chosing.  The
+ * rough guide is that it should be equal to the maximum number of
+ * simultanious managers you expect to talk to the agent (M) times 80%
+ * (or so, he says randomly) the average number (N) of varbinds you
+ * expect to receive in a given request for a manager.  ie, M times N.
+ * Bigger does NOT necessarily mean better.  Certainly 16 should be an
+ * upper limit.  32 is the hard coded limit.
+ */
+void
+netsnmp_set_lookup_cache_size(int newsize) {
+    if (newsize < 0)
+        lookup_cache_size = SUBTREE_DEFAULT_CACHE_SIZE;
+    else if (newsize < SUBTREE_MAX_CACHE_SIZE)
+        lookup_cache_size = newsize;
+    else
+        lookup_cache_size = SUBTREE_MAX_CACHE_SIZE;
+}
+
+/** retrieves the current value of the lookup cache size
+ *  @return the current lookup cache size
+ */
+int
+netsnmp_get_lookup_cache_size(void) {
+    return lookup_cache_size;
+}
+
+NETSNMP_STATIC_INLINE lookup_cache_context *
+get_context_lookup_cache(const char *context) {
+    lookup_cache_context *ptr;
+    if (!context)
+        context = "";
+
+    for(ptr = thecontextcache; ptr; ptr = ptr->next) {
+        if (strcmp(ptr->context, context) == 0)
+            break;
+    }
+    if (!ptr) {
+        if (netsnmp_subtree_find_first(context)) {
+            ptr = SNMP_MALLOC_TYPEDEF(lookup_cache_context);
+            ptr->next = thecontextcache;
+            ptr->context = strdup(context);
+            thecontextcache = ptr;
+        } else {
+            return NULL;
+        }
+    }
+    return ptr;
+}
+
+NETSNMP_STATIC_INLINE void
+lookup_cache_add(const char *context,
+                 netsnmp_subtree *next, netsnmp_subtree *previous) {
+    lookup_cache_context *cptr;
+
+    if ((cptr = get_context_lookup_cache(context)) == NULL)
+        return;
+
+    if (cptr->thecachecount < lookup_cache_size)
+        cptr->thecachecount++;
+
+    cptr->cache[cptr->currentpos].next = next;
+    cptr->cache[cptr->currentpos].previous = previous;
+
+    if (++cptr->currentpos >= lookup_cache_size)
+        cptr->currentpos = 0;
+}
+
+NETSNMP_STATIC_INLINE void
+lookup_cache_replace(lookup_cache *ptr,
+                     netsnmp_subtree *next, netsnmp_subtree *previous) {
+
+    ptr->next = next;
+    ptr->previous = previous;
+}
+
+NETSNMP_STATIC_INLINE lookup_cache *
+lookup_cache_find(const char *context, oid *name, size_t name_len,
+                  int *retcmp) {
+    lookup_cache_context *cptr;
+    lookup_cache *ret = NULL;
+    int cmp;
+    int i;
+
+    if ((cptr = get_context_lookup_cache(context)) == NULL)
+        return NULL;
+
+    for(i = 0; i < cptr->thecachecount && i < lookup_cache_size; i++) {
+        if (cptr->cache[i].previous->start_a)
+            cmp = snmp_oid_compare(name, name_len,
+                                   cptr->cache[i].previous->start_a,
+                                   cptr->cache[i].previous->start_len);
+        else
+            cmp = 1;
+        if (cmp >= 0) {
+            *retcmp = cmp;
+            ret = &(cptr->cache[i]);
+        }
+    }
+    return ret;
+}
+
+NETSNMP_STATIC_INLINE void
+invalidate_lookup_cache(const char *context) {
+    lookup_cache_context *cptr;
+    if ((cptr = get_context_lookup_cache(context)) != NULL) {
+        cptr->thecachecount = 0;
+        cptr->currentpos = 0;
+    }
+}
+
+/* End of Lookup cache code */
+
+static void register_mib_detach_node(netsnmp_subtree *s);
 subtree_context_cache *context_subtrees = NULL;
 
 void
@@ -320,9 +452,7 @@
 	return NULL;
     }
 
-    if (current->end_a != NULL) {
-	SNMP_FREE(current->end_a);
-    }
+    SNMP_FREE(current->end_a);
     current->end_a = tmp_a;
     current->end_len = name_len;
     if (new_sub->start_a != NULL) {
@@ -531,8 +661,23 @@
 	
 	    if (next && (next->namelen  == new_sub->namelen) &&
 		(next->priority == new_sub->priority)) {
-                if (new_sub->namelen != 1) /* ignore root OID dups */
-                    snmp_log(LOG_ERR, "duplicate registration (%s, %s)", next->label_a, new_sub->label_a);
+                if (new_sub->namelen != 1) {    /* ignore root OID dups */
+                    size_t          out_len = 0;
+                    size_t          buf_len = 0;
+                    char           *buf = NULL;
+                    int             buf_overflow = 0;
+
+                    netsnmp_sprint_realloc_objid((u_char **) &buf, &buf_len, &out_len,
+                                                 1, &buf_overflow,
+                                                 new_sub->start_a,
+                                                 new_sub->start_len);
+                    snmp_log(LOG_ERR,
+                             "duplicate registration: MIB modules %s and %s (oid %s%s).\n",
+                             next->label_a, new_sub->label_a,
+                             buf ? buf : "",
+                             buf_overflow ? " [TRUNCATED]" : "");
+                    free(buf);
+                }
 		return MIB_DUPLICATE_REGISTRATION;
 	    }
 
@@ -733,6 +878,9 @@
         reg_parms.timeout = timeout;
         reg_parms.flags = (u_char) flags;
         reg_parms.contextName = context;
+        reg_parms.session = ss;
+        reg_parms.reginfo = reginfo;
+        reg_parms.contextName = context;
         snmp_call_callbacks(SNMP_CALLBACK_APPLICATION,
                             SNMPD_CALLBACK_REGISTER_OID, &reg_parms);
     }
@@ -766,6 +914,9 @@
         reg_parms.range_ubound = s->range_ubound;
         reg_parms.timeout = s->timeout;
         reg_parms.flags = s->flags;
+        reg_parms.session = s->session;
+        reg_parms.reginfo = s->reginfo;
+        /* XXX: missing in subtree: reg_parms.contextName = s->context; */
         if ((NULL != s->reginfo) && (NULL != s->reginfo->contextName))
             reg_parms.contextName = s->reginfo->contextName;
         snmp_call_callbacks(SNMP_CALLBACK_APPLICATION,
@@ -1287,7 +1438,7 @@
 {                               /* IN - pdu being checked */
     struct view_parameters view_parms;
     view_parms.pdu = pdu;
-    view_parms.name = 0;
+    view_parms.name = NULL;
     view_parms.namelen = 0;
     view_parms.errorcode = 0;
     view_parms.check_subtree = 0;
@@ -1349,138 +1500,6 @@
     return 1;
 }
 
-#define SUBTREE_DEFAULT_CACHE_SIZE 8
-#define SUBTREE_MAX_CACHE_SIZE     32
-int lookup_cache_size = 0; /*enabled later after registrations are loaded */
-
-typedef struct lookup_cache_s {
-   netsnmp_subtree *next;
-   netsnmp_subtree *previous;
-} lookup_cache;
-
-typedef struct lookup_cache_context_s {
-   char *context;
-   struct lookup_cache_context_s *next;
-   int thecachecount;
-   int currentpos;
-   lookup_cache cache[SUBTREE_MAX_CACHE_SIZE];
-} lookup_cache_context;
-
-static lookup_cache_context *thecontextcache = NULL;
-
-/** set the lookup cache size for optimized agent registration performance.
- * @param newsize set to the maximum size of a cache for a given
- * context.  Set to 0 to completely disable caching, or to -1 to set
- * to the default cache size (8), or to a number of your chosing.  The
- * rough guide is that it should be equal to the maximum number of
- * simultanious managers you expect to talk to the agent (M) times 80%
- * (or so, he says randomly) the average number (N) of varbinds you
- * expect to receive in a given request for a manager.  ie, M times N.
- * Bigger does NOT necessarily mean better.  Certainly 16 should be an
- * upper limit.  32 is the hard coded limit.
- */
-void
-netsnmp_set_lookup_cache_size(int newsize) {
-    if (newsize < 0)
-        lookup_cache_size = SUBTREE_DEFAULT_CACHE_SIZE;
-    else if (newsize < SUBTREE_MAX_CACHE_SIZE)
-        lookup_cache_size = newsize;
-    else
-        lookup_cache_size = SUBTREE_MAX_CACHE_SIZE;
-}
-
-/** retrieves the current value of the lookup cache size
- *  @return the current lookup cache size
- */
-int
-netsnmp_get_lookup_cache_size(void) {
-    return lookup_cache_size;
-}
-
-NETSNMP_STATIC_INLINE lookup_cache_context *
-get_context_lookup_cache(const char *context) {
-    lookup_cache_context *ptr;
-    if (!context)
-        context = "";
-
-    for(ptr = thecontextcache; ptr; ptr = ptr->next) {
-        if (strcmp(ptr->context, context) == 0)
-            break;
-    }
-    if (!ptr) {
-        if (netsnmp_subtree_find_first(context)) {
-            ptr = SNMP_MALLOC_TYPEDEF(lookup_cache_context);
-            ptr->next = thecontextcache;
-            ptr->context = strdup(context);
-            thecontextcache = ptr;
-        } else {
-            return NULL;
-        }
-    }
-    return ptr;
-}
-
-NETSNMP_STATIC_INLINE void
-lookup_cache_add(const char *context,
-                 netsnmp_subtree *next, netsnmp_subtree *previous) {
-    lookup_cache_context *cptr;
-
-    if ((cptr = get_context_lookup_cache(context)) == NULL)
-        return;
-    
-    if (cptr->thecachecount < lookup_cache_size)
-        cptr->thecachecount++;
-
-    cptr->cache[cptr->currentpos].next = next;
-    cptr->cache[cptr->currentpos].previous = previous;
-
-    if (++cptr->currentpos >= lookup_cache_size)
-        cptr->currentpos = 0;
-}
-
-NETSNMP_STATIC_INLINE void
-lookup_cache_replace(lookup_cache *ptr,
-                     netsnmp_subtree *next, netsnmp_subtree *previous) {
-
-    ptr->next = next;
-    ptr->previous = previous;
-}
-
-NETSNMP_STATIC_INLINE lookup_cache *
-lookup_cache_find(const char *context, oid *name, size_t name_len,
-                  int *retcmp) {
-    lookup_cache_context *cptr;
-    lookup_cache *ret = NULL;
-    int cmp;
-    int i;
-
-    if ((cptr = get_context_lookup_cache(context)) == NULL)
-        return NULL;
-
-    for(i = 0; i < cptr->thecachecount && i < lookup_cache_size; i++) {
-        if (cptr->cache[i].previous->start_a)
-            cmp = snmp_oid_compare(name, name_len,
-                                   cptr->cache[i].previous->start_a,
-                                   cptr->cache[i].previous->start_len);
-        else
-            cmp = 1;
-        if (cmp >= 0) {
-            *retcmp = cmp;
-            ret = &(cptr->cache[i]);
-        }
-    }
-    return ret;
-}
-
-NETSNMP_STATIC_INLINE void
-invalidate_lookup_cache(const char *context) {
-    lookup_cache_context *cptr;
-    if ((cptr = get_context_lookup_cache(context)) != NULL) {
-        cptr->thecachecount = 0;
-        cptr->currentpos = 0;
-    }
-}
-
 netsnmp_subtree *
 netsnmp_subtree_find_prev(oid *name, size_t len, netsnmp_subtree *subtree,
 			  const char *context_name)
@@ -1528,8 +1547,8 @@
            to actually perform a comparison */
         DEBUGMSGTL(("wtest","oid cmp: "));
         DEBUGMSGOID(("wtest", myptr->start_a, myptr->start_len));
-        DEBUGMSG(("wtest","  --- off = %d, in off = %d test = %d\n",
-                  myptr->oid_off, ll_off,
+        DEBUGMSG(("wtest","  --- off = %lu, in off = %lu test = %d\n",
+                  (unsigned long)myptr->oid_off, (unsigned long)ll_off,
                   !(ll_off && myptr->oid_off &&
                     myptr->oid_off > ll_off)));
         if (!(ll_off && myptr->oid_off && myptr->oid_off > ll_off) &&
diff --git a/agent/agent_sysORTable.c b/agent/agent_sysORTable.c
new file mode 100644
index 0000000..d959eaf
--- /dev/null
+++ b/agent/agent_sysORTable.c
@@ -0,0 +1,236 @@
+#include <net-snmp/net-snmp-config.h>
+#if HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#if HAVE_STRING_H
+#include <string.h>
+#else
+#include <strings.h>
+#endif
+#include <stddef.h>
+
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+#include <net-snmp/agent/agent_callbacks.h>
+#include <net-snmp/agent/agent_sysORTable.h>
+#include <net-snmp/agent/sysORTable.h>
+
+typedef struct data_node_s {
+    struct sysORTable data;
+    struct data_node_s* next;
+    struct data_node_s* prev;
+}* data_node;
+
+static data_node table = NULL;
+
+static void
+erase(data_node entry)
+{
+    entry->data.OR_uptime = netsnmp_get_agent_uptime();
+    DEBUGMSGTL(("agent/sysORTable", "UNREG_SYSOR %p\n", &entry->data));
+    snmp_call_callbacks(SNMP_CALLBACK_APPLICATION, SNMPD_CALLBACK_UNREG_SYSOR,
+                        &entry->data);
+    free(entry->data.OR_oid);
+    free(entry->data.OR_descr);
+    if (entry->next == entry)
+        table = NULL;
+    else {
+        entry->next->prev = entry->prev;
+        entry->prev->next = entry->next;
+        if (entry == table)
+            table = entry->next;
+    }
+    free(entry);
+}
+
+void
+netsnmp_sysORTable_foreach(void (*f)(const struct sysORTable*, void*), void* c)
+{
+    DEBUGMSGTL(("agent/sysORTable", "foreach(%p, %p)\n", f, c));
+    if(table) {
+        data_node run = table;
+        do {
+            data_node tmp = run;
+            run = run->next;
+            f(&tmp->data, c);
+        } while(table && run != table);
+    }
+}
+
+int
+register_sysORTable_sess(oid * oidin,
+                         size_t oidlen,
+                         const char *descr, netsnmp_session * ss)
+{
+    data_node entry;
+
+    DEBUGMSGTL(("agent/sysORTable", "registering: "));
+    DEBUGMSGOID(("agent/sysORTable", oidin, oidlen));
+    DEBUGMSG(("agent/sysORTable", ", session %p\n", ss));
+
+    entry = calloc(1, sizeof(struct data_node_s));
+    if (entry == NULL) {
+        DEBUGMSGTL(("agent/sysORTable", "Failed to allocate new entry\n"));
+        return SYS_ORTABLE_REGISTRATION_FAILED;
+    }
+
+    entry->data.OR_descr = strdup(descr);
+    if (entry->data.OR_descr == NULL) {
+        DEBUGMSGTL(("agent/sysORTable", "Failed to allocate new sysORDescr\n"));
+        free(entry);
+        return SYS_ORTABLE_REGISTRATION_FAILED;
+    }
+
+    entry->data.OR_oid = (oid *) malloc(sizeof(oid) * oidlen);
+    if (entry->data.OR_oid == NULL) {
+        DEBUGMSGTL(("agent/sysORTable", "Failed to allocate new sysORID\n"));
+        free(entry->data.OR_descr);
+        free(entry);
+        return SYS_ORTABLE_REGISTRATION_FAILED;
+    }
+
+    memcpy(entry->data.OR_oid, oidin, sizeof(oid) * oidlen);
+    entry->data.OR_oidlen = oidlen;
+    entry->data.OR_sess = ss;
+
+    if(table) {
+        entry->next = table;
+        entry->prev = table->prev;
+        table->prev->next = entry;
+        table->prev = entry;
+    } else
+        table = entry->next = entry->prev = entry;
+
+    entry->data.OR_uptime = netsnmp_get_agent_uptime();
+
+    snmp_call_callbacks(SNMP_CALLBACK_APPLICATION,
+                        SNMPD_CALLBACK_REG_SYSOR, &entry->data);
+
+    return SYS_ORTABLE_REGISTERED_OK;
+}
+
+int
+register_sysORTable(oid * oidin, size_t oidlen, const char *descr)
+{
+    return register_sysORTable_sess(oidin, oidlen, descr, NULL);
+}
+
+int
+unregister_sysORTable_sess(oid * oidin,
+                           size_t oidlen, netsnmp_session * ss)
+{
+    int any_unregistered = 0;
+
+    DEBUGMSGTL(("agent/sysORTable", "sysORTable unregistering: "));
+    DEBUGMSGOID(("agent/sysORTable", oidin, oidlen));
+    DEBUGMSG(("agent/sysORTable", ", session %p\n", ss));
+
+    if(table) {
+        data_node run = table;
+        do {
+            data_node tmp = run;
+            run = run->next;
+            if (tmp->data.OR_sess == ss &&
+                snmp_oid_compare(oidin, oidlen,
+                                 tmp->data.OR_oid, tmp->data.OR_oidlen) == 0) {
+                erase(tmp);
+                any_unregistered = 1;
+            }
+        } while(table && run != table);
+    }
+
+    if (any_unregistered) {
+        DEBUGMSGTL(("agent/sysORTable", "unregistering successfull\n"));
+        return SYS_ORTABLE_UNREGISTERED_OK;
+    } else {
+        DEBUGMSGTL(("agent/sysORTable", "unregistering failed\n"));
+        return SYS_ORTABLE_NO_SUCH_REGISTRATION;
+    }
+}
+
+
+int
+unregister_sysORTable(oid * oidin, size_t oidlen)
+{
+    return unregister_sysORTable_sess(oidin, oidlen, NULL);
+}
+
+
+void
+unregister_sysORTable_by_session(netsnmp_session * ss)
+{
+    DEBUGMSGTL(("agent/sysORTable",
+                "sysORTable unregistering session %p\n", ss));
+
+   if(table) {
+        data_node run = table;
+        do {
+            data_node tmp = run;
+            run = run->next;
+            if (((ss->flags & SNMP_FLAGS_SUBSESSION) &&
+                 tmp->data.OR_sess == ss) ||
+                (!(ss->flags & SNMP_FLAGS_SUBSESSION) && tmp->data.OR_sess &&
+                 tmp->data.OR_sess->subsession == ss))
+                erase(tmp);
+        } while(table && run != table);
+    }
+
+    DEBUGMSGTL(("agent/sysORTable",
+                "sysORTable unregistering session %p done\n", ss));
+}
+
+static int
+register_sysOR_callback(int majorID, int minorID, void *serverarg,
+                        void *clientarg)
+{
+    struct sysORTable *parms = (struct sysORTable *) serverarg;
+
+    return register_sysORTable_sess(parms->OR_oid, parms->OR_oidlen,
+                                    parms->OR_descr, parms->OR_sess);
+}
+
+static int
+unregister_sysOR_by_session_callback(int majorID, int minorID,
+                                     void *serverarg, void *clientarg)
+{
+    netsnmp_session *session = (netsnmp_session *) serverarg;
+
+    unregister_sysORTable_by_session(session);
+
+    return 0;
+}
+
+static int
+unregister_sysOR_callback(int majorID, int minorID, void *serverarg,
+                          void *clientarg)
+{
+    struct sysORTable *parms = (struct sysORTable *) serverarg;
+
+    return unregister_sysORTable_sess(parms->OR_oid,
+                                      parms->OR_oidlen,
+                                      parms->OR_sess);
+}
+
+void
+init_agent_sysORTable(void)
+{
+    DEBUGMSGTL(("agent/sysORTable", "init_agent_sysORTable\n"));
+
+    snmp_register_callback(SNMP_CALLBACK_APPLICATION,
+                           SNMPD_CALLBACK_REQ_REG_SYSOR,
+                           register_sysOR_callback, NULL);
+    snmp_register_callback(SNMP_CALLBACK_APPLICATION,
+                           SNMPD_CALLBACK_REQ_UNREG_SYSOR,
+                           unregister_sysOR_callback, NULL);
+    snmp_register_callback(SNMP_CALLBACK_APPLICATION,
+                           SNMPD_CALLBACK_REQ_UNREG_SYSOR_SESS,
+                           unregister_sysOR_by_session_callback, NULL);
+}
+
+void
+shutdown_agent_sysORTable(void)
+{
+    DEBUGMSGTL(("agent/sysORTable", "shutdown_sysORTable\n"));
+    while(table)
+        erase(table);
+}
diff --git a/agent/agent_trap.c b/agent/agent_trap.c
index 1359c90..88479ab 100644
--- a/agent/agent_trap.c
+++ b/agent/agent_trap.c
@@ -58,6 +58,7 @@
 #include <net-snmp/utilities.h>
 
 #include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
 #include <net-snmp/agent/agent_trap.h>
 #include <net-snmp/agent/snmp_agent.h>
 #include <net-snmp/agent/agent_callbacks.h>
@@ -153,6 +154,7 @@
 static void
 free_trap_session(struct trap_sink *sp)
 {
+    DEBUGMSGTL(("trap", "freeing callback trap session (%p, %p)\n", sp, sp->sesp));
     snmp_close(sp->sesp);
     free(sp);
 }
@@ -168,7 +170,7 @@
          * something else wants to handle notification registrations 
          */
         struct agent_add_trap_args args;
-        DEBUGMSGTL(("trap", "adding callback trap sink\n"));
+        DEBUGMSGTL(("trap", "adding callback trap sink (%p)\n", ss));
         args.ss = ss;
         args.confirm = confirm;
         snmp_call_callbacks(SNMP_CALLBACK_APPLICATION,
@@ -197,8 +199,9 @@
 int
 remove_trap_session(netsnmp_session * ss)
 {
-    struct trap_sink *sp = sinks, *prev = 0;
+    struct trap_sink *sp = sinks, *prev = NULL;
 
+    DEBUGMSGTL(("trap", "removing trap sessions\n"));
     while (sp) {
         if (sp->sesp == ss) {
             if (prev) {
@@ -216,6 +219,7 @@
             /*
              * free_trap_session(sp);  
              */
+            DEBUGMSGTL(("trap", "removing trap session (%p, %p)\n", sp, sp->sesp));
             free(sp);
             return 1;
         }
@@ -318,6 +322,7 @@
 snmpd_free_trapsinks(void)
 {
     struct trap_sink *sp = sinks;
+    DEBUGMSGTL(("trap", "freeing trap sessions\n"));
     while (sp) {
         sinks = sinks->next;
         free_trap_session(sp);
@@ -338,7 +343,6 @@
     netsnmp_pdu           *template_v1pdu;
     netsnmp_variable_list *first_vb, *vblist;
     netsnmp_variable_list *var;
-    size_t                 len;
 
     /*
      * Make a copy of the v2 Trap PDU
@@ -418,9 +422,10 @@
                              snmptrapenterprise_oid,
                              snmptrapenterprise_oid_len);
         if (var) {
-            template_v1pdu->enterprise =
-                netsnmp_memdup(var->val.objid, var->val_len);
             template_v1pdu->enterprise_length = var->val_len/sizeof(oid);
+            template_v1pdu->enterprise =
+                snmp_duplicate_objid(var->val.objid,
+                                     template_v1pdu->enterprise_length);
         } else {
             template_v1pdu->enterprise        = NULL;
             template_v1pdu->enterprise_length = 0;		/* XXX ??? */
@@ -430,7 +435,7 @@
          * For enterprise-specific traps, split the snmpTrapOID value
          *   into enterprise and specific trap
          */
-        len = vblist->val_len / sizeof(oid);
+        size_t len = vblist->val_len / sizeof(oid);
         if ( len <= 2 ) {
             snmp_log(LOG_WARNING,
                      "send_trap: v2 trapOID too short (%d)\n", (int)len);
@@ -444,7 +449,7 @@
             len--;
         SNMP_FREE(template_v1pdu->enterprise);
         template_v1pdu->enterprise =
-            netsnmp_memdup(vblist->val.objid, len*sizeof(oid));
+            snmp_duplicate_objid(vblist->val.objid, len);
         template_v1pdu->enterprise_length = len;
     }
     var = find_varbind_in_list( vblist, agentaddr_oid,
@@ -637,6 +642,8 @@
     in_addr_t             *pdu_in_addr_t;
     u_long                 uptime;
     struct trap_sink *sink;
+    const char            *v1trapaddress;
+    int                    res;
 
     DEBUGMSGTL(( "trap", "send_trap %d %d ", trap, specific));
     DEBUGMSGOID(("trap", enterprise, enterprise_length));
@@ -790,9 +797,29 @@
      * Ensure that the v1 trap PDU includes the local IP address
      */
        pdu_in_addr_t = (in_addr_t *) template_v1pdu->agent_addr;
-      *pdu_in_addr_t = get_myaddr();
+       v1trapaddress = netsnmp_ds_get_string(NETSNMP_DS_APPLICATION_ID,
+                                      NETSNMP_DS_AGENT_TRAP_ADDR);
+       if (v1trapaddress != NULL) {
+           /* "v1trapaddress" was specified in config, try to resolve it */
+           res = netsnmp_gethostbyname_v4(v1trapaddress, pdu_in_addr_t);
+       }
+       if (v1trapaddress == NULL || res < 0) {
+           /* "v1trapaddress" was not specified in config or the resolution failed,
+            * try any local address */
+           *pdu_in_addr_t = get_myaddr();
+       }
+
     }
 
+    if (template_v2pdu) {
+	/* A context name was provided, so copy it and its length to the v2 pdu
+	 * template. */
+	if (context != NULL)
+	{
+		template_v2pdu->contextName    = strdup(context);
+		template_v2pdu->contextNameLen = strlen(context);
+	}
+    }
 
     /*
      *  Now loop through the list of trap sinks
@@ -949,6 +976,21 @@
                                   OID_LENGTH(trap_version_id), vars);
 }
 
+/* Send a trap under a context */
+void send_trap_vars_with_context(int trap, int specific, 
+              netsnmp_variable_list *vars, char *context)
+{
+    if (trap == SNMP_TRAP_ENTERPRISESPECIFIC)
+        netsnmp_send_traps(trap, specific, objid_enterprisetrap,
+                                  OID_LENGTH(objid_enterprisetrap), vars,
+								  context, 0);
+    else
+        netsnmp_send_traps(trap, specific, trap_version_id,
+                                  OID_LENGTH(trap_version_id), vars, 
+								  context, 0);
+    	
+}
+
 /**
  * Sends an SNMPv1 trap (or the SNMPv2 equivalent) to the list of  
  * configured trap destinations (or "sinks"), using the provided 
@@ -1007,6 +1049,25 @@
     send_trap_vars(-1, -1, vars);
 }
 
+/**
+ * Similar to send_v2trap(), with the added ability to specify a context.  If
+ * the last parameter is NULL, then this call is equivalent to send_v2trap().
+ *
+ * @param vars is used to supply the list of variable bindings for the trap.
+ * 
+ * @param context is used to specify the context of the trap.
+ *
+ * @return void
+ *
+ * @see send_v2trap
+ */
+void send_v3trap(netsnmp_variable_list *vars, char *context)
+{
+    netsnmp_send_traps(-1, -1, 
+					trap_version_id, OID_LENGTH(trap_version_id),
+                    vars, context, 0);
+}
+
 void
 send_trap_pdu(netsnmp_pdu *pdu)
 {
@@ -1073,7 +1134,6 @@
 void
 snmpd_parse_config_trapsink(const char *token, char *cptr)
 {
-    char            tmpbuf[1024];
     char           *sp, *cp, *pp = NULL;
     char            *st;
 
@@ -1086,9 +1146,7 @@
     if (pp)
 	config_pwarn("The separate port argument to trapsink is deprecated");
     if (create_v1_trap_session(sp, pp, cp ? cp : snmp_trapcommunity) == 0) {
-        snprintf(tmpbuf, sizeof(tmpbuf), "cannot create trapsink: %s", cptr);
-        tmpbuf[sizeof(tmpbuf)-1] = '\0';
-        config_perror(tmpbuf);
+	netsnmp_config_error("cannot create trapsink: %s", cptr);
     }
 }
 #endif
@@ -1097,9 +1155,7 @@
 void
 snmpd_parse_config_trap2sink(const char *word, char *cptr)
 {
-    char            tmpbuf[1024];
-    char           *sp, *cp, *pp = NULL;
-    char            *st;
+    char           *st, *sp, *cp, *pp = NULL;
 
     if (!snmp_trapcommunity)
         snmp_trapcommunity = strdup("public");
@@ -1110,18 +1166,14 @@
     if (pp)
 	config_pwarn("The separate port argument to trapsink2 is deprecated");
     if (create_v2_trap_session(sp, pp, cp ? cp : snmp_trapcommunity) == 0) {
-        snprintf(tmpbuf, sizeof(tmpbuf), "cannot create trap2sink: %s", cptr);
-        tmpbuf[sizeof(tmpbuf)-1] = '\0';
-        config_perror(tmpbuf);
+	netsnmp_config_error("cannot create trap2sink: %s", cptr);
     }
 }
 
 void
 snmpd_parse_config_informsink(const char *word, char *cptr)
 {
-    char            tmpbuf[1024];
-    char           *sp, *cp, *pp = NULL;
-    char            *st;
+    char           *st, *sp, *cp, *pp = NULL;
 
     if (!snmp_trapcommunity)
         snmp_trapcommunity = strdup("public");
@@ -1132,9 +1184,7 @@
     if (pp)
 	config_pwarn("The separate port argument to informsink is deprecated");
     if (create_v2_inform_session(sp, pp, cp ? cp : snmp_trapcommunity) == 0) {
-        snprintf(tmpbuf, sizeof(tmpbuf), "cannot create informsink: %s", cptr);
-        tmpbuf[sizeof(tmpbuf)-1] = '\0';
-        config_perror(tmpbuf);
+	netsnmp_config_error("cannot create informsink: %s", cptr);
     }
 }
 #endif
diff --git a/agent/auto_nlist.c b/agent/auto_nlist.c
index dff1f2b..0b5995a 100644
--- a/agent/auto_nlist.c
+++ b/agent/auto_nlist.c
@@ -149,7 +149,6 @@
 static void
 init_nlist(struct nlist nl[])
 {
-#ifdef NETSNMP_CAN_USE_NLIST
     int             ret;
 #if HAVE_KVM_OPENFILES
     kvm_t          *kernel;
@@ -222,7 +221,6 @@
                         (unsigned int) nl[ret].n_value));
         }
     }
-#endif                          /* NETSNMP_CAN_USE_NLIST */
 }
 
 int
diff --git a/agent/helpers/Makefile.depend b/agent/helpers/Makefile.depend
index 83fe54e..c24e34c 100644
--- a/agent/helpers/Makefile.depend
+++ b/agent/helpers/Makefile.depend
@@ -8,32 +8,14 @@
 ./all_helpers.lo: ../../include/net-snmp/net-snmp-includes.h
 ./all_helpers.lo: ../../include/net-snmp/definitions.h
 ./all_helpers.lo: ../../include/net-snmp/types.h
+./all_helpers.lo: ../../include/net-snmp/library/types.h
 ./all_helpers.lo: ../../include/net-snmp/library/snmp_api.h
-./all_helpers.lo: ../../include/net-snmp/library/asn1.h
-./all_helpers.lo: ../../include/net-snmp/library/snmp_impl.h
-./all_helpers.lo: ../../include/net-snmp/library/snmp.h
-./all_helpers.lo: ../../include/net-snmp/library/snmp-tc.h
-./all_helpers.lo: ../../include/net-snmp/utilities.h
+./all_helpers.lo: ../../include/net-snmp/varbind_api.h
 ./all_helpers.lo: ../../include/net-snmp/library/snmp_client.h
-./all_helpers.lo: ../../include/net-snmp/library/system.h
-./all_helpers.lo: ../../include/net-snmp/library/tools.h
-./all_helpers.lo: ../../include/net-snmp/library/int64.h
-./all_helpers.lo: ../../include/net-snmp/library/mt_support.h
-./all_helpers.lo: ../../include/net-snmp/library/snmp_alarm.h
-./all_helpers.lo: ../../include/net-snmp/library/callback.h
-./all_helpers.lo: ../../include/net-snmp/library/data_list.h
-./all_helpers.lo: ../../include/net-snmp/library/oid_stash.h
-./all_helpers.lo: ../../include/net-snmp/library/check_varbind.h
-./all_helpers.lo: ../../include/net-snmp/library/container.h
-./all_helpers.lo: ../../include/net-snmp/library/factory.h
-./all_helpers.lo: ../../include/net-snmp/library/snmp_logging.h
-./all_helpers.lo: ../../include/net-snmp/library/container_binary_array.h
-./all_helpers.lo: ../../include/net-snmp/library/container_list_ssll.h
-./all_helpers.lo: ../../include/net-snmp/library/container_iterator.h
-./all_helpers.lo: ../../include/net-snmp/library/container.h
-./all_helpers.lo: ../../include/net-snmp/library/snmp_assert.h
-./all_helpers.lo: ../../include/net-snmp/version.h
+./all_helpers.lo: ../../include/net-snmp/pdu_api.h
+./all_helpers.lo: ../../include/net-snmp/library/asn1.h
 ./all_helpers.lo: ../../include/net-snmp/session_api.h
+./all_helpers.lo: ../../include/net-snmp/library/callback.h
 ./all_helpers.lo: ../../include/net-snmp/library/snmp_transport.h
 ./all_helpers.lo: ../../include/net-snmp/library/snmp_service.h
 ./all_helpers.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -44,11 +26,31 @@
 ./all_helpers.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./all_helpers.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./all_helpers.lo: ../../include/net-snmp/library/ucd_compat.h
-./all_helpers.lo: ../../include/net-snmp/pdu_api.h
-./all_helpers.lo: ../../include/net-snmp/mib_api.h
 ./all_helpers.lo: ../../include/net-snmp/library/mib.h
+./all_helpers.lo: ../../include/net-snmp/mib_api.h
 ./all_helpers.lo: ../../include/net-snmp/library/parse.h
-./all_helpers.lo: ../../include/net-snmp/varbind_api.h
+./all_helpers.lo: ../../include/net-snmp/library/oid_stash.h
+./all_helpers.lo: ../../include/net-snmp/library/snmp_impl.h
+./all_helpers.lo: ../../include/net-snmp/library/snmp.h
+./all_helpers.lo: ../../include/net-snmp/library/snmp-tc.h
+./all_helpers.lo: ../../include/net-snmp/library/getopt.h
+./all_helpers.lo: ../../include/net-snmp/utilities.h
+./all_helpers.lo: ../../include/net-snmp/library/system.h
+./all_helpers.lo: ../../include/net-snmp/library/tools.h
+./all_helpers.lo: ../../include/net-snmp/library/int64.h
+./all_helpers.lo: ../../include/net-snmp/library/mt_support.h
+./all_helpers.lo: ../../include/net-snmp/library/snmp_alarm.h
+./all_helpers.lo: ../../include/net-snmp/library/data_list.h
+./all_helpers.lo: ../../include/net-snmp/library/check_varbind.h
+./all_helpers.lo: ../../include/net-snmp/library/container.h
+./all_helpers.lo: ../../include/net-snmp/library/factory.h
+./all_helpers.lo: ../../include/net-snmp/library/snmp_logging.h
+./all_helpers.lo: ../../include/net-snmp/library/container_binary_array.h
+./all_helpers.lo: ../../include/net-snmp/library/container_list_ssll.h
+./all_helpers.lo: ../../include/net-snmp/library/container_iterator.h
+./all_helpers.lo: ../../include/net-snmp/library/container.h
+./all_helpers.lo: ../../include/net-snmp/library/snmp_assert.h
+./all_helpers.lo: ../../include/net-snmp/version.h
 ./all_helpers.lo: ../../include/net-snmp/config_api.h
 ./all_helpers.lo: ../../include/net-snmp/library/read_config.h
 ./all_helpers.lo: ../../include/net-snmp/library/default_store.h
@@ -102,6 +104,7 @@
 ./all_helpers.lo: ../../include/net-snmp/agent/table_container.h
 ./all_helpers.lo: ../../include/net-snmp/agent/table_array.h
 ./all_helpers.lo: ../../include/net-snmp/agent/mfd.h
+./all_helpers.lo: ../../include/net-snmp/agent/stash_cache.h
 ./baby_steps.lo: ../../include/net-snmp/net-snmp-config.h
 ./baby_steps.lo: ../../include/net-snmp/system/linux.h
 ./baby_steps.lo: ../../include/net-snmp/system/sysv.h
@@ -110,32 +113,14 @@
 ./baby_steps.lo: ../../include/net-snmp/net-snmp-includes.h
 ./baby_steps.lo: ../../include/net-snmp/definitions.h
 ./baby_steps.lo: ../../include/net-snmp/types.h
+./baby_steps.lo: ../../include/net-snmp/library/types.h
 ./baby_steps.lo: ../../include/net-snmp/library/snmp_api.h
-./baby_steps.lo: ../../include/net-snmp/library/asn1.h
-./baby_steps.lo: ../../include/net-snmp/library/snmp_impl.h
-./baby_steps.lo: ../../include/net-snmp/library/snmp.h
-./baby_steps.lo: ../../include/net-snmp/library/snmp-tc.h
-./baby_steps.lo: ../../include/net-snmp/utilities.h
+./baby_steps.lo: ../../include/net-snmp/varbind_api.h
 ./baby_steps.lo: ../../include/net-snmp/library/snmp_client.h
-./baby_steps.lo: ../../include/net-snmp/library/system.h
-./baby_steps.lo: ../../include/net-snmp/library/tools.h
-./baby_steps.lo: ../../include/net-snmp/library/int64.h
-./baby_steps.lo: ../../include/net-snmp/library/mt_support.h
-./baby_steps.lo: ../../include/net-snmp/library/snmp_alarm.h
-./baby_steps.lo: ../../include/net-snmp/library/callback.h
-./baby_steps.lo: ../../include/net-snmp/library/data_list.h
-./baby_steps.lo: ../../include/net-snmp/library/oid_stash.h
-./baby_steps.lo: ../../include/net-snmp/library/check_varbind.h
-./baby_steps.lo: ../../include/net-snmp/library/container.h
-./baby_steps.lo: ../../include/net-snmp/library/factory.h
-./baby_steps.lo: ../../include/net-snmp/library/snmp_logging.h
-./baby_steps.lo: ../../include/net-snmp/library/container_binary_array.h
-./baby_steps.lo: ../../include/net-snmp/library/container_list_ssll.h
-./baby_steps.lo: ../../include/net-snmp/library/container_iterator.h
-./baby_steps.lo: ../../include/net-snmp/library/container.h
-./baby_steps.lo: ../../include/net-snmp/library/snmp_assert.h
-./baby_steps.lo: ../../include/net-snmp/version.h
+./baby_steps.lo: ../../include/net-snmp/pdu_api.h
+./baby_steps.lo: ../../include/net-snmp/library/asn1.h
 ./baby_steps.lo: ../../include/net-snmp/session_api.h
+./baby_steps.lo: ../../include/net-snmp/library/callback.h
 ./baby_steps.lo: ../../include/net-snmp/library/snmp_transport.h
 ./baby_steps.lo: ../../include/net-snmp/library/snmp_service.h
 ./baby_steps.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -146,11 +131,31 @@
 ./baby_steps.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./baby_steps.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./baby_steps.lo: ../../include/net-snmp/library/ucd_compat.h
-./baby_steps.lo: ../../include/net-snmp/pdu_api.h
-./baby_steps.lo: ../../include/net-snmp/mib_api.h
 ./baby_steps.lo: ../../include/net-snmp/library/mib.h
+./baby_steps.lo: ../../include/net-snmp/mib_api.h
 ./baby_steps.lo: ../../include/net-snmp/library/parse.h
-./baby_steps.lo: ../../include/net-snmp/varbind_api.h
+./baby_steps.lo: ../../include/net-snmp/library/oid_stash.h
+./baby_steps.lo: ../../include/net-snmp/library/snmp_impl.h
+./baby_steps.lo: ../../include/net-snmp/library/snmp.h
+./baby_steps.lo: ../../include/net-snmp/library/snmp-tc.h
+./baby_steps.lo: ../../include/net-snmp/library/getopt.h
+./baby_steps.lo: ../../include/net-snmp/utilities.h
+./baby_steps.lo: ../../include/net-snmp/library/system.h
+./baby_steps.lo: ../../include/net-snmp/library/tools.h
+./baby_steps.lo: ../../include/net-snmp/library/int64.h
+./baby_steps.lo: ../../include/net-snmp/library/mt_support.h
+./baby_steps.lo: ../../include/net-snmp/library/snmp_alarm.h
+./baby_steps.lo: ../../include/net-snmp/library/data_list.h
+./baby_steps.lo: ../../include/net-snmp/library/check_varbind.h
+./baby_steps.lo: ../../include/net-snmp/library/container.h
+./baby_steps.lo: ../../include/net-snmp/library/factory.h
+./baby_steps.lo: ../../include/net-snmp/library/snmp_logging.h
+./baby_steps.lo: ../../include/net-snmp/library/container_binary_array.h
+./baby_steps.lo: ../../include/net-snmp/library/container_list_ssll.h
+./baby_steps.lo: ../../include/net-snmp/library/container_iterator.h
+./baby_steps.lo: ../../include/net-snmp/library/container.h
+./baby_steps.lo: ../../include/net-snmp/library/snmp_assert.h
+./baby_steps.lo: ../../include/net-snmp/version.h
 ./baby_steps.lo: ../../include/net-snmp/config_api.h
 ./baby_steps.lo: ../../include/net-snmp/library/read_config.h
 ./baby_steps.lo: ../../include/net-snmp/library/default_store.h
@@ -212,32 +217,14 @@
 ./bulk_to_next.lo: ../../include/net-snmp/net-snmp-includes.h
 ./bulk_to_next.lo: ../../include/net-snmp/definitions.h
 ./bulk_to_next.lo: ../../include/net-snmp/types.h
+./bulk_to_next.lo: ../../include/net-snmp/library/types.h
 ./bulk_to_next.lo: ../../include/net-snmp/library/snmp_api.h
-./bulk_to_next.lo: ../../include/net-snmp/library/asn1.h
-./bulk_to_next.lo: ../../include/net-snmp/library/snmp_impl.h
-./bulk_to_next.lo: ../../include/net-snmp/library/snmp.h
-./bulk_to_next.lo: ../../include/net-snmp/library/snmp-tc.h
-./bulk_to_next.lo: ../../include/net-snmp/utilities.h
+./bulk_to_next.lo: ../../include/net-snmp/varbind_api.h
 ./bulk_to_next.lo: ../../include/net-snmp/library/snmp_client.h
-./bulk_to_next.lo: ../../include/net-snmp/library/system.h
-./bulk_to_next.lo: ../../include/net-snmp/library/tools.h
-./bulk_to_next.lo: ../../include/net-snmp/library/int64.h
-./bulk_to_next.lo: ../../include/net-snmp/library/mt_support.h
-./bulk_to_next.lo: ../../include/net-snmp/library/snmp_alarm.h
-./bulk_to_next.lo: ../../include/net-snmp/library/callback.h
-./bulk_to_next.lo: ../../include/net-snmp/library/data_list.h
-./bulk_to_next.lo: ../../include/net-snmp/library/oid_stash.h
-./bulk_to_next.lo: ../../include/net-snmp/library/check_varbind.h
-./bulk_to_next.lo: ../../include/net-snmp/library/container.h
-./bulk_to_next.lo: ../../include/net-snmp/library/factory.h
-./bulk_to_next.lo: ../../include/net-snmp/library/snmp_logging.h
-./bulk_to_next.lo: ../../include/net-snmp/library/container_binary_array.h
-./bulk_to_next.lo: ../../include/net-snmp/library/container_list_ssll.h
-./bulk_to_next.lo: ../../include/net-snmp/library/container_iterator.h
-./bulk_to_next.lo: ../../include/net-snmp/library/container.h
-./bulk_to_next.lo: ../../include/net-snmp/library/snmp_assert.h
-./bulk_to_next.lo: ../../include/net-snmp/version.h
+./bulk_to_next.lo: ../../include/net-snmp/pdu_api.h
+./bulk_to_next.lo: ../../include/net-snmp/library/asn1.h
 ./bulk_to_next.lo: ../../include/net-snmp/session_api.h
+./bulk_to_next.lo: ../../include/net-snmp/library/callback.h
 ./bulk_to_next.lo: ../../include/net-snmp/library/snmp_transport.h
 ./bulk_to_next.lo: ../../include/net-snmp/library/snmp_service.h
 ./bulk_to_next.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -248,11 +235,31 @@
 ./bulk_to_next.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./bulk_to_next.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./bulk_to_next.lo: ../../include/net-snmp/library/ucd_compat.h
-./bulk_to_next.lo: ../../include/net-snmp/pdu_api.h
-./bulk_to_next.lo: ../../include/net-snmp/mib_api.h
 ./bulk_to_next.lo: ../../include/net-snmp/library/mib.h
+./bulk_to_next.lo: ../../include/net-snmp/mib_api.h
 ./bulk_to_next.lo: ../../include/net-snmp/library/parse.h
-./bulk_to_next.lo: ../../include/net-snmp/varbind_api.h
+./bulk_to_next.lo: ../../include/net-snmp/library/oid_stash.h
+./bulk_to_next.lo: ../../include/net-snmp/library/snmp_impl.h
+./bulk_to_next.lo: ../../include/net-snmp/library/snmp.h
+./bulk_to_next.lo: ../../include/net-snmp/library/snmp-tc.h
+./bulk_to_next.lo: ../../include/net-snmp/library/getopt.h
+./bulk_to_next.lo: ../../include/net-snmp/utilities.h
+./bulk_to_next.lo: ../../include/net-snmp/library/system.h
+./bulk_to_next.lo: ../../include/net-snmp/library/tools.h
+./bulk_to_next.lo: ../../include/net-snmp/library/int64.h
+./bulk_to_next.lo: ../../include/net-snmp/library/mt_support.h
+./bulk_to_next.lo: ../../include/net-snmp/library/snmp_alarm.h
+./bulk_to_next.lo: ../../include/net-snmp/library/data_list.h
+./bulk_to_next.lo: ../../include/net-snmp/library/check_varbind.h
+./bulk_to_next.lo: ../../include/net-snmp/library/container.h
+./bulk_to_next.lo: ../../include/net-snmp/library/factory.h
+./bulk_to_next.lo: ../../include/net-snmp/library/snmp_logging.h
+./bulk_to_next.lo: ../../include/net-snmp/library/container_binary_array.h
+./bulk_to_next.lo: ../../include/net-snmp/library/container_list_ssll.h
+./bulk_to_next.lo: ../../include/net-snmp/library/container_iterator.h
+./bulk_to_next.lo: ../../include/net-snmp/library/container.h
+./bulk_to_next.lo: ../../include/net-snmp/library/snmp_assert.h
+./bulk_to_next.lo: ../../include/net-snmp/version.h
 ./bulk_to_next.lo: ../../include/net-snmp/config_api.h
 ./bulk_to_next.lo: ../../include/net-snmp/library/read_config.h
 ./bulk_to_next.lo: ../../include/net-snmp/library/default_store.h
@@ -314,32 +321,14 @@
 ./cache_handler.lo: ../../include/net-snmp/net-snmp-includes.h
 ./cache_handler.lo: ../../include/net-snmp/definitions.h
 ./cache_handler.lo: ../../include/net-snmp/types.h
+./cache_handler.lo: ../../include/net-snmp/library/types.h
 ./cache_handler.lo: ../../include/net-snmp/library/snmp_api.h
-./cache_handler.lo: ../../include/net-snmp/library/asn1.h
-./cache_handler.lo: ../../include/net-snmp/library/snmp_impl.h
-./cache_handler.lo: ../../include/net-snmp/library/snmp.h
-./cache_handler.lo: ../../include/net-snmp/library/snmp-tc.h
-./cache_handler.lo: ../../include/net-snmp/utilities.h
+./cache_handler.lo: ../../include/net-snmp/varbind_api.h
 ./cache_handler.lo: ../../include/net-snmp/library/snmp_client.h
-./cache_handler.lo: ../../include/net-snmp/library/system.h
-./cache_handler.lo: ../../include/net-snmp/library/tools.h
-./cache_handler.lo: ../../include/net-snmp/library/int64.h
-./cache_handler.lo: ../../include/net-snmp/library/mt_support.h
-./cache_handler.lo: ../../include/net-snmp/library/snmp_alarm.h
-./cache_handler.lo: ../../include/net-snmp/library/callback.h
-./cache_handler.lo: ../../include/net-snmp/library/data_list.h
-./cache_handler.lo: ../../include/net-snmp/library/oid_stash.h
-./cache_handler.lo: ../../include/net-snmp/library/check_varbind.h
-./cache_handler.lo: ../../include/net-snmp/library/container.h
-./cache_handler.lo: ../../include/net-snmp/library/factory.h
-./cache_handler.lo: ../../include/net-snmp/library/snmp_logging.h
-./cache_handler.lo: ../../include/net-snmp/library/container_binary_array.h
-./cache_handler.lo: ../../include/net-snmp/library/container_list_ssll.h
-./cache_handler.lo: ../../include/net-snmp/library/container_iterator.h
-./cache_handler.lo: ../../include/net-snmp/library/container.h
-./cache_handler.lo: ../../include/net-snmp/library/snmp_assert.h
-./cache_handler.lo: ../../include/net-snmp/version.h
+./cache_handler.lo: ../../include/net-snmp/pdu_api.h
+./cache_handler.lo: ../../include/net-snmp/library/asn1.h
 ./cache_handler.lo: ../../include/net-snmp/session_api.h
+./cache_handler.lo: ../../include/net-snmp/library/callback.h
 ./cache_handler.lo: ../../include/net-snmp/library/snmp_transport.h
 ./cache_handler.lo: ../../include/net-snmp/library/snmp_service.h
 ./cache_handler.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -350,11 +339,31 @@
 ./cache_handler.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./cache_handler.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./cache_handler.lo: ../../include/net-snmp/library/ucd_compat.h
-./cache_handler.lo: ../../include/net-snmp/pdu_api.h
-./cache_handler.lo: ../../include/net-snmp/mib_api.h
 ./cache_handler.lo: ../../include/net-snmp/library/mib.h
+./cache_handler.lo: ../../include/net-snmp/mib_api.h
 ./cache_handler.lo: ../../include/net-snmp/library/parse.h
-./cache_handler.lo: ../../include/net-snmp/varbind_api.h
+./cache_handler.lo: ../../include/net-snmp/library/oid_stash.h
+./cache_handler.lo: ../../include/net-snmp/library/snmp_impl.h
+./cache_handler.lo: ../../include/net-snmp/library/snmp.h
+./cache_handler.lo: ../../include/net-snmp/library/snmp-tc.h
+./cache_handler.lo: ../../include/net-snmp/library/getopt.h
+./cache_handler.lo: ../../include/net-snmp/utilities.h
+./cache_handler.lo: ../../include/net-snmp/library/system.h
+./cache_handler.lo: ../../include/net-snmp/library/tools.h
+./cache_handler.lo: ../../include/net-snmp/library/int64.h
+./cache_handler.lo: ../../include/net-snmp/library/mt_support.h
+./cache_handler.lo: ../../include/net-snmp/library/snmp_alarm.h
+./cache_handler.lo: ../../include/net-snmp/library/data_list.h
+./cache_handler.lo: ../../include/net-snmp/library/check_varbind.h
+./cache_handler.lo: ../../include/net-snmp/library/container.h
+./cache_handler.lo: ../../include/net-snmp/library/factory.h
+./cache_handler.lo: ../../include/net-snmp/library/snmp_logging.h
+./cache_handler.lo: ../../include/net-snmp/library/container_binary_array.h
+./cache_handler.lo: ../../include/net-snmp/library/container_list_ssll.h
+./cache_handler.lo: ../../include/net-snmp/library/container_iterator.h
+./cache_handler.lo: ../../include/net-snmp/library/container.h
+./cache_handler.lo: ../../include/net-snmp/library/snmp_assert.h
+./cache_handler.lo: ../../include/net-snmp/version.h
 ./cache_handler.lo: ../../include/net-snmp/config_api.h
 ./cache_handler.lo: ../../include/net-snmp/library/read_config.h
 ./cache_handler.lo: ../../include/net-snmp/library/default_store.h
@@ -416,32 +425,14 @@
 ./debug_handler.lo: ../../include/net-snmp/net-snmp-includes.h
 ./debug_handler.lo: ../../include/net-snmp/definitions.h
 ./debug_handler.lo: ../../include/net-snmp/types.h
+./debug_handler.lo: ../../include/net-snmp/library/types.h
 ./debug_handler.lo: ../../include/net-snmp/library/snmp_api.h
-./debug_handler.lo: ../../include/net-snmp/library/asn1.h
-./debug_handler.lo: ../../include/net-snmp/library/snmp_impl.h
-./debug_handler.lo: ../../include/net-snmp/library/snmp.h
-./debug_handler.lo: ../../include/net-snmp/library/snmp-tc.h
-./debug_handler.lo: ../../include/net-snmp/utilities.h
+./debug_handler.lo: ../../include/net-snmp/varbind_api.h
 ./debug_handler.lo: ../../include/net-snmp/library/snmp_client.h
-./debug_handler.lo: ../../include/net-snmp/library/system.h
-./debug_handler.lo: ../../include/net-snmp/library/tools.h
-./debug_handler.lo: ../../include/net-snmp/library/int64.h
-./debug_handler.lo: ../../include/net-snmp/library/mt_support.h
-./debug_handler.lo: ../../include/net-snmp/library/snmp_alarm.h
-./debug_handler.lo: ../../include/net-snmp/library/callback.h
-./debug_handler.lo: ../../include/net-snmp/library/data_list.h
-./debug_handler.lo: ../../include/net-snmp/library/oid_stash.h
-./debug_handler.lo: ../../include/net-snmp/library/check_varbind.h
-./debug_handler.lo: ../../include/net-snmp/library/container.h
-./debug_handler.lo: ../../include/net-snmp/library/factory.h
-./debug_handler.lo: ../../include/net-snmp/library/snmp_logging.h
-./debug_handler.lo: ../../include/net-snmp/library/container_binary_array.h
-./debug_handler.lo: ../../include/net-snmp/library/container_list_ssll.h
-./debug_handler.lo: ../../include/net-snmp/library/container_iterator.h
-./debug_handler.lo: ../../include/net-snmp/library/container.h
-./debug_handler.lo: ../../include/net-snmp/library/snmp_assert.h
-./debug_handler.lo: ../../include/net-snmp/version.h
+./debug_handler.lo: ../../include/net-snmp/pdu_api.h
+./debug_handler.lo: ../../include/net-snmp/library/asn1.h
 ./debug_handler.lo: ../../include/net-snmp/session_api.h
+./debug_handler.lo: ../../include/net-snmp/library/callback.h
 ./debug_handler.lo: ../../include/net-snmp/library/snmp_transport.h
 ./debug_handler.lo: ../../include/net-snmp/library/snmp_service.h
 ./debug_handler.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -452,11 +443,31 @@
 ./debug_handler.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./debug_handler.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./debug_handler.lo: ../../include/net-snmp/library/ucd_compat.h
-./debug_handler.lo: ../../include/net-snmp/pdu_api.h
-./debug_handler.lo: ../../include/net-snmp/mib_api.h
 ./debug_handler.lo: ../../include/net-snmp/library/mib.h
+./debug_handler.lo: ../../include/net-snmp/mib_api.h
 ./debug_handler.lo: ../../include/net-snmp/library/parse.h
-./debug_handler.lo: ../../include/net-snmp/varbind_api.h
+./debug_handler.lo: ../../include/net-snmp/library/oid_stash.h
+./debug_handler.lo: ../../include/net-snmp/library/snmp_impl.h
+./debug_handler.lo: ../../include/net-snmp/library/snmp.h
+./debug_handler.lo: ../../include/net-snmp/library/snmp-tc.h
+./debug_handler.lo: ../../include/net-snmp/library/getopt.h
+./debug_handler.lo: ../../include/net-snmp/utilities.h
+./debug_handler.lo: ../../include/net-snmp/library/system.h
+./debug_handler.lo: ../../include/net-snmp/library/tools.h
+./debug_handler.lo: ../../include/net-snmp/library/int64.h
+./debug_handler.lo: ../../include/net-snmp/library/mt_support.h
+./debug_handler.lo: ../../include/net-snmp/library/snmp_alarm.h
+./debug_handler.lo: ../../include/net-snmp/library/data_list.h
+./debug_handler.lo: ../../include/net-snmp/library/check_varbind.h
+./debug_handler.lo: ../../include/net-snmp/library/container.h
+./debug_handler.lo: ../../include/net-snmp/library/factory.h
+./debug_handler.lo: ../../include/net-snmp/library/snmp_logging.h
+./debug_handler.lo: ../../include/net-snmp/library/container_binary_array.h
+./debug_handler.lo: ../../include/net-snmp/library/container_list_ssll.h
+./debug_handler.lo: ../../include/net-snmp/library/container_iterator.h
+./debug_handler.lo: ../../include/net-snmp/library/container.h
+./debug_handler.lo: ../../include/net-snmp/library/snmp_assert.h
+./debug_handler.lo: ../../include/net-snmp/version.h
 ./debug_handler.lo: ../../include/net-snmp/config_api.h
 ./debug_handler.lo: ../../include/net-snmp/library/read_config.h
 ./debug_handler.lo: ../../include/net-snmp/library/default_store.h
@@ -518,32 +529,14 @@
 ./instance.lo: ../../include/net-snmp/net-snmp-includes.h
 ./instance.lo: ../../include/net-snmp/definitions.h
 ./instance.lo: ../../include/net-snmp/types.h
+./instance.lo: ../../include/net-snmp/library/types.h
 ./instance.lo: ../../include/net-snmp/library/snmp_api.h
-./instance.lo: ../../include/net-snmp/library/asn1.h
-./instance.lo: ../../include/net-snmp/library/snmp_impl.h
-./instance.lo: ../../include/net-snmp/library/snmp.h
-./instance.lo: ../../include/net-snmp/library/snmp-tc.h
-./instance.lo: ../../include/net-snmp/utilities.h
+./instance.lo: ../../include/net-snmp/varbind_api.h
 ./instance.lo: ../../include/net-snmp/library/snmp_client.h
-./instance.lo: ../../include/net-snmp/library/system.h
-./instance.lo: ../../include/net-snmp/library/tools.h
-./instance.lo: ../../include/net-snmp/library/int64.h
-./instance.lo: ../../include/net-snmp/library/mt_support.h
-./instance.lo: ../../include/net-snmp/library/snmp_alarm.h
-./instance.lo: ../../include/net-snmp/library/callback.h
-./instance.lo: ../../include/net-snmp/library/data_list.h
-./instance.lo: ../../include/net-snmp/library/oid_stash.h
-./instance.lo: ../../include/net-snmp/library/check_varbind.h
-./instance.lo: ../../include/net-snmp/library/container.h
-./instance.lo: ../../include/net-snmp/library/factory.h
-./instance.lo: ../../include/net-snmp/library/snmp_logging.h
-./instance.lo: ../../include/net-snmp/library/container_binary_array.h
-./instance.lo: ../../include/net-snmp/library/container_list_ssll.h
-./instance.lo: ../../include/net-snmp/library/container_iterator.h
-./instance.lo: ../../include/net-snmp/library/container.h
-./instance.lo: ../../include/net-snmp/library/snmp_assert.h
-./instance.lo: ../../include/net-snmp/version.h
+./instance.lo: ../../include/net-snmp/pdu_api.h
+./instance.lo: ../../include/net-snmp/library/asn1.h
 ./instance.lo: ../../include/net-snmp/session_api.h
+./instance.lo: ../../include/net-snmp/library/callback.h
 ./instance.lo: ../../include/net-snmp/library/snmp_transport.h
 ./instance.lo: ../../include/net-snmp/library/snmp_service.h
 ./instance.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -554,11 +547,31 @@
 ./instance.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./instance.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./instance.lo: ../../include/net-snmp/library/ucd_compat.h
-./instance.lo: ../../include/net-snmp/pdu_api.h
-./instance.lo: ../../include/net-snmp/mib_api.h
 ./instance.lo: ../../include/net-snmp/library/mib.h
+./instance.lo: ../../include/net-snmp/mib_api.h
 ./instance.lo: ../../include/net-snmp/library/parse.h
-./instance.lo: ../../include/net-snmp/varbind_api.h
+./instance.lo: ../../include/net-snmp/library/oid_stash.h
+./instance.lo: ../../include/net-snmp/library/snmp_impl.h
+./instance.lo: ../../include/net-snmp/library/snmp.h
+./instance.lo: ../../include/net-snmp/library/snmp-tc.h
+./instance.lo: ../../include/net-snmp/library/getopt.h
+./instance.lo: ../../include/net-snmp/utilities.h
+./instance.lo: ../../include/net-snmp/library/system.h
+./instance.lo: ../../include/net-snmp/library/tools.h
+./instance.lo: ../../include/net-snmp/library/int64.h
+./instance.lo: ../../include/net-snmp/library/mt_support.h
+./instance.lo: ../../include/net-snmp/library/snmp_alarm.h
+./instance.lo: ../../include/net-snmp/library/data_list.h
+./instance.lo: ../../include/net-snmp/library/check_varbind.h
+./instance.lo: ../../include/net-snmp/library/container.h
+./instance.lo: ../../include/net-snmp/library/factory.h
+./instance.lo: ../../include/net-snmp/library/snmp_logging.h
+./instance.lo: ../../include/net-snmp/library/container_binary_array.h
+./instance.lo: ../../include/net-snmp/library/container_list_ssll.h
+./instance.lo: ../../include/net-snmp/library/container_iterator.h
+./instance.lo: ../../include/net-snmp/library/container.h
+./instance.lo: ../../include/net-snmp/library/snmp_assert.h
+./instance.lo: ../../include/net-snmp/version.h
 ./instance.lo: ../../include/net-snmp/config_api.h
 ./instance.lo: ../../include/net-snmp/library/read_config.h
 ./instance.lo: ../../include/net-snmp/library/default_store.h
@@ -620,32 +633,14 @@
 ./mode_end_call.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mode_end_call.lo: ../../include/net-snmp/definitions.h
 ./mode_end_call.lo: ../../include/net-snmp/types.h
+./mode_end_call.lo: ../../include/net-snmp/library/types.h
 ./mode_end_call.lo: ../../include/net-snmp/library/snmp_api.h
-./mode_end_call.lo: ../../include/net-snmp/library/asn1.h
-./mode_end_call.lo: ../../include/net-snmp/library/snmp_impl.h
-./mode_end_call.lo: ../../include/net-snmp/library/snmp.h
-./mode_end_call.lo: ../../include/net-snmp/library/snmp-tc.h
-./mode_end_call.lo: ../../include/net-snmp/utilities.h
+./mode_end_call.lo: ../../include/net-snmp/varbind_api.h
 ./mode_end_call.lo: ../../include/net-snmp/library/snmp_client.h
-./mode_end_call.lo: ../../include/net-snmp/library/system.h
-./mode_end_call.lo: ../../include/net-snmp/library/tools.h
-./mode_end_call.lo: ../../include/net-snmp/library/int64.h
-./mode_end_call.lo: ../../include/net-snmp/library/mt_support.h
-./mode_end_call.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mode_end_call.lo: ../../include/net-snmp/library/callback.h
-./mode_end_call.lo: ../../include/net-snmp/library/data_list.h
-./mode_end_call.lo: ../../include/net-snmp/library/oid_stash.h
-./mode_end_call.lo: ../../include/net-snmp/library/check_varbind.h
-./mode_end_call.lo: ../../include/net-snmp/library/container.h
-./mode_end_call.lo: ../../include/net-snmp/library/factory.h
-./mode_end_call.lo: ../../include/net-snmp/library/snmp_logging.h
-./mode_end_call.lo: ../../include/net-snmp/library/container_binary_array.h
-./mode_end_call.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mode_end_call.lo: ../../include/net-snmp/library/container_iterator.h
-./mode_end_call.lo: ../../include/net-snmp/library/container.h
-./mode_end_call.lo: ../../include/net-snmp/library/snmp_assert.h
-./mode_end_call.lo: ../../include/net-snmp/version.h
+./mode_end_call.lo: ../../include/net-snmp/pdu_api.h
+./mode_end_call.lo: ../../include/net-snmp/library/asn1.h
 ./mode_end_call.lo: ../../include/net-snmp/session_api.h
+./mode_end_call.lo: ../../include/net-snmp/library/callback.h
 ./mode_end_call.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mode_end_call.lo: ../../include/net-snmp/library/snmp_service.h
 ./mode_end_call.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -656,11 +651,31 @@
 ./mode_end_call.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mode_end_call.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mode_end_call.lo: ../../include/net-snmp/library/ucd_compat.h
-./mode_end_call.lo: ../../include/net-snmp/pdu_api.h
-./mode_end_call.lo: ../../include/net-snmp/mib_api.h
 ./mode_end_call.lo: ../../include/net-snmp/library/mib.h
+./mode_end_call.lo: ../../include/net-snmp/mib_api.h
 ./mode_end_call.lo: ../../include/net-snmp/library/parse.h
-./mode_end_call.lo: ../../include/net-snmp/varbind_api.h
+./mode_end_call.lo: ../../include/net-snmp/library/oid_stash.h
+./mode_end_call.lo: ../../include/net-snmp/library/snmp_impl.h
+./mode_end_call.lo: ../../include/net-snmp/library/snmp.h
+./mode_end_call.lo: ../../include/net-snmp/library/snmp-tc.h
+./mode_end_call.lo: ../../include/net-snmp/library/getopt.h
+./mode_end_call.lo: ../../include/net-snmp/utilities.h
+./mode_end_call.lo: ../../include/net-snmp/library/system.h
+./mode_end_call.lo: ../../include/net-snmp/library/tools.h
+./mode_end_call.lo: ../../include/net-snmp/library/int64.h
+./mode_end_call.lo: ../../include/net-snmp/library/mt_support.h
+./mode_end_call.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mode_end_call.lo: ../../include/net-snmp/library/data_list.h
+./mode_end_call.lo: ../../include/net-snmp/library/check_varbind.h
+./mode_end_call.lo: ../../include/net-snmp/library/container.h
+./mode_end_call.lo: ../../include/net-snmp/library/factory.h
+./mode_end_call.lo: ../../include/net-snmp/library/snmp_logging.h
+./mode_end_call.lo: ../../include/net-snmp/library/container_binary_array.h
+./mode_end_call.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mode_end_call.lo: ../../include/net-snmp/library/container_iterator.h
+./mode_end_call.lo: ../../include/net-snmp/library/container.h
+./mode_end_call.lo: ../../include/net-snmp/library/snmp_assert.h
+./mode_end_call.lo: ../../include/net-snmp/version.h
 ./mode_end_call.lo: ../../include/net-snmp/config_api.h
 ./mode_end_call.lo: ../../include/net-snmp/library/read_config.h
 ./mode_end_call.lo: ../../include/net-snmp/library/default_store.h
@@ -722,32 +737,14 @@
 ./multiplexer.lo: ../../include/net-snmp/net-snmp-includes.h
 ./multiplexer.lo: ../../include/net-snmp/definitions.h
 ./multiplexer.lo: ../../include/net-snmp/types.h
+./multiplexer.lo: ../../include/net-snmp/library/types.h
 ./multiplexer.lo: ../../include/net-snmp/library/snmp_api.h
-./multiplexer.lo: ../../include/net-snmp/library/asn1.h
-./multiplexer.lo: ../../include/net-snmp/library/snmp_impl.h
-./multiplexer.lo: ../../include/net-snmp/library/snmp.h
-./multiplexer.lo: ../../include/net-snmp/library/snmp-tc.h
-./multiplexer.lo: ../../include/net-snmp/utilities.h
+./multiplexer.lo: ../../include/net-snmp/varbind_api.h
 ./multiplexer.lo: ../../include/net-snmp/library/snmp_client.h
-./multiplexer.lo: ../../include/net-snmp/library/system.h
-./multiplexer.lo: ../../include/net-snmp/library/tools.h
-./multiplexer.lo: ../../include/net-snmp/library/int64.h
-./multiplexer.lo: ../../include/net-snmp/library/mt_support.h
-./multiplexer.lo: ../../include/net-snmp/library/snmp_alarm.h
-./multiplexer.lo: ../../include/net-snmp/library/callback.h
-./multiplexer.lo: ../../include/net-snmp/library/data_list.h
-./multiplexer.lo: ../../include/net-snmp/library/oid_stash.h
-./multiplexer.lo: ../../include/net-snmp/library/check_varbind.h
-./multiplexer.lo: ../../include/net-snmp/library/container.h
-./multiplexer.lo: ../../include/net-snmp/library/factory.h
-./multiplexer.lo: ../../include/net-snmp/library/snmp_logging.h
-./multiplexer.lo: ../../include/net-snmp/library/container_binary_array.h
-./multiplexer.lo: ../../include/net-snmp/library/container_list_ssll.h
-./multiplexer.lo: ../../include/net-snmp/library/container_iterator.h
-./multiplexer.lo: ../../include/net-snmp/library/container.h
-./multiplexer.lo: ../../include/net-snmp/library/snmp_assert.h
-./multiplexer.lo: ../../include/net-snmp/version.h
+./multiplexer.lo: ../../include/net-snmp/pdu_api.h
+./multiplexer.lo: ../../include/net-snmp/library/asn1.h
 ./multiplexer.lo: ../../include/net-snmp/session_api.h
+./multiplexer.lo: ../../include/net-snmp/library/callback.h
 ./multiplexer.lo: ../../include/net-snmp/library/snmp_transport.h
 ./multiplexer.lo: ../../include/net-snmp/library/snmp_service.h
 ./multiplexer.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -758,11 +755,31 @@
 ./multiplexer.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./multiplexer.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./multiplexer.lo: ../../include/net-snmp/library/ucd_compat.h
-./multiplexer.lo: ../../include/net-snmp/pdu_api.h
-./multiplexer.lo: ../../include/net-snmp/mib_api.h
 ./multiplexer.lo: ../../include/net-snmp/library/mib.h
+./multiplexer.lo: ../../include/net-snmp/mib_api.h
 ./multiplexer.lo: ../../include/net-snmp/library/parse.h
-./multiplexer.lo: ../../include/net-snmp/varbind_api.h
+./multiplexer.lo: ../../include/net-snmp/library/oid_stash.h
+./multiplexer.lo: ../../include/net-snmp/library/snmp_impl.h
+./multiplexer.lo: ../../include/net-snmp/library/snmp.h
+./multiplexer.lo: ../../include/net-snmp/library/snmp-tc.h
+./multiplexer.lo: ../../include/net-snmp/library/getopt.h
+./multiplexer.lo: ../../include/net-snmp/utilities.h
+./multiplexer.lo: ../../include/net-snmp/library/system.h
+./multiplexer.lo: ../../include/net-snmp/library/tools.h
+./multiplexer.lo: ../../include/net-snmp/library/int64.h
+./multiplexer.lo: ../../include/net-snmp/library/mt_support.h
+./multiplexer.lo: ../../include/net-snmp/library/snmp_alarm.h
+./multiplexer.lo: ../../include/net-snmp/library/data_list.h
+./multiplexer.lo: ../../include/net-snmp/library/check_varbind.h
+./multiplexer.lo: ../../include/net-snmp/library/container.h
+./multiplexer.lo: ../../include/net-snmp/library/factory.h
+./multiplexer.lo: ../../include/net-snmp/library/snmp_logging.h
+./multiplexer.lo: ../../include/net-snmp/library/container_binary_array.h
+./multiplexer.lo: ../../include/net-snmp/library/container_list_ssll.h
+./multiplexer.lo: ../../include/net-snmp/library/container_iterator.h
+./multiplexer.lo: ../../include/net-snmp/library/container.h
+./multiplexer.lo: ../../include/net-snmp/library/snmp_assert.h
+./multiplexer.lo: ../../include/net-snmp/version.h
 ./multiplexer.lo: ../../include/net-snmp/config_api.h
 ./multiplexer.lo: ../../include/net-snmp/library/read_config.h
 ./multiplexer.lo: ../../include/net-snmp/library/default_store.h
@@ -824,32 +841,14 @@
 ./null.lo: ../../include/net-snmp/net-snmp-includes.h
 ./null.lo: ../../include/net-snmp/definitions.h
 ./null.lo: ../../include/net-snmp/types.h
+./null.lo: ../../include/net-snmp/library/types.h
 ./null.lo: ../../include/net-snmp/library/snmp_api.h
-./null.lo: ../../include/net-snmp/library/asn1.h
-./null.lo: ../../include/net-snmp/library/snmp_impl.h
-./null.lo: ../../include/net-snmp/library/snmp.h
-./null.lo: ../../include/net-snmp/library/snmp-tc.h
-./null.lo: ../../include/net-snmp/utilities.h
+./null.lo: ../../include/net-snmp/varbind_api.h
 ./null.lo: ../../include/net-snmp/library/snmp_client.h
-./null.lo: ../../include/net-snmp/library/system.h
-./null.lo: ../../include/net-snmp/library/tools.h
-./null.lo: ../../include/net-snmp/library/int64.h
-./null.lo: ../../include/net-snmp/library/mt_support.h
-./null.lo: ../../include/net-snmp/library/snmp_alarm.h
-./null.lo: ../../include/net-snmp/library/callback.h
-./null.lo: ../../include/net-snmp/library/data_list.h
-./null.lo: ../../include/net-snmp/library/oid_stash.h
-./null.lo: ../../include/net-snmp/library/check_varbind.h
-./null.lo: ../../include/net-snmp/library/container.h
-./null.lo: ../../include/net-snmp/library/factory.h
-./null.lo: ../../include/net-snmp/library/snmp_logging.h
-./null.lo: ../../include/net-snmp/library/container_binary_array.h
-./null.lo: ../../include/net-snmp/library/container_list_ssll.h
-./null.lo: ../../include/net-snmp/library/container_iterator.h
-./null.lo: ../../include/net-snmp/library/container.h
-./null.lo: ../../include/net-snmp/library/snmp_assert.h
-./null.lo: ../../include/net-snmp/version.h
+./null.lo: ../../include/net-snmp/pdu_api.h
+./null.lo: ../../include/net-snmp/library/asn1.h
 ./null.lo: ../../include/net-snmp/session_api.h
+./null.lo: ../../include/net-snmp/library/callback.h
 ./null.lo: ../../include/net-snmp/library/snmp_transport.h
 ./null.lo: ../../include/net-snmp/library/snmp_service.h
 ./null.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -860,10 +859,31 @@
 ./null.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./null.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./null.lo: ../../include/net-snmp/library/ucd_compat.h
-./null.lo: ../../include/net-snmp/pdu_api.h ../../include/net-snmp/mib_api.h
 ./null.lo: ../../include/net-snmp/library/mib.h
+./null.lo: ../../include/net-snmp/mib_api.h
 ./null.lo: ../../include/net-snmp/library/parse.h
-./null.lo: ../../include/net-snmp/varbind_api.h
+./null.lo: ../../include/net-snmp/library/oid_stash.h
+./null.lo: ../../include/net-snmp/library/snmp_impl.h
+./null.lo: ../../include/net-snmp/library/snmp.h
+./null.lo: ../../include/net-snmp/library/snmp-tc.h
+./null.lo: ../../include/net-snmp/library/getopt.h
+./null.lo: ../../include/net-snmp/utilities.h
+./null.lo: ../../include/net-snmp/library/system.h
+./null.lo: ../../include/net-snmp/library/tools.h
+./null.lo: ../../include/net-snmp/library/int64.h
+./null.lo: ../../include/net-snmp/library/mt_support.h
+./null.lo: ../../include/net-snmp/library/snmp_alarm.h
+./null.lo: ../../include/net-snmp/library/data_list.h
+./null.lo: ../../include/net-snmp/library/check_varbind.h
+./null.lo: ../../include/net-snmp/library/container.h
+./null.lo: ../../include/net-snmp/library/factory.h
+./null.lo: ../../include/net-snmp/library/snmp_logging.h
+./null.lo: ../../include/net-snmp/library/container_binary_array.h
+./null.lo: ../../include/net-snmp/library/container_list_ssll.h
+./null.lo: ../../include/net-snmp/library/container_iterator.h
+./null.lo: ../../include/net-snmp/library/container.h
+./null.lo: ../../include/net-snmp/library/snmp_assert.h
+./null.lo: ../../include/net-snmp/version.h
 ./null.lo: ../../include/net-snmp/config_api.h
 ./null.lo: ../../include/net-snmp/library/read_config.h
 ./null.lo: ../../include/net-snmp/library/default_store.h
@@ -925,32 +945,14 @@
 ./old_api.lo: ../../include/net-snmp/net-snmp-includes.h
 ./old_api.lo: ../../include/net-snmp/definitions.h
 ./old_api.lo: ../../include/net-snmp/types.h
+./old_api.lo: ../../include/net-snmp/library/types.h
 ./old_api.lo: ../../include/net-snmp/library/snmp_api.h
-./old_api.lo: ../../include/net-snmp/library/asn1.h
-./old_api.lo: ../../include/net-snmp/library/snmp_impl.h
-./old_api.lo: ../../include/net-snmp/library/snmp.h
-./old_api.lo: ../../include/net-snmp/library/snmp-tc.h
-./old_api.lo: ../../include/net-snmp/utilities.h
+./old_api.lo: ../../include/net-snmp/varbind_api.h
 ./old_api.lo: ../../include/net-snmp/library/snmp_client.h
-./old_api.lo: ../../include/net-snmp/library/system.h
-./old_api.lo: ../../include/net-snmp/library/tools.h
-./old_api.lo: ../../include/net-snmp/library/int64.h
-./old_api.lo: ../../include/net-snmp/library/mt_support.h
-./old_api.lo: ../../include/net-snmp/library/snmp_alarm.h
-./old_api.lo: ../../include/net-snmp/library/callback.h
-./old_api.lo: ../../include/net-snmp/library/data_list.h
-./old_api.lo: ../../include/net-snmp/library/oid_stash.h
-./old_api.lo: ../../include/net-snmp/library/check_varbind.h
-./old_api.lo: ../../include/net-snmp/library/container.h
-./old_api.lo: ../../include/net-snmp/library/factory.h
-./old_api.lo: ../../include/net-snmp/library/snmp_logging.h
-./old_api.lo: ../../include/net-snmp/library/container_binary_array.h
-./old_api.lo: ../../include/net-snmp/library/container_list_ssll.h
-./old_api.lo: ../../include/net-snmp/library/container_iterator.h
-./old_api.lo: ../../include/net-snmp/library/container.h
-./old_api.lo: ../../include/net-snmp/library/snmp_assert.h
-./old_api.lo: ../../include/net-snmp/version.h
+./old_api.lo: ../../include/net-snmp/pdu_api.h
+./old_api.lo: ../../include/net-snmp/library/asn1.h
 ./old_api.lo: ../../include/net-snmp/session_api.h
+./old_api.lo: ../../include/net-snmp/library/callback.h
 ./old_api.lo: ../../include/net-snmp/library/snmp_transport.h
 ./old_api.lo: ../../include/net-snmp/library/snmp_service.h
 ./old_api.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -961,11 +963,31 @@
 ./old_api.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./old_api.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./old_api.lo: ../../include/net-snmp/library/ucd_compat.h
-./old_api.lo: ../../include/net-snmp/pdu_api.h
-./old_api.lo: ../../include/net-snmp/mib_api.h
 ./old_api.lo: ../../include/net-snmp/library/mib.h
+./old_api.lo: ../../include/net-snmp/mib_api.h
 ./old_api.lo: ../../include/net-snmp/library/parse.h
-./old_api.lo: ../../include/net-snmp/varbind_api.h
+./old_api.lo: ../../include/net-snmp/library/oid_stash.h
+./old_api.lo: ../../include/net-snmp/library/snmp_impl.h
+./old_api.lo: ../../include/net-snmp/library/snmp.h
+./old_api.lo: ../../include/net-snmp/library/snmp-tc.h
+./old_api.lo: ../../include/net-snmp/library/getopt.h
+./old_api.lo: ../../include/net-snmp/utilities.h
+./old_api.lo: ../../include/net-snmp/library/system.h
+./old_api.lo: ../../include/net-snmp/library/tools.h
+./old_api.lo: ../../include/net-snmp/library/int64.h
+./old_api.lo: ../../include/net-snmp/library/mt_support.h
+./old_api.lo: ../../include/net-snmp/library/snmp_alarm.h
+./old_api.lo: ../../include/net-snmp/library/data_list.h
+./old_api.lo: ../../include/net-snmp/library/check_varbind.h
+./old_api.lo: ../../include/net-snmp/library/container.h
+./old_api.lo: ../../include/net-snmp/library/factory.h
+./old_api.lo: ../../include/net-snmp/library/snmp_logging.h
+./old_api.lo: ../../include/net-snmp/library/container_binary_array.h
+./old_api.lo: ../../include/net-snmp/library/container_list_ssll.h
+./old_api.lo: ../../include/net-snmp/library/container_iterator.h
+./old_api.lo: ../../include/net-snmp/library/container.h
+./old_api.lo: ../../include/net-snmp/library/snmp_assert.h
+./old_api.lo: ../../include/net-snmp/version.h
 ./old_api.lo: ../../include/net-snmp/config_api.h
 ./old_api.lo: ../../include/net-snmp/library/read_config.h
 ./old_api.lo: ../../include/net-snmp/library/default_store.h
@@ -1028,32 +1050,14 @@
 ./read_only.lo: ../../include/net-snmp/net-snmp-includes.h
 ./read_only.lo: ../../include/net-snmp/definitions.h
 ./read_only.lo: ../../include/net-snmp/types.h
+./read_only.lo: ../../include/net-snmp/library/types.h
 ./read_only.lo: ../../include/net-snmp/library/snmp_api.h
-./read_only.lo: ../../include/net-snmp/library/asn1.h
-./read_only.lo: ../../include/net-snmp/library/snmp_impl.h
-./read_only.lo: ../../include/net-snmp/library/snmp.h
-./read_only.lo: ../../include/net-snmp/library/snmp-tc.h
-./read_only.lo: ../../include/net-snmp/utilities.h
+./read_only.lo: ../../include/net-snmp/varbind_api.h
 ./read_only.lo: ../../include/net-snmp/library/snmp_client.h
-./read_only.lo: ../../include/net-snmp/library/system.h
-./read_only.lo: ../../include/net-snmp/library/tools.h
-./read_only.lo: ../../include/net-snmp/library/int64.h
-./read_only.lo: ../../include/net-snmp/library/mt_support.h
-./read_only.lo: ../../include/net-snmp/library/snmp_alarm.h
-./read_only.lo: ../../include/net-snmp/library/callback.h
-./read_only.lo: ../../include/net-snmp/library/data_list.h
-./read_only.lo: ../../include/net-snmp/library/oid_stash.h
-./read_only.lo: ../../include/net-snmp/library/check_varbind.h
-./read_only.lo: ../../include/net-snmp/library/container.h
-./read_only.lo: ../../include/net-snmp/library/factory.h
-./read_only.lo: ../../include/net-snmp/library/snmp_logging.h
-./read_only.lo: ../../include/net-snmp/library/container_binary_array.h
-./read_only.lo: ../../include/net-snmp/library/container_list_ssll.h
-./read_only.lo: ../../include/net-snmp/library/container_iterator.h
-./read_only.lo: ../../include/net-snmp/library/container.h
-./read_only.lo: ../../include/net-snmp/library/snmp_assert.h
-./read_only.lo: ../../include/net-snmp/version.h
+./read_only.lo: ../../include/net-snmp/pdu_api.h
+./read_only.lo: ../../include/net-snmp/library/asn1.h
 ./read_only.lo: ../../include/net-snmp/session_api.h
+./read_only.lo: ../../include/net-snmp/library/callback.h
 ./read_only.lo: ../../include/net-snmp/library/snmp_transport.h
 ./read_only.lo: ../../include/net-snmp/library/snmp_service.h
 ./read_only.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -1064,11 +1068,31 @@
 ./read_only.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./read_only.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./read_only.lo: ../../include/net-snmp/library/ucd_compat.h
-./read_only.lo: ../../include/net-snmp/pdu_api.h
-./read_only.lo: ../../include/net-snmp/mib_api.h
 ./read_only.lo: ../../include/net-snmp/library/mib.h
+./read_only.lo: ../../include/net-snmp/mib_api.h
 ./read_only.lo: ../../include/net-snmp/library/parse.h
-./read_only.lo: ../../include/net-snmp/varbind_api.h
+./read_only.lo: ../../include/net-snmp/library/oid_stash.h
+./read_only.lo: ../../include/net-snmp/library/snmp_impl.h
+./read_only.lo: ../../include/net-snmp/library/snmp.h
+./read_only.lo: ../../include/net-snmp/library/snmp-tc.h
+./read_only.lo: ../../include/net-snmp/library/getopt.h
+./read_only.lo: ../../include/net-snmp/utilities.h
+./read_only.lo: ../../include/net-snmp/library/system.h
+./read_only.lo: ../../include/net-snmp/library/tools.h
+./read_only.lo: ../../include/net-snmp/library/int64.h
+./read_only.lo: ../../include/net-snmp/library/mt_support.h
+./read_only.lo: ../../include/net-snmp/library/snmp_alarm.h
+./read_only.lo: ../../include/net-snmp/library/data_list.h
+./read_only.lo: ../../include/net-snmp/library/check_varbind.h
+./read_only.lo: ../../include/net-snmp/library/container.h
+./read_only.lo: ../../include/net-snmp/library/factory.h
+./read_only.lo: ../../include/net-snmp/library/snmp_logging.h
+./read_only.lo: ../../include/net-snmp/library/container_binary_array.h
+./read_only.lo: ../../include/net-snmp/library/container_list_ssll.h
+./read_only.lo: ../../include/net-snmp/library/container_iterator.h
+./read_only.lo: ../../include/net-snmp/library/container.h
+./read_only.lo: ../../include/net-snmp/library/snmp_assert.h
+./read_only.lo: ../../include/net-snmp/version.h
 ./read_only.lo: ../../include/net-snmp/config_api.h
 ./read_only.lo: ../../include/net-snmp/library/read_config.h
 ./read_only.lo: ../../include/net-snmp/library/default_store.h
@@ -1130,32 +1154,14 @@
 ./row_merge.lo: ../../include/net-snmp/net-snmp-includes.h
 ./row_merge.lo: ../../include/net-snmp/definitions.h
 ./row_merge.lo: ../../include/net-snmp/types.h
+./row_merge.lo: ../../include/net-snmp/library/types.h
 ./row_merge.lo: ../../include/net-snmp/library/snmp_api.h
-./row_merge.lo: ../../include/net-snmp/library/asn1.h
-./row_merge.lo: ../../include/net-snmp/library/snmp_impl.h
-./row_merge.lo: ../../include/net-snmp/library/snmp.h
-./row_merge.lo: ../../include/net-snmp/library/snmp-tc.h
-./row_merge.lo: ../../include/net-snmp/utilities.h
+./row_merge.lo: ../../include/net-snmp/varbind_api.h
 ./row_merge.lo: ../../include/net-snmp/library/snmp_client.h
-./row_merge.lo: ../../include/net-snmp/library/system.h
-./row_merge.lo: ../../include/net-snmp/library/tools.h
-./row_merge.lo: ../../include/net-snmp/library/int64.h
-./row_merge.lo: ../../include/net-snmp/library/mt_support.h
-./row_merge.lo: ../../include/net-snmp/library/snmp_alarm.h
-./row_merge.lo: ../../include/net-snmp/library/callback.h
-./row_merge.lo: ../../include/net-snmp/library/data_list.h
-./row_merge.lo: ../../include/net-snmp/library/oid_stash.h
-./row_merge.lo: ../../include/net-snmp/library/check_varbind.h
-./row_merge.lo: ../../include/net-snmp/library/container.h
-./row_merge.lo: ../../include/net-snmp/library/factory.h
-./row_merge.lo: ../../include/net-snmp/library/snmp_logging.h
-./row_merge.lo: ../../include/net-snmp/library/container_binary_array.h
-./row_merge.lo: ../../include/net-snmp/library/container_list_ssll.h
-./row_merge.lo: ../../include/net-snmp/library/container_iterator.h
-./row_merge.lo: ../../include/net-snmp/library/container.h
-./row_merge.lo: ../../include/net-snmp/library/snmp_assert.h
-./row_merge.lo: ../../include/net-snmp/version.h
+./row_merge.lo: ../../include/net-snmp/pdu_api.h
+./row_merge.lo: ../../include/net-snmp/library/asn1.h
 ./row_merge.lo: ../../include/net-snmp/session_api.h
+./row_merge.lo: ../../include/net-snmp/library/callback.h
 ./row_merge.lo: ../../include/net-snmp/library/snmp_transport.h
 ./row_merge.lo: ../../include/net-snmp/library/snmp_service.h
 ./row_merge.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -1166,11 +1172,31 @@
 ./row_merge.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./row_merge.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./row_merge.lo: ../../include/net-snmp/library/ucd_compat.h
-./row_merge.lo: ../../include/net-snmp/pdu_api.h
-./row_merge.lo: ../../include/net-snmp/mib_api.h
 ./row_merge.lo: ../../include/net-snmp/library/mib.h
+./row_merge.lo: ../../include/net-snmp/mib_api.h
 ./row_merge.lo: ../../include/net-snmp/library/parse.h
-./row_merge.lo: ../../include/net-snmp/varbind_api.h
+./row_merge.lo: ../../include/net-snmp/library/oid_stash.h
+./row_merge.lo: ../../include/net-snmp/library/snmp_impl.h
+./row_merge.lo: ../../include/net-snmp/library/snmp.h
+./row_merge.lo: ../../include/net-snmp/library/snmp-tc.h
+./row_merge.lo: ../../include/net-snmp/library/getopt.h
+./row_merge.lo: ../../include/net-snmp/utilities.h
+./row_merge.lo: ../../include/net-snmp/library/system.h
+./row_merge.lo: ../../include/net-snmp/library/tools.h
+./row_merge.lo: ../../include/net-snmp/library/int64.h
+./row_merge.lo: ../../include/net-snmp/library/mt_support.h
+./row_merge.lo: ../../include/net-snmp/library/snmp_alarm.h
+./row_merge.lo: ../../include/net-snmp/library/data_list.h
+./row_merge.lo: ../../include/net-snmp/library/check_varbind.h
+./row_merge.lo: ../../include/net-snmp/library/container.h
+./row_merge.lo: ../../include/net-snmp/library/factory.h
+./row_merge.lo: ../../include/net-snmp/library/snmp_logging.h
+./row_merge.lo: ../../include/net-snmp/library/container_binary_array.h
+./row_merge.lo: ../../include/net-snmp/library/container_list_ssll.h
+./row_merge.lo: ../../include/net-snmp/library/container_iterator.h
+./row_merge.lo: ../../include/net-snmp/library/container.h
+./row_merge.lo: ../../include/net-snmp/library/snmp_assert.h
+./row_merge.lo: ../../include/net-snmp/version.h
 ./row_merge.lo: ../../include/net-snmp/config_api.h
 ./row_merge.lo: ../../include/net-snmp/library/read_config.h
 ./row_merge.lo: ../../include/net-snmp/library/default_store.h
@@ -1232,32 +1258,14 @@
 ./scalar.lo: ../../include/net-snmp/net-snmp-includes.h
 ./scalar.lo: ../../include/net-snmp/definitions.h
 ./scalar.lo: ../../include/net-snmp/types.h
+./scalar.lo: ../../include/net-snmp/library/types.h
 ./scalar.lo: ../../include/net-snmp/library/snmp_api.h
-./scalar.lo: ../../include/net-snmp/library/asn1.h
-./scalar.lo: ../../include/net-snmp/library/snmp_impl.h
-./scalar.lo: ../../include/net-snmp/library/snmp.h
-./scalar.lo: ../../include/net-snmp/library/snmp-tc.h
-./scalar.lo: ../../include/net-snmp/utilities.h
+./scalar.lo: ../../include/net-snmp/varbind_api.h
 ./scalar.lo: ../../include/net-snmp/library/snmp_client.h
-./scalar.lo: ../../include/net-snmp/library/system.h
-./scalar.lo: ../../include/net-snmp/library/tools.h
-./scalar.lo: ../../include/net-snmp/library/int64.h
-./scalar.lo: ../../include/net-snmp/library/mt_support.h
-./scalar.lo: ../../include/net-snmp/library/snmp_alarm.h
-./scalar.lo: ../../include/net-snmp/library/callback.h
-./scalar.lo: ../../include/net-snmp/library/data_list.h
-./scalar.lo: ../../include/net-snmp/library/oid_stash.h
-./scalar.lo: ../../include/net-snmp/library/check_varbind.h
-./scalar.lo: ../../include/net-snmp/library/container.h
-./scalar.lo: ../../include/net-snmp/library/factory.h
-./scalar.lo: ../../include/net-snmp/library/snmp_logging.h
-./scalar.lo: ../../include/net-snmp/library/container_binary_array.h
-./scalar.lo: ../../include/net-snmp/library/container_list_ssll.h
-./scalar.lo: ../../include/net-snmp/library/container_iterator.h
-./scalar.lo: ../../include/net-snmp/library/container.h
-./scalar.lo: ../../include/net-snmp/library/snmp_assert.h
-./scalar.lo: ../../include/net-snmp/version.h
+./scalar.lo: ../../include/net-snmp/pdu_api.h
+./scalar.lo: ../../include/net-snmp/library/asn1.h
 ./scalar.lo: ../../include/net-snmp/session_api.h
+./scalar.lo: ../../include/net-snmp/library/callback.h
 ./scalar.lo: ../../include/net-snmp/library/snmp_transport.h
 ./scalar.lo: ../../include/net-snmp/library/snmp_service.h
 ./scalar.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -1268,11 +1276,31 @@
 ./scalar.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./scalar.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./scalar.lo: ../../include/net-snmp/library/ucd_compat.h
-./scalar.lo: ../../include/net-snmp/pdu_api.h
-./scalar.lo: ../../include/net-snmp/mib_api.h
 ./scalar.lo: ../../include/net-snmp/library/mib.h
+./scalar.lo: ../../include/net-snmp/mib_api.h
 ./scalar.lo: ../../include/net-snmp/library/parse.h
-./scalar.lo: ../../include/net-snmp/varbind_api.h
+./scalar.lo: ../../include/net-snmp/library/oid_stash.h
+./scalar.lo: ../../include/net-snmp/library/snmp_impl.h
+./scalar.lo: ../../include/net-snmp/library/snmp.h
+./scalar.lo: ../../include/net-snmp/library/snmp-tc.h
+./scalar.lo: ../../include/net-snmp/library/getopt.h
+./scalar.lo: ../../include/net-snmp/utilities.h
+./scalar.lo: ../../include/net-snmp/library/system.h
+./scalar.lo: ../../include/net-snmp/library/tools.h
+./scalar.lo: ../../include/net-snmp/library/int64.h
+./scalar.lo: ../../include/net-snmp/library/mt_support.h
+./scalar.lo: ../../include/net-snmp/library/snmp_alarm.h
+./scalar.lo: ../../include/net-snmp/library/data_list.h
+./scalar.lo: ../../include/net-snmp/library/check_varbind.h
+./scalar.lo: ../../include/net-snmp/library/container.h
+./scalar.lo: ../../include/net-snmp/library/factory.h
+./scalar.lo: ../../include/net-snmp/library/snmp_logging.h
+./scalar.lo: ../../include/net-snmp/library/container_binary_array.h
+./scalar.lo: ../../include/net-snmp/library/container_list_ssll.h
+./scalar.lo: ../../include/net-snmp/library/container_iterator.h
+./scalar.lo: ../../include/net-snmp/library/container.h
+./scalar.lo: ../../include/net-snmp/library/snmp_assert.h
+./scalar.lo: ../../include/net-snmp/version.h
 ./scalar.lo: ../../include/net-snmp/config_api.h
 ./scalar.lo: ../../include/net-snmp/library/read_config.h
 ./scalar.lo: ../../include/net-snmp/library/default_store.h
@@ -1334,32 +1362,14 @@
 ./scalar_group.lo: ../../include/net-snmp/net-snmp-includes.h
 ./scalar_group.lo: ../../include/net-snmp/definitions.h
 ./scalar_group.lo: ../../include/net-snmp/types.h
+./scalar_group.lo: ../../include/net-snmp/library/types.h
 ./scalar_group.lo: ../../include/net-snmp/library/snmp_api.h
-./scalar_group.lo: ../../include/net-snmp/library/asn1.h
-./scalar_group.lo: ../../include/net-snmp/library/snmp_impl.h
-./scalar_group.lo: ../../include/net-snmp/library/snmp.h
-./scalar_group.lo: ../../include/net-snmp/library/snmp-tc.h
-./scalar_group.lo: ../../include/net-snmp/utilities.h
+./scalar_group.lo: ../../include/net-snmp/varbind_api.h
 ./scalar_group.lo: ../../include/net-snmp/library/snmp_client.h
-./scalar_group.lo: ../../include/net-snmp/library/system.h
-./scalar_group.lo: ../../include/net-snmp/library/tools.h
-./scalar_group.lo: ../../include/net-snmp/library/int64.h
-./scalar_group.lo: ../../include/net-snmp/library/mt_support.h
-./scalar_group.lo: ../../include/net-snmp/library/snmp_alarm.h
-./scalar_group.lo: ../../include/net-snmp/library/callback.h
-./scalar_group.lo: ../../include/net-snmp/library/data_list.h
-./scalar_group.lo: ../../include/net-snmp/library/oid_stash.h
-./scalar_group.lo: ../../include/net-snmp/library/check_varbind.h
-./scalar_group.lo: ../../include/net-snmp/library/container.h
-./scalar_group.lo: ../../include/net-snmp/library/factory.h
-./scalar_group.lo: ../../include/net-snmp/library/snmp_logging.h
-./scalar_group.lo: ../../include/net-snmp/library/container_binary_array.h
-./scalar_group.lo: ../../include/net-snmp/library/container_list_ssll.h
-./scalar_group.lo: ../../include/net-snmp/library/container_iterator.h
-./scalar_group.lo: ../../include/net-snmp/library/container.h
-./scalar_group.lo: ../../include/net-snmp/library/snmp_assert.h
-./scalar_group.lo: ../../include/net-snmp/version.h
+./scalar_group.lo: ../../include/net-snmp/pdu_api.h
+./scalar_group.lo: ../../include/net-snmp/library/asn1.h
 ./scalar_group.lo: ../../include/net-snmp/session_api.h
+./scalar_group.lo: ../../include/net-snmp/library/callback.h
 ./scalar_group.lo: ../../include/net-snmp/library/snmp_transport.h
 ./scalar_group.lo: ../../include/net-snmp/library/snmp_service.h
 ./scalar_group.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -1370,11 +1380,31 @@
 ./scalar_group.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./scalar_group.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./scalar_group.lo: ../../include/net-snmp/library/ucd_compat.h
-./scalar_group.lo: ../../include/net-snmp/pdu_api.h
-./scalar_group.lo: ../../include/net-snmp/mib_api.h
 ./scalar_group.lo: ../../include/net-snmp/library/mib.h
+./scalar_group.lo: ../../include/net-snmp/mib_api.h
 ./scalar_group.lo: ../../include/net-snmp/library/parse.h
-./scalar_group.lo: ../../include/net-snmp/varbind_api.h
+./scalar_group.lo: ../../include/net-snmp/library/oid_stash.h
+./scalar_group.lo: ../../include/net-snmp/library/snmp_impl.h
+./scalar_group.lo: ../../include/net-snmp/library/snmp.h
+./scalar_group.lo: ../../include/net-snmp/library/snmp-tc.h
+./scalar_group.lo: ../../include/net-snmp/library/getopt.h
+./scalar_group.lo: ../../include/net-snmp/utilities.h
+./scalar_group.lo: ../../include/net-snmp/library/system.h
+./scalar_group.lo: ../../include/net-snmp/library/tools.h
+./scalar_group.lo: ../../include/net-snmp/library/int64.h
+./scalar_group.lo: ../../include/net-snmp/library/mt_support.h
+./scalar_group.lo: ../../include/net-snmp/library/snmp_alarm.h
+./scalar_group.lo: ../../include/net-snmp/library/data_list.h
+./scalar_group.lo: ../../include/net-snmp/library/check_varbind.h
+./scalar_group.lo: ../../include/net-snmp/library/container.h
+./scalar_group.lo: ../../include/net-snmp/library/factory.h
+./scalar_group.lo: ../../include/net-snmp/library/snmp_logging.h
+./scalar_group.lo: ../../include/net-snmp/library/container_binary_array.h
+./scalar_group.lo: ../../include/net-snmp/library/container_list_ssll.h
+./scalar_group.lo: ../../include/net-snmp/library/container_iterator.h
+./scalar_group.lo: ../../include/net-snmp/library/container.h
+./scalar_group.lo: ../../include/net-snmp/library/snmp_assert.h
+./scalar_group.lo: ../../include/net-snmp/version.h
 ./scalar_group.lo: ../../include/net-snmp/config_api.h
 ./scalar_group.lo: ../../include/net-snmp/library/read_config.h
 ./scalar_group.lo: ../../include/net-snmp/library/default_store.h
@@ -1436,32 +1466,14 @@
 ./serialize.lo: ../../include/net-snmp/net-snmp-includes.h
 ./serialize.lo: ../../include/net-snmp/definitions.h
 ./serialize.lo: ../../include/net-snmp/types.h
+./serialize.lo: ../../include/net-snmp/library/types.h
 ./serialize.lo: ../../include/net-snmp/library/snmp_api.h
-./serialize.lo: ../../include/net-snmp/library/asn1.h
-./serialize.lo: ../../include/net-snmp/library/snmp_impl.h
-./serialize.lo: ../../include/net-snmp/library/snmp.h
-./serialize.lo: ../../include/net-snmp/library/snmp-tc.h
-./serialize.lo: ../../include/net-snmp/utilities.h
+./serialize.lo: ../../include/net-snmp/varbind_api.h
 ./serialize.lo: ../../include/net-snmp/library/snmp_client.h
-./serialize.lo: ../../include/net-snmp/library/system.h
-./serialize.lo: ../../include/net-snmp/library/tools.h
-./serialize.lo: ../../include/net-snmp/library/int64.h
-./serialize.lo: ../../include/net-snmp/library/mt_support.h
-./serialize.lo: ../../include/net-snmp/library/snmp_alarm.h
-./serialize.lo: ../../include/net-snmp/library/callback.h
-./serialize.lo: ../../include/net-snmp/library/data_list.h
-./serialize.lo: ../../include/net-snmp/library/oid_stash.h
-./serialize.lo: ../../include/net-snmp/library/check_varbind.h
-./serialize.lo: ../../include/net-snmp/library/container.h
-./serialize.lo: ../../include/net-snmp/library/factory.h
-./serialize.lo: ../../include/net-snmp/library/snmp_logging.h
-./serialize.lo: ../../include/net-snmp/library/container_binary_array.h
-./serialize.lo: ../../include/net-snmp/library/container_list_ssll.h
-./serialize.lo: ../../include/net-snmp/library/container_iterator.h
-./serialize.lo: ../../include/net-snmp/library/container.h
-./serialize.lo: ../../include/net-snmp/library/snmp_assert.h
-./serialize.lo: ../../include/net-snmp/version.h
+./serialize.lo: ../../include/net-snmp/pdu_api.h
+./serialize.lo: ../../include/net-snmp/library/asn1.h
 ./serialize.lo: ../../include/net-snmp/session_api.h
+./serialize.lo: ../../include/net-snmp/library/callback.h
 ./serialize.lo: ../../include/net-snmp/library/snmp_transport.h
 ./serialize.lo: ../../include/net-snmp/library/snmp_service.h
 ./serialize.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -1472,11 +1484,31 @@
 ./serialize.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./serialize.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./serialize.lo: ../../include/net-snmp/library/ucd_compat.h
-./serialize.lo: ../../include/net-snmp/pdu_api.h
-./serialize.lo: ../../include/net-snmp/mib_api.h
 ./serialize.lo: ../../include/net-snmp/library/mib.h
+./serialize.lo: ../../include/net-snmp/mib_api.h
 ./serialize.lo: ../../include/net-snmp/library/parse.h
-./serialize.lo: ../../include/net-snmp/varbind_api.h
+./serialize.lo: ../../include/net-snmp/library/oid_stash.h
+./serialize.lo: ../../include/net-snmp/library/snmp_impl.h
+./serialize.lo: ../../include/net-snmp/library/snmp.h
+./serialize.lo: ../../include/net-snmp/library/snmp-tc.h
+./serialize.lo: ../../include/net-snmp/library/getopt.h
+./serialize.lo: ../../include/net-snmp/utilities.h
+./serialize.lo: ../../include/net-snmp/library/system.h
+./serialize.lo: ../../include/net-snmp/library/tools.h
+./serialize.lo: ../../include/net-snmp/library/int64.h
+./serialize.lo: ../../include/net-snmp/library/mt_support.h
+./serialize.lo: ../../include/net-snmp/library/snmp_alarm.h
+./serialize.lo: ../../include/net-snmp/library/data_list.h
+./serialize.lo: ../../include/net-snmp/library/check_varbind.h
+./serialize.lo: ../../include/net-snmp/library/container.h
+./serialize.lo: ../../include/net-snmp/library/factory.h
+./serialize.lo: ../../include/net-snmp/library/snmp_logging.h
+./serialize.lo: ../../include/net-snmp/library/container_binary_array.h
+./serialize.lo: ../../include/net-snmp/library/container_list_ssll.h
+./serialize.lo: ../../include/net-snmp/library/container_iterator.h
+./serialize.lo: ../../include/net-snmp/library/container.h
+./serialize.lo: ../../include/net-snmp/library/snmp_assert.h
+./serialize.lo: ../../include/net-snmp/version.h
 ./serialize.lo: ../../include/net-snmp/config_api.h
 ./serialize.lo: ../../include/net-snmp/library/read_config.h
 ./serialize.lo: ../../include/net-snmp/library/default_store.h
@@ -1538,32 +1570,14 @@
 ./stash_cache.lo: ../../include/net-snmp/net-snmp-includes.h
 ./stash_cache.lo: ../../include/net-snmp/definitions.h
 ./stash_cache.lo: ../../include/net-snmp/types.h
+./stash_cache.lo: ../../include/net-snmp/library/types.h
 ./stash_cache.lo: ../../include/net-snmp/library/snmp_api.h
-./stash_cache.lo: ../../include/net-snmp/library/asn1.h
-./stash_cache.lo: ../../include/net-snmp/library/snmp_impl.h
-./stash_cache.lo: ../../include/net-snmp/library/snmp.h
-./stash_cache.lo: ../../include/net-snmp/library/snmp-tc.h
-./stash_cache.lo: ../../include/net-snmp/utilities.h
+./stash_cache.lo: ../../include/net-snmp/varbind_api.h
 ./stash_cache.lo: ../../include/net-snmp/library/snmp_client.h
-./stash_cache.lo: ../../include/net-snmp/library/system.h
-./stash_cache.lo: ../../include/net-snmp/library/tools.h
-./stash_cache.lo: ../../include/net-snmp/library/int64.h
-./stash_cache.lo: ../../include/net-snmp/library/mt_support.h
-./stash_cache.lo: ../../include/net-snmp/library/snmp_alarm.h
-./stash_cache.lo: ../../include/net-snmp/library/callback.h
-./stash_cache.lo: ../../include/net-snmp/library/data_list.h
-./stash_cache.lo: ../../include/net-snmp/library/oid_stash.h
-./stash_cache.lo: ../../include/net-snmp/library/check_varbind.h
-./stash_cache.lo: ../../include/net-snmp/library/container.h
-./stash_cache.lo: ../../include/net-snmp/library/factory.h
-./stash_cache.lo: ../../include/net-snmp/library/snmp_logging.h
-./stash_cache.lo: ../../include/net-snmp/library/container_binary_array.h
-./stash_cache.lo: ../../include/net-snmp/library/container_list_ssll.h
-./stash_cache.lo: ../../include/net-snmp/library/container_iterator.h
-./stash_cache.lo: ../../include/net-snmp/library/container.h
-./stash_cache.lo: ../../include/net-snmp/library/snmp_assert.h
-./stash_cache.lo: ../../include/net-snmp/version.h
+./stash_cache.lo: ../../include/net-snmp/pdu_api.h
+./stash_cache.lo: ../../include/net-snmp/library/asn1.h
 ./stash_cache.lo: ../../include/net-snmp/session_api.h
+./stash_cache.lo: ../../include/net-snmp/library/callback.h
 ./stash_cache.lo: ../../include/net-snmp/library/snmp_transport.h
 ./stash_cache.lo: ../../include/net-snmp/library/snmp_service.h
 ./stash_cache.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -1574,11 +1588,31 @@
 ./stash_cache.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./stash_cache.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./stash_cache.lo: ../../include/net-snmp/library/ucd_compat.h
-./stash_cache.lo: ../../include/net-snmp/pdu_api.h
-./stash_cache.lo: ../../include/net-snmp/mib_api.h
 ./stash_cache.lo: ../../include/net-snmp/library/mib.h
+./stash_cache.lo: ../../include/net-snmp/mib_api.h
 ./stash_cache.lo: ../../include/net-snmp/library/parse.h
-./stash_cache.lo: ../../include/net-snmp/varbind_api.h
+./stash_cache.lo: ../../include/net-snmp/library/oid_stash.h
+./stash_cache.lo: ../../include/net-snmp/library/snmp_impl.h
+./stash_cache.lo: ../../include/net-snmp/library/snmp.h
+./stash_cache.lo: ../../include/net-snmp/library/snmp-tc.h
+./stash_cache.lo: ../../include/net-snmp/library/getopt.h
+./stash_cache.lo: ../../include/net-snmp/utilities.h
+./stash_cache.lo: ../../include/net-snmp/library/system.h
+./stash_cache.lo: ../../include/net-snmp/library/tools.h
+./stash_cache.lo: ../../include/net-snmp/library/int64.h
+./stash_cache.lo: ../../include/net-snmp/library/mt_support.h
+./stash_cache.lo: ../../include/net-snmp/library/snmp_alarm.h
+./stash_cache.lo: ../../include/net-snmp/library/data_list.h
+./stash_cache.lo: ../../include/net-snmp/library/check_varbind.h
+./stash_cache.lo: ../../include/net-snmp/library/container.h
+./stash_cache.lo: ../../include/net-snmp/library/factory.h
+./stash_cache.lo: ../../include/net-snmp/library/snmp_logging.h
+./stash_cache.lo: ../../include/net-snmp/library/container_binary_array.h
+./stash_cache.lo: ../../include/net-snmp/library/container_list_ssll.h
+./stash_cache.lo: ../../include/net-snmp/library/container_iterator.h
+./stash_cache.lo: ../../include/net-snmp/library/container.h
+./stash_cache.lo: ../../include/net-snmp/library/snmp_assert.h
+./stash_cache.lo: ../../include/net-snmp/version.h
 ./stash_cache.lo: ../../include/net-snmp/config_api.h
 ./stash_cache.lo: ../../include/net-snmp/library/read_config.h
 ./stash_cache.lo: ../../include/net-snmp/library/default_store.h
@@ -1642,32 +1676,14 @@
 ./stash_to_next.lo: ../../include/net-snmp/net-snmp-includes.h
 ./stash_to_next.lo: ../../include/net-snmp/definitions.h
 ./stash_to_next.lo: ../../include/net-snmp/types.h
+./stash_to_next.lo: ../../include/net-snmp/library/types.h
 ./stash_to_next.lo: ../../include/net-snmp/library/snmp_api.h
-./stash_to_next.lo: ../../include/net-snmp/library/asn1.h
-./stash_to_next.lo: ../../include/net-snmp/library/snmp_impl.h
-./stash_to_next.lo: ../../include/net-snmp/library/snmp.h
-./stash_to_next.lo: ../../include/net-snmp/library/snmp-tc.h
-./stash_to_next.lo: ../../include/net-snmp/utilities.h
+./stash_to_next.lo: ../../include/net-snmp/varbind_api.h
 ./stash_to_next.lo: ../../include/net-snmp/library/snmp_client.h
-./stash_to_next.lo: ../../include/net-snmp/library/system.h
-./stash_to_next.lo: ../../include/net-snmp/library/tools.h
-./stash_to_next.lo: ../../include/net-snmp/library/int64.h
-./stash_to_next.lo: ../../include/net-snmp/library/mt_support.h
-./stash_to_next.lo: ../../include/net-snmp/library/snmp_alarm.h
-./stash_to_next.lo: ../../include/net-snmp/library/callback.h
-./stash_to_next.lo: ../../include/net-snmp/library/data_list.h
-./stash_to_next.lo: ../../include/net-snmp/library/oid_stash.h
-./stash_to_next.lo: ../../include/net-snmp/library/check_varbind.h
-./stash_to_next.lo: ../../include/net-snmp/library/container.h
-./stash_to_next.lo: ../../include/net-snmp/library/factory.h
-./stash_to_next.lo: ../../include/net-snmp/library/snmp_logging.h
-./stash_to_next.lo: ../../include/net-snmp/library/container_binary_array.h
-./stash_to_next.lo: ../../include/net-snmp/library/container_list_ssll.h
-./stash_to_next.lo: ../../include/net-snmp/library/container_iterator.h
-./stash_to_next.lo: ../../include/net-snmp/library/container.h
-./stash_to_next.lo: ../../include/net-snmp/library/snmp_assert.h
-./stash_to_next.lo: ../../include/net-snmp/version.h
+./stash_to_next.lo: ../../include/net-snmp/pdu_api.h
+./stash_to_next.lo: ../../include/net-snmp/library/asn1.h
 ./stash_to_next.lo: ../../include/net-snmp/session_api.h
+./stash_to_next.lo: ../../include/net-snmp/library/callback.h
 ./stash_to_next.lo: ../../include/net-snmp/library/snmp_transport.h
 ./stash_to_next.lo: ../../include/net-snmp/library/snmp_service.h
 ./stash_to_next.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -1678,11 +1694,31 @@
 ./stash_to_next.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./stash_to_next.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./stash_to_next.lo: ../../include/net-snmp/library/ucd_compat.h
-./stash_to_next.lo: ../../include/net-snmp/pdu_api.h
-./stash_to_next.lo: ../../include/net-snmp/mib_api.h
 ./stash_to_next.lo: ../../include/net-snmp/library/mib.h
+./stash_to_next.lo: ../../include/net-snmp/mib_api.h
 ./stash_to_next.lo: ../../include/net-snmp/library/parse.h
-./stash_to_next.lo: ../../include/net-snmp/varbind_api.h
+./stash_to_next.lo: ../../include/net-snmp/library/oid_stash.h
+./stash_to_next.lo: ../../include/net-snmp/library/snmp_impl.h
+./stash_to_next.lo: ../../include/net-snmp/library/snmp.h
+./stash_to_next.lo: ../../include/net-snmp/library/snmp-tc.h
+./stash_to_next.lo: ../../include/net-snmp/library/getopt.h
+./stash_to_next.lo: ../../include/net-snmp/utilities.h
+./stash_to_next.lo: ../../include/net-snmp/library/system.h
+./stash_to_next.lo: ../../include/net-snmp/library/tools.h
+./stash_to_next.lo: ../../include/net-snmp/library/int64.h
+./stash_to_next.lo: ../../include/net-snmp/library/mt_support.h
+./stash_to_next.lo: ../../include/net-snmp/library/snmp_alarm.h
+./stash_to_next.lo: ../../include/net-snmp/library/data_list.h
+./stash_to_next.lo: ../../include/net-snmp/library/check_varbind.h
+./stash_to_next.lo: ../../include/net-snmp/library/container.h
+./stash_to_next.lo: ../../include/net-snmp/library/factory.h
+./stash_to_next.lo: ../../include/net-snmp/library/snmp_logging.h
+./stash_to_next.lo: ../../include/net-snmp/library/container_binary_array.h
+./stash_to_next.lo: ../../include/net-snmp/library/container_list_ssll.h
+./stash_to_next.lo: ../../include/net-snmp/library/container_iterator.h
+./stash_to_next.lo: ../../include/net-snmp/library/container.h
+./stash_to_next.lo: ../../include/net-snmp/library/snmp_assert.h
+./stash_to_next.lo: ../../include/net-snmp/version.h
 ./stash_to_next.lo: ../../include/net-snmp/config_api.h
 ./stash_to_next.lo: ../../include/net-snmp/library/read_config.h
 ./stash_to_next.lo: ../../include/net-snmp/library/default_store.h
@@ -1736,109 +1772,8 @@
 ./stash_to_next.lo: ../../include/net-snmp/agent/table_container.h
 ./stash_to_next.lo: ../../include/net-snmp/agent/table_array.h
 ./stash_to_next.lo: ../../include/net-snmp/agent/mfd.h
-./stash_to_next.lo: ../../include/net-snmp/agent/stash_cache.h
 ./stash_to_next.lo: ../../include/net-snmp/agent/stash_to_next.h
-./table.lo: ../../include/net-snmp/net-snmp-config.h
-./table.lo: ../../include/net-snmp/system/linux.h
-./table.lo: ../../include/net-snmp/system/sysv.h
-./table.lo: ../../include/net-snmp/system/generic.h
-./table.lo: ../../include/net-snmp/machine/generic.h
-./table.lo: ../../include/net-snmp/net-snmp-includes.h
-./table.lo: ../../include/net-snmp/definitions.h
-./table.lo: ../../include/net-snmp/types.h
-./table.lo: ../../include/net-snmp/library/snmp_api.h
-./table.lo: ../../include/net-snmp/library/asn1.h
-./table.lo: ../../include/net-snmp/library/snmp_impl.h
-./table.lo: ../../include/net-snmp/library/snmp.h
-./table.lo: ../../include/net-snmp/library/snmp-tc.h
-./table.lo: ../../include/net-snmp/utilities.h
-./table.lo: ../../include/net-snmp/library/snmp_client.h
-./table.lo: ../../include/net-snmp/library/system.h
-./table.lo: ../../include/net-snmp/library/tools.h
-./table.lo: ../../include/net-snmp/library/int64.h
-./table.lo: ../../include/net-snmp/library/mt_support.h
-./table.lo: ../../include/net-snmp/library/snmp_alarm.h
-./table.lo: ../../include/net-snmp/library/callback.h
-./table.lo: ../../include/net-snmp/library/data_list.h
-./table.lo: ../../include/net-snmp/library/oid_stash.h
-./table.lo: ../../include/net-snmp/library/check_varbind.h
-./table.lo: ../../include/net-snmp/library/container.h
-./table.lo: ../../include/net-snmp/library/factory.h
-./table.lo: ../../include/net-snmp/library/snmp_logging.h
-./table.lo: ../../include/net-snmp/library/container_binary_array.h
-./table.lo: ../../include/net-snmp/library/container_list_ssll.h
-./table.lo: ../../include/net-snmp/library/container_iterator.h
-./table.lo: ../../include/net-snmp/library/container.h
-./table.lo: ../../include/net-snmp/library/snmp_assert.h
-./table.lo: ../../include/net-snmp/version.h
-./table.lo: ../../include/net-snmp/session_api.h
-./table.lo: ../../include/net-snmp/library/snmp_transport.h
-./table.lo: ../../include/net-snmp/library/snmp_service.h
-./table.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
-./table.lo: ../../include/net-snmp/library/snmpUnixDomain.h
-./table.lo: ../../include/net-snmp/library/snmpUDPDomain.h
-./table.lo: ../../include/net-snmp/library/snmpTCPDomain.h
-./table.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
-./table.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
-./table.lo: ../../include/net-snmp/library/snmpIPXDomain.h
-./table.lo: ../../include/net-snmp/library/ucd_compat.h
-./table.lo: ../../include/net-snmp/pdu_api.h ../../include/net-snmp/mib_api.h
-./table.lo: ../../include/net-snmp/library/mib.h
-./table.lo: ../../include/net-snmp/library/parse.h
-./table.lo: ../../include/net-snmp/varbind_api.h
-./table.lo: ../../include/net-snmp/config_api.h
-./table.lo: ../../include/net-snmp/library/read_config.h
-./table.lo: ../../include/net-snmp/library/default_store.h
-./table.lo: ../../include/net-snmp/library/snmp_parse_args.h
-./table.lo: ../../include/net-snmp/library/snmp_enum.h
-./table.lo: ../../include/net-snmp/library/vacm.h
-./table.lo: ../../include/net-snmp/output_api.h
-./table.lo: ../../include/net-snmp/library/snmp_debug.h
-./table.lo: ../../include/net-snmp/snmpv3_api.h
-./table.lo: ../../include/net-snmp/library/snmpv3.h
-./table.lo: ../../include/net-snmp/library/transform_oids.h
-./table.lo: ../../include/net-snmp/library/keytools.h
-./table.lo: ../../include/net-snmp/library/scapi.h
-./table.lo: ../../include/net-snmp/library/lcd_time.h
-./table.lo: ../../include/net-snmp/library/snmp_secmod.h
-./table.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
-./table.lo: ../../include/net-snmp/library/snmpusm.h
-./table.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
-./table.lo: ../../include/net-snmp/agent/mib_module_config.h
-./table.lo: ../../include/net-snmp/agent/agent_module_config.h
-./table.lo: ../../include/net-snmp/agent/snmp_agent.h
-./table.lo: ../../include/net-snmp/agent/snmp_vars.h
-./table.lo: ../../include/net-snmp/agent/agent_handler.h
-./table.lo: ../../include/net-snmp/agent/var_struct.h
-./table.lo: ../../include/net-snmp/agent/agent_registry.h
-./table.lo: ../../include/net-snmp/library/fd_event_manager.h
-./table.lo: ../../include/net-snmp/agent/ds_agent.h
-./table.lo: ../../include/net-snmp/agent/agent_read_config.h
-./table.lo: ../../include/net-snmp/agent/agent_trap.h
-./table.lo: ../../include/net-snmp/agent/all_helpers.h
-./table.lo: ../../include/net-snmp/agent/instance.h
-./table.lo: ../../include/net-snmp/agent/baby_steps.h
-./table.lo: ../../include/net-snmp/agent/scalar.h
-./table.lo: ../../include/net-snmp/agent/scalar_group.h
-./table.lo: ../../include/net-snmp/agent/watcher.h
-./table.lo: ../../include/net-snmp/agent/multiplexer.h
-./table.lo: ../../include/net-snmp/agent/null.h
-./table.lo: ../../include/net-snmp/agent/debug_handler.h
-./table.lo: ../../include/net-snmp/agent/cache_handler.h
-./table.lo: ../../include/net-snmp/agent/old_api.h
-./table.lo: ../../include/net-snmp/agent/read_only.h
-./table.lo: ../../include/net-snmp/agent/row_merge.h
-./table.lo: ../../include/net-snmp/agent/serialize.h
-./table.lo: ../../include/net-snmp/agent/bulk_to_next.h
-./table.lo: ../../include/net-snmp/agent/mode_end_call.h
-./table.lo: ../../include/net-snmp/agent/table.h
-./table.lo: ../../include/net-snmp/agent/table_data.h
-./table.lo: ../../include/net-snmp/agent/table_dataset.h
-./table.lo: ../../include/net-snmp/agent/table_tdata.h
-./table.lo: ../../include/net-snmp/agent/table_iterator.h
-./table.lo: ../../include/net-snmp/agent/table_container.h
-./table.lo: ../../include/net-snmp/agent/table_array.h
-./table.lo: ../../include/net-snmp/agent/mfd.h
+./stash_to_next.lo: ../../include/net-snmp/agent/stash_cache.h
 ./table_array.lo: ../../include/net-snmp/net-snmp-config.h
 ./table_array.lo: ../../include/net-snmp/system/linux.h
 ./table_array.lo: ../../include/net-snmp/system/sysv.h
@@ -1847,32 +1782,14 @@
 ./table_array.lo: ../../include/net-snmp/net-snmp-includes.h
 ./table_array.lo: ../../include/net-snmp/definitions.h
 ./table_array.lo: ../../include/net-snmp/types.h
+./table_array.lo: ../../include/net-snmp/library/types.h
 ./table_array.lo: ../../include/net-snmp/library/snmp_api.h
-./table_array.lo: ../../include/net-snmp/library/asn1.h
-./table_array.lo: ../../include/net-snmp/library/snmp_impl.h
-./table_array.lo: ../../include/net-snmp/library/snmp.h
-./table_array.lo: ../../include/net-snmp/library/snmp-tc.h
-./table_array.lo: ../../include/net-snmp/utilities.h
+./table_array.lo: ../../include/net-snmp/varbind_api.h
 ./table_array.lo: ../../include/net-snmp/library/snmp_client.h
-./table_array.lo: ../../include/net-snmp/library/system.h
-./table_array.lo: ../../include/net-snmp/library/tools.h
-./table_array.lo: ../../include/net-snmp/library/int64.h
-./table_array.lo: ../../include/net-snmp/library/mt_support.h
-./table_array.lo: ../../include/net-snmp/library/snmp_alarm.h
-./table_array.lo: ../../include/net-snmp/library/callback.h
-./table_array.lo: ../../include/net-snmp/library/data_list.h
-./table_array.lo: ../../include/net-snmp/library/oid_stash.h
-./table_array.lo: ../../include/net-snmp/library/check_varbind.h
-./table_array.lo: ../../include/net-snmp/library/container.h
-./table_array.lo: ../../include/net-snmp/library/factory.h
-./table_array.lo: ../../include/net-snmp/library/snmp_logging.h
-./table_array.lo: ../../include/net-snmp/library/container_binary_array.h
-./table_array.lo: ../../include/net-snmp/library/container_list_ssll.h
-./table_array.lo: ../../include/net-snmp/library/container_iterator.h
-./table_array.lo: ../../include/net-snmp/library/container.h
-./table_array.lo: ../../include/net-snmp/library/snmp_assert.h
-./table_array.lo: ../../include/net-snmp/version.h
+./table_array.lo: ../../include/net-snmp/pdu_api.h
+./table_array.lo: ../../include/net-snmp/library/asn1.h
 ./table_array.lo: ../../include/net-snmp/session_api.h
+./table_array.lo: ../../include/net-snmp/library/callback.h
 ./table_array.lo: ../../include/net-snmp/library/snmp_transport.h
 ./table_array.lo: ../../include/net-snmp/library/snmp_service.h
 ./table_array.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -1883,11 +1800,31 @@
 ./table_array.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./table_array.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./table_array.lo: ../../include/net-snmp/library/ucd_compat.h
-./table_array.lo: ../../include/net-snmp/pdu_api.h
-./table_array.lo: ../../include/net-snmp/mib_api.h
 ./table_array.lo: ../../include/net-snmp/library/mib.h
+./table_array.lo: ../../include/net-snmp/mib_api.h
 ./table_array.lo: ../../include/net-snmp/library/parse.h
-./table_array.lo: ../../include/net-snmp/varbind_api.h
+./table_array.lo: ../../include/net-snmp/library/oid_stash.h
+./table_array.lo: ../../include/net-snmp/library/snmp_impl.h
+./table_array.lo: ../../include/net-snmp/library/snmp.h
+./table_array.lo: ../../include/net-snmp/library/snmp-tc.h
+./table_array.lo: ../../include/net-snmp/library/getopt.h
+./table_array.lo: ../../include/net-snmp/utilities.h
+./table_array.lo: ../../include/net-snmp/library/system.h
+./table_array.lo: ../../include/net-snmp/library/tools.h
+./table_array.lo: ../../include/net-snmp/library/int64.h
+./table_array.lo: ../../include/net-snmp/library/mt_support.h
+./table_array.lo: ../../include/net-snmp/library/snmp_alarm.h
+./table_array.lo: ../../include/net-snmp/library/data_list.h
+./table_array.lo: ../../include/net-snmp/library/check_varbind.h
+./table_array.lo: ../../include/net-snmp/library/container.h
+./table_array.lo: ../../include/net-snmp/library/factory.h
+./table_array.lo: ../../include/net-snmp/library/snmp_logging.h
+./table_array.lo: ../../include/net-snmp/library/container_binary_array.h
+./table_array.lo: ../../include/net-snmp/library/container_list_ssll.h
+./table_array.lo: ../../include/net-snmp/library/container_iterator.h
+./table_array.lo: ../../include/net-snmp/library/container.h
+./table_array.lo: ../../include/net-snmp/library/snmp_assert.h
+./table_array.lo: ../../include/net-snmp/version.h
 ./table_array.lo: ../../include/net-snmp/config_api.h
 ./table_array.lo: ../../include/net-snmp/library/read_config.h
 ./table_array.lo: ../../include/net-snmp/library/default_store.h
@@ -1941,6 +1878,110 @@
 ./table_array.lo: ../../include/net-snmp/agent/table_container.h
 ./table_array.lo: ../../include/net-snmp/agent/table_array.h
 ./table_array.lo: ../../include/net-snmp/agent/mfd.h
+./table.lo: ../../include/net-snmp/net-snmp-config.h
+./table.lo: ../../include/net-snmp/system/linux.h
+./table.lo: ../../include/net-snmp/system/sysv.h
+./table.lo: ../../include/net-snmp/system/generic.h
+./table.lo: ../../include/net-snmp/machine/generic.h
+./table.lo: ../../include/net-snmp/net-snmp-includes.h
+./table.lo: ../../include/net-snmp/definitions.h
+./table.lo: ../../include/net-snmp/types.h
+./table.lo: ../../include/net-snmp/library/types.h
+./table.lo: ../../include/net-snmp/library/snmp_api.h
+./table.lo: ../../include/net-snmp/varbind_api.h
+./table.lo: ../../include/net-snmp/library/snmp_client.h
+./table.lo: ../../include/net-snmp/pdu_api.h
+./table.lo: ../../include/net-snmp/library/asn1.h
+./table.lo: ../../include/net-snmp/session_api.h
+./table.lo: ../../include/net-snmp/library/callback.h
+./table.lo: ../../include/net-snmp/library/snmp_transport.h
+./table.lo: ../../include/net-snmp/library/snmp_service.h
+./table.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./table.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./table.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./table.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./table.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./table.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./table.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./table.lo: ../../include/net-snmp/library/ucd_compat.h
+./table.lo: ../../include/net-snmp/library/mib.h
+./table.lo: ../../include/net-snmp/mib_api.h
+./table.lo: ../../include/net-snmp/library/parse.h
+./table.lo: ../../include/net-snmp/library/oid_stash.h
+./table.lo: ../../include/net-snmp/library/snmp_impl.h
+./table.lo: ../../include/net-snmp/library/snmp.h
+./table.lo: ../../include/net-snmp/library/snmp-tc.h
+./table.lo: ../../include/net-snmp/library/getopt.h
+./table.lo: ../../include/net-snmp/utilities.h
+./table.lo: ../../include/net-snmp/library/system.h
+./table.lo: ../../include/net-snmp/library/tools.h
+./table.lo: ../../include/net-snmp/library/int64.h
+./table.lo: ../../include/net-snmp/library/mt_support.h
+./table.lo: ../../include/net-snmp/library/snmp_alarm.h
+./table.lo: ../../include/net-snmp/library/data_list.h
+./table.lo: ../../include/net-snmp/library/check_varbind.h
+./table.lo: ../../include/net-snmp/library/container.h
+./table.lo: ../../include/net-snmp/library/factory.h
+./table.lo: ../../include/net-snmp/library/snmp_logging.h
+./table.lo: ../../include/net-snmp/library/container_binary_array.h
+./table.lo: ../../include/net-snmp/library/container_list_ssll.h
+./table.lo: ../../include/net-snmp/library/container_iterator.h
+./table.lo: ../../include/net-snmp/library/container.h
+./table.lo: ../../include/net-snmp/library/snmp_assert.h
+./table.lo: ../../include/net-snmp/version.h
+./table.lo: ../../include/net-snmp/config_api.h
+./table.lo: ../../include/net-snmp/library/read_config.h
+./table.lo: ../../include/net-snmp/library/default_store.h
+./table.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./table.lo: ../../include/net-snmp/library/snmp_enum.h
+./table.lo: ../../include/net-snmp/library/vacm.h
+./table.lo: ../../include/net-snmp/output_api.h
+./table.lo: ../../include/net-snmp/library/snmp_debug.h
+./table.lo: ../../include/net-snmp/snmpv3_api.h
+./table.lo: ../../include/net-snmp/library/snmpv3.h
+./table.lo: ../../include/net-snmp/library/transform_oids.h
+./table.lo: ../../include/net-snmp/library/keytools.h
+./table.lo: ../../include/net-snmp/library/scapi.h
+./table.lo: ../../include/net-snmp/library/lcd_time.h
+./table.lo: ../../include/net-snmp/library/snmp_secmod.h
+./table.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./table.lo: ../../include/net-snmp/library/snmpusm.h
+./table.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./table.lo: ../../include/net-snmp/agent/mib_module_config.h
+./table.lo: ../../include/net-snmp/agent/agent_module_config.h
+./table.lo: ../../include/net-snmp/agent/snmp_agent.h
+./table.lo: ../../include/net-snmp/agent/snmp_vars.h
+./table.lo: ../../include/net-snmp/agent/agent_handler.h
+./table.lo: ../../include/net-snmp/agent/var_struct.h
+./table.lo: ../../include/net-snmp/agent/agent_registry.h
+./table.lo: ../../include/net-snmp/library/fd_event_manager.h
+./table.lo: ../../include/net-snmp/agent/ds_agent.h
+./table.lo: ../../include/net-snmp/agent/agent_read_config.h
+./table.lo: ../../include/net-snmp/agent/agent_trap.h
+./table.lo: ../../include/net-snmp/agent/all_helpers.h
+./table.lo: ../../include/net-snmp/agent/instance.h
+./table.lo: ../../include/net-snmp/agent/baby_steps.h
+./table.lo: ../../include/net-snmp/agent/scalar.h
+./table.lo: ../../include/net-snmp/agent/scalar_group.h
+./table.lo: ../../include/net-snmp/agent/watcher.h
+./table.lo: ../../include/net-snmp/agent/multiplexer.h
+./table.lo: ../../include/net-snmp/agent/null.h
+./table.lo: ../../include/net-snmp/agent/debug_handler.h
+./table.lo: ../../include/net-snmp/agent/cache_handler.h
+./table.lo: ../../include/net-snmp/agent/old_api.h
+./table.lo: ../../include/net-snmp/agent/read_only.h
+./table.lo: ../../include/net-snmp/agent/row_merge.h
+./table.lo: ../../include/net-snmp/agent/serialize.h
+./table.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./table.lo: ../../include/net-snmp/agent/mode_end_call.h
+./table.lo: ../../include/net-snmp/agent/table.h
+./table.lo: ../../include/net-snmp/agent/table_data.h
+./table.lo: ../../include/net-snmp/agent/table_dataset.h
+./table.lo: ../../include/net-snmp/agent/table_tdata.h
+./table.lo: ../../include/net-snmp/agent/table_iterator.h
+./table.lo: ../../include/net-snmp/agent/table_container.h
+./table.lo: ../../include/net-snmp/agent/table_array.h
+./table.lo: ../../include/net-snmp/agent/mfd.h
 ./table_container.lo: ../../include/net-snmp/net-snmp-config.h
 ./table_container.lo: ../../include/net-snmp/system/linux.h
 ./table_container.lo: ../../include/net-snmp/system/sysv.h
@@ -1949,32 +1990,14 @@
 ./table_container.lo: ../../include/net-snmp/net-snmp-includes.h
 ./table_container.lo: ../../include/net-snmp/definitions.h
 ./table_container.lo: ../../include/net-snmp/types.h
+./table_container.lo: ../../include/net-snmp/library/types.h
 ./table_container.lo: ../../include/net-snmp/library/snmp_api.h
-./table_container.lo: ../../include/net-snmp/library/asn1.h
-./table_container.lo: ../../include/net-snmp/library/snmp_impl.h
-./table_container.lo: ../../include/net-snmp/library/snmp.h
-./table_container.lo: ../../include/net-snmp/library/snmp-tc.h
-./table_container.lo: ../../include/net-snmp/utilities.h
+./table_container.lo: ../../include/net-snmp/varbind_api.h
 ./table_container.lo: ../../include/net-snmp/library/snmp_client.h
-./table_container.lo: ../../include/net-snmp/library/system.h
-./table_container.lo: ../../include/net-snmp/library/tools.h
-./table_container.lo: ../../include/net-snmp/library/int64.h
-./table_container.lo: ../../include/net-snmp/library/mt_support.h
-./table_container.lo: ../../include/net-snmp/library/snmp_alarm.h
-./table_container.lo: ../../include/net-snmp/library/callback.h
-./table_container.lo: ../../include/net-snmp/library/data_list.h
-./table_container.lo: ../../include/net-snmp/library/oid_stash.h
-./table_container.lo: ../../include/net-snmp/library/check_varbind.h
-./table_container.lo: ../../include/net-snmp/library/container.h
-./table_container.lo: ../../include/net-snmp/library/factory.h
-./table_container.lo: ../../include/net-snmp/library/snmp_logging.h
-./table_container.lo: ../../include/net-snmp/library/container_binary_array.h
-./table_container.lo: ../../include/net-snmp/library/container_list_ssll.h
-./table_container.lo: ../../include/net-snmp/library/container_iterator.h
-./table_container.lo: ../../include/net-snmp/library/container.h
-./table_container.lo: ../../include/net-snmp/library/snmp_assert.h
-./table_container.lo: ../../include/net-snmp/version.h
+./table_container.lo: ../../include/net-snmp/pdu_api.h
+./table_container.lo: ../../include/net-snmp/library/asn1.h
 ./table_container.lo: ../../include/net-snmp/session_api.h
+./table_container.lo: ../../include/net-snmp/library/callback.h
 ./table_container.lo: ../../include/net-snmp/library/snmp_transport.h
 ./table_container.lo: ../../include/net-snmp/library/snmp_service.h
 ./table_container.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -1985,11 +2008,31 @@
 ./table_container.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./table_container.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./table_container.lo: ../../include/net-snmp/library/ucd_compat.h
-./table_container.lo: ../../include/net-snmp/pdu_api.h
-./table_container.lo: ../../include/net-snmp/mib_api.h
 ./table_container.lo: ../../include/net-snmp/library/mib.h
+./table_container.lo: ../../include/net-snmp/mib_api.h
 ./table_container.lo: ../../include/net-snmp/library/parse.h
-./table_container.lo: ../../include/net-snmp/varbind_api.h
+./table_container.lo: ../../include/net-snmp/library/oid_stash.h
+./table_container.lo: ../../include/net-snmp/library/snmp_impl.h
+./table_container.lo: ../../include/net-snmp/library/snmp.h
+./table_container.lo: ../../include/net-snmp/library/snmp-tc.h
+./table_container.lo: ../../include/net-snmp/library/getopt.h
+./table_container.lo: ../../include/net-snmp/utilities.h
+./table_container.lo: ../../include/net-snmp/library/system.h
+./table_container.lo: ../../include/net-snmp/library/tools.h
+./table_container.lo: ../../include/net-snmp/library/int64.h
+./table_container.lo: ../../include/net-snmp/library/mt_support.h
+./table_container.lo: ../../include/net-snmp/library/snmp_alarm.h
+./table_container.lo: ../../include/net-snmp/library/data_list.h
+./table_container.lo: ../../include/net-snmp/library/check_varbind.h
+./table_container.lo: ../../include/net-snmp/library/container.h
+./table_container.lo: ../../include/net-snmp/library/factory.h
+./table_container.lo: ../../include/net-snmp/library/snmp_logging.h
+./table_container.lo: ../../include/net-snmp/library/container_binary_array.h
+./table_container.lo: ../../include/net-snmp/library/container_list_ssll.h
+./table_container.lo: ../../include/net-snmp/library/container_iterator.h
+./table_container.lo: ../../include/net-snmp/library/container.h
+./table_container.lo: ../../include/net-snmp/library/snmp_assert.h
+./table_container.lo: ../../include/net-snmp/version.h
 ./table_container.lo: ../../include/net-snmp/config_api.h
 ./table_container.lo: ../../include/net-snmp/library/read_config.h
 ./table_container.lo: ../../include/net-snmp/library/default_store.h
@@ -2051,32 +2094,14 @@
 ./table_data.lo: ../../include/net-snmp/net-snmp-includes.h
 ./table_data.lo: ../../include/net-snmp/definitions.h
 ./table_data.lo: ../../include/net-snmp/types.h
+./table_data.lo: ../../include/net-snmp/library/types.h
 ./table_data.lo: ../../include/net-snmp/library/snmp_api.h
-./table_data.lo: ../../include/net-snmp/library/asn1.h
-./table_data.lo: ../../include/net-snmp/library/snmp_impl.h
-./table_data.lo: ../../include/net-snmp/library/snmp.h
-./table_data.lo: ../../include/net-snmp/library/snmp-tc.h
-./table_data.lo: ../../include/net-snmp/utilities.h
+./table_data.lo: ../../include/net-snmp/varbind_api.h
 ./table_data.lo: ../../include/net-snmp/library/snmp_client.h
-./table_data.lo: ../../include/net-snmp/library/system.h
-./table_data.lo: ../../include/net-snmp/library/tools.h
-./table_data.lo: ../../include/net-snmp/library/int64.h
-./table_data.lo: ../../include/net-snmp/library/mt_support.h
-./table_data.lo: ../../include/net-snmp/library/snmp_alarm.h
-./table_data.lo: ../../include/net-snmp/library/callback.h
-./table_data.lo: ../../include/net-snmp/library/data_list.h
-./table_data.lo: ../../include/net-snmp/library/oid_stash.h
-./table_data.lo: ../../include/net-snmp/library/check_varbind.h
-./table_data.lo: ../../include/net-snmp/library/container.h
-./table_data.lo: ../../include/net-snmp/library/factory.h
-./table_data.lo: ../../include/net-snmp/library/snmp_logging.h
-./table_data.lo: ../../include/net-snmp/library/container_binary_array.h
-./table_data.lo: ../../include/net-snmp/library/container_list_ssll.h
-./table_data.lo: ../../include/net-snmp/library/container_iterator.h
-./table_data.lo: ../../include/net-snmp/library/container.h
-./table_data.lo: ../../include/net-snmp/library/snmp_assert.h
-./table_data.lo: ../../include/net-snmp/version.h
+./table_data.lo: ../../include/net-snmp/pdu_api.h
+./table_data.lo: ../../include/net-snmp/library/asn1.h
 ./table_data.lo: ../../include/net-snmp/session_api.h
+./table_data.lo: ../../include/net-snmp/library/callback.h
 ./table_data.lo: ../../include/net-snmp/library/snmp_transport.h
 ./table_data.lo: ../../include/net-snmp/library/snmp_service.h
 ./table_data.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -2087,11 +2112,31 @@
 ./table_data.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./table_data.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./table_data.lo: ../../include/net-snmp/library/ucd_compat.h
-./table_data.lo: ../../include/net-snmp/pdu_api.h
-./table_data.lo: ../../include/net-snmp/mib_api.h
 ./table_data.lo: ../../include/net-snmp/library/mib.h
+./table_data.lo: ../../include/net-snmp/mib_api.h
 ./table_data.lo: ../../include/net-snmp/library/parse.h
-./table_data.lo: ../../include/net-snmp/varbind_api.h
+./table_data.lo: ../../include/net-snmp/library/oid_stash.h
+./table_data.lo: ../../include/net-snmp/library/snmp_impl.h
+./table_data.lo: ../../include/net-snmp/library/snmp.h
+./table_data.lo: ../../include/net-snmp/library/snmp-tc.h
+./table_data.lo: ../../include/net-snmp/library/getopt.h
+./table_data.lo: ../../include/net-snmp/utilities.h
+./table_data.lo: ../../include/net-snmp/library/system.h
+./table_data.lo: ../../include/net-snmp/library/tools.h
+./table_data.lo: ../../include/net-snmp/library/int64.h
+./table_data.lo: ../../include/net-snmp/library/mt_support.h
+./table_data.lo: ../../include/net-snmp/library/snmp_alarm.h
+./table_data.lo: ../../include/net-snmp/library/data_list.h
+./table_data.lo: ../../include/net-snmp/library/check_varbind.h
+./table_data.lo: ../../include/net-snmp/library/container.h
+./table_data.lo: ../../include/net-snmp/library/factory.h
+./table_data.lo: ../../include/net-snmp/library/snmp_logging.h
+./table_data.lo: ../../include/net-snmp/library/container_binary_array.h
+./table_data.lo: ../../include/net-snmp/library/container_list_ssll.h
+./table_data.lo: ../../include/net-snmp/library/container_iterator.h
+./table_data.lo: ../../include/net-snmp/library/container.h
+./table_data.lo: ../../include/net-snmp/library/snmp_assert.h
+./table_data.lo: ../../include/net-snmp/version.h
 ./table_data.lo: ../../include/net-snmp/config_api.h
 ./table_data.lo: ../../include/net-snmp/library/read_config.h
 ./table_data.lo: ../../include/net-snmp/library/default_store.h
@@ -2153,32 +2198,14 @@
 ./table_dataset.lo: ../../include/net-snmp/net-snmp-includes.h
 ./table_dataset.lo: ../../include/net-snmp/definitions.h
 ./table_dataset.lo: ../../include/net-snmp/types.h
+./table_dataset.lo: ../../include/net-snmp/library/types.h
 ./table_dataset.lo: ../../include/net-snmp/library/snmp_api.h
-./table_dataset.lo: ../../include/net-snmp/library/asn1.h
-./table_dataset.lo: ../../include/net-snmp/library/snmp_impl.h
-./table_dataset.lo: ../../include/net-snmp/library/snmp.h
-./table_dataset.lo: ../../include/net-snmp/library/snmp-tc.h
-./table_dataset.lo: ../../include/net-snmp/utilities.h
+./table_dataset.lo: ../../include/net-snmp/varbind_api.h
 ./table_dataset.lo: ../../include/net-snmp/library/snmp_client.h
-./table_dataset.lo: ../../include/net-snmp/library/system.h
-./table_dataset.lo: ../../include/net-snmp/library/tools.h
-./table_dataset.lo: ../../include/net-snmp/library/int64.h
-./table_dataset.lo: ../../include/net-snmp/library/mt_support.h
-./table_dataset.lo: ../../include/net-snmp/library/snmp_alarm.h
-./table_dataset.lo: ../../include/net-snmp/library/callback.h
-./table_dataset.lo: ../../include/net-snmp/library/data_list.h
-./table_dataset.lo: ../../include/net-snmp/library/oid_stash.h
-./table_dataset.lo: ../../include/net-snmp/library/check_varbind.h
-./table_dataset.lo: ../../include/net-snmp/library/container.h
-./table_dataset.lo: ../../include/net-snmp/library/factory.h
-./table_dataset.lo: ../../include/net-snmp/library/snmp_logging.h
-./table_dataset.lo: ../../include/net-snmp/library/container_binary_array.h
-./table_dataset.lo: ../../include/net-snmp/library/container_list_ssll.h
-./table_dataset.lo: ../../include/net-snmp/library/container_iterator.h
-./table_dataset.lo: ../../include/net-snmp/library/container.h
-./table_dataset.lo: ../../include/net-snmp/library/snmp_assert.h
-./table_dataset.lo: ../../include/net-snmp/version.h
+./table_dataset.lo: ../../include/net-snmp/pdu_api.h
+./table_dataset.lo: ../../include/net-snmp/library/asn1.h
 ./table_dataset.lo: ../../include/net-snmp/session_api.h
+./table_dataset.lo: ../../include/net-snmp/library/callback.h
 ./table_dataset.lo: ../../include/net-snmp/library/snmp_transport.h
 ./table_dataset.lo: ../../include/net-snmp/library/snmp_service.h
 ./table_dataset.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -2189,11 +2216,31 @@
 ./table_dataset.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./table_dataset.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./table_dataset.lo: ../../include/net-snmp/library/ucd_compat.h
-./table_dataset.lo: ../../include/net-snmp/pdu_api.h
-./table_dataset.lo: ../../include/net-snmp/mib_api.h
 ./table_dataset.lo: ../../include/net-snmp/library/mib.h
+./table_dataset.lo: ../../include/net-snmp/mib_api.h
 ./table_dataset.lo: ../../include/net-snmp/library/parse.h
-./table_dataset.lo: ../../include/net-snmp/varbind_api.h
+./table_dataset.lo: ../../include/net-snmp/library/oid_stash.h
+./table_dataset.lo: ../../include/net-snmp/library/snmp_impl.h
+./table_dataset.lo: ../../include/net-snmp/library/snmp.h
+./table_dataset.lo: ../../include/net-snmp/library/snmp-tc.h
+./table_dataset.lo: ../../include/net-snmp/library/getopt.h
+./table_dataset.lo: ../../include/net-snmp/utilities.h
+./table_dataset.lo: ../../include/net-snmp/library/system.h
+./table_dataset.lo: ../../include/net-snmp/library/tools.h
+./table_dataset.lo: ../../include/net-snmp/library/int64.h
+./table_dataset.lo: ../../include/net-snmp/library/mt_support.h
+./table_dataset.lo: ../../include/net-snmp/library/snmp_alarm.h
+./table_dataset.lo: ../../include/net-snmp/library/data_list.h
+./table_dataset.lo: ../../include/net-snmp/library/check_varbind.h
+./table_dataset.lo: ../../include/net-snmp/library/container.h
+./table_dataset.lo: ../../include/net-snmp/library/factory.h
+./table_dataset.lo: ../../include/net-snmp/library/snmp_logging.h
+./table_dataset.lo: ../../include/net-snmp/library/container_binary_array.h
+./table_dataset.lo: ../../include/net-snmp/library/container_list_ssll.h
+./table_dataset.lo: ../../include/net-snmp/library/container_iterator.h
+./table_dataset.lo: ../../include/net-snmp/library/container.h
+./table_dataset.lo: ../../include/net-snmp/library/snmp_assert.h
+./table_dataset.lo: ../../include/net-snmp/version.h
 ./table_dataset.lo: ../../include/net-snmp/config_api.h
 ./table_dataset.lo: ../../include/net-snmp/library/read_config.h
 ./table_dataset.lo: ../../include/net-snmp/library/default_store.h
@@ -2255,32 +2302,14 @@
 ./table_iterator.lo: ../../include/net-snmp/net-snmp-includes.h
 ./table_iterator.lo: ../../include/net-snmp/definitions.h
 ./table_iterator.lo: ../../include/net-snmp/types.h
+./table_iterator.lo: ../../include/net-snmp/library/types.h
 ./table_iterator.lo: ../../include/net-snmp/library/snmp_api.h
-./table_iterator.lo: ../../include/net-snmp/library/asn1.h
-./table_iterator.lo: ../../include/net-snmp/library/snmp_impl.h
-./table_iterator.lo: ../../include/net-snmp/library/snmp.h
-./table_iterator.lo: ../../include/net-snmp/library/snmp-tc.h
-./table_iterator.lo: ../../include/net-snmp/utilities.h
+./table_iterator.lo: ../../include/net-snmp/varbind_api.h
 ./table_iterator.lo: ../../include/net-snmp/library/snmp_client.h
-./table_iterator.lo: ../../include/net-snmp/library/system.h
-./table_iterator.lo: ../../include/net-snmp/library/tools.h
-./table_iterator.lo: ../../include/net-snmp/library/int64.h
-./table_iterator.lo: ../../include/net-snmp/library/mt_support.h
-./table_iterator.lo: ../../include/net-snmp/library/snmp_alarm.h
-./table_iterator.lo: ../../include/net-snmp/library/callback.h
-./table_iterator.lo: ../../include/net-snmp/library/data_list.h
-./table_iterator.lo: ../../include/net-snmp/library/oid_stash.h
-./table_iterator.lo: ../../include/net-snmp/library/check_varbind.h
-./table_iterator.lo: ../../include/net-snmp/library/container.h
-./table_iterator.lo: ../../include/net-snmp/library/factory.h
-./table_iterator.lo: ../../include/net-snmp/library/snmp_logging.h
-./table_iterator.lo: ../../include/net-snmp/library/container_binary_array.h
-./table_iterator.lo: ../../include/net-snmp/library/container_list_ssll.h
-./table_iterator.lo: ../../include/net-snmp/library/container_iterator.h
-./table_iterator.lo: ../../include/net-snmp/library/container.h
-./table_iterator.lo: ../../include/net-snmp/library/snmp_assert.h
-./table_iterator.lo: ../../include/net-snmp/version.h
+./table_iterator.lo: ../../include/net-snmp/pdu_api.h
+./table_iterator.lo: ../../include/net-snmp/library/asn1.h
 ./table_iterator.lo: ../../include/net-snmp/session_api.h
+./table_iterator.lo: ../../include/net-snmp/library/callback.h
 ./table_iterator.lo: ../../include/net-snmp/library/snmp_transport.h
 ./table_iterator.lo: ../../include/net-snmp/library/snmp_service.h
 ./table_iterator.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -2291,11 +2320,31 @@
 ./table_iterator.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./table_iterator.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./table_iterator.lo: ../../include/net-snmp/library/ucd_compat.h
-./table_iterator.lo: ../../include/net-snmp/pdu_api.h
-./table_iterator.lo: ../../include/net-snmp/mib_api.h
 ./table_iterator.lo: ../../include/net-snmp/library/mib.h
+./table_iterator.lo: ../../include/net-snmp/mib_api.h
 ./table_iterator.lo: ../../include/net-snmp/library/parse.h
-./table_iterator.lo: ../../include/net-snmp/varbind_api.h
+./table_iterator.lo: ../../include/net-snmp/library/oid_stash.h
+./table_iterator.lo: ../../include/net-snmp/library/snmp_impl.h
+./table_iterator.lo: ../../include/net-snmp/library/snmp.h
+./table_iterator.lo: ../../include/net-snmp/library/snmp-tc.h
+./table_iterator.lo: ../../include/net-snmp/library/getopt.h
+./table_iterator.lo: ../../include/net-snmp/utilities.h
+./table_iterator.lo: ../../include/net-snmp/library/system.h
+./table_iterator.lo: ../../include/net-snmp/library/tools.h
+./table_iterator.lo: ../../include/net-snmp/library/int64.h
+./table_iterator.lo: ../../include/net-snmp/library/mt_support.h
+./table_iterator.lo: ../../include/net-snmp/library/snmp_alarm.h
+./table_iterator.lo: ../../include/net-snmp/library/data_list.h
+./table_iterator.lo: ../../include/net-snmp/library/check_varbind.h
+./table_iterator.lo: ../../include/net-snmp/library/container.h
+./table_iterator.lo: ../../include/net-snmp/library/factory.h
+./table_iterator.lo: ../../include/net-snmp/library/snmp_logging.h
+./table_iterator.lo: ../../include/net-snmp/library/container_binary_array.h
+./table_iterator.lo: ../../include/net-snmp/library/container_list_ssll.h
+./table_iterator.lo: ../../include/net-snmp/library/container_iterator.h
+./table_iterator.lo: ../../include/net-snmp/library/container.h
+./table_iterator.lo: ../../include/net-snmp/library/snmp_assert.h
+./table_iterator.lo: ../../include/net-snmp/version.h
 ./table_iterator.lo: ../../include/net-snmp/config_api.h
 ./table_iterator.lo: ../../include/net-snmp/library/read_config.h
 ./table_iterator.lo: ../../include/net-snmp/library/default_store.h
@@ -2358,32 +2407,14 @@
 ./table_row.lo: ../../include/net-snmp/net-snmp-includes.h
 ./table_row.lo: ../../include/net-snmp/definitions.h
 ./table_row.lo: ../../include/net-snmp/types.h
+./table_row.lo: ../../include/net-snmp/library/types.h
 ./table_row.lo: ../../include/net-snmp/library/snmp_api.h
-./table_row.lo: ../../include/net-snmp/library/asn1.h
-./table_row.lo: ../../include/net-snmp/library/snmp_impl.h
-./table_row.lo: ../../include/net-snmp/library/snmp.h
-./table_row.lo: ../../include/net-snmp/library/snmp-tc.h
-./table_row.lo: ../../include/net-snmp/utilities.h
+./table_row.lo: ../../include/net-snmp/varbind_api.h
 ./table_row.lo: ../../include/net-snmp/library/snmp_client.h
-./table_row.lo: ../../include/net-snmp/library/system.h
-./table_row.lo: ../../include/net-snmp/library/tools.h
-./table_row.lo: ../../include/net-snmp/library/int64.h
-./table_row.lo: ../../include/net-snmp/library/mt_support.h
-./table_row.lo: ../../include/net-snmp/library/snmp_alarm.h
-./table_row.lo: ../../include/net-snmp/library/callback.h
-./table_row.lo: ../../include/net-snmp/library/data_list.h
-./table_row.lo: ../../include/net-snmp/library/oid_stash.h
-./table_row.lo: ../../include/net-snmp/library/check_varbind.h
-./table_row.lo: ../../include/net-snmp/library/container.h
-./table_row.lo: ../../include/net-snmp/library/factory.h
-./table_row.lo: ../../include/net-snmp/library/snmp_logging.h
-./table_row.lo: ../../include/net-snmp/library/container_binary_array.h
-./table_row.lo: ../../include/net-snmp/library/container_list_ssll.h
-./table_row.lo: ../../include/net-snmp/library/container_iterator.h
-./table_row.lo: ../../include/net-snmp/library/container.h
-./table_row.lo: ../../include/net-snmp/library/snmp_assert.h
-./table_row.lo: ../../include/net-snmp/version.h
+./table_row.lo: ../../include/net-snmp/pdu_api.h
+./table_row.lo: ../../include/net-snmp/library/asn1.h
 ./table_row.lo: ../../include/net-snmp/session_api.h
+./table_row.lo: ../../include/net-snmp/library/callback.h
 ./table_row.lo: ../../include/net-snmp/library/snmp_transport.h
 ./table_row.lo: ../../include/net-snmp/library/snmp_service.h
 ./table_row.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -2394,11 +2425,31 @@
 ./table_row.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./table_row.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./table_row.lo: ../../include/net-snmp/library/ucd_compat.h
-./table_row.lo: ../../include/net-snmp/pdu_api.h
-./table_row.lo: ../../include/net-snmp/mib_api.h
 ./table_row.lo: ../../include/net-snmp/library/mib.h
+./table_row.lo: ../../include/net-snmp/mib_api.h
 ./table_row.lo: ../../include/net-snmp/library/parse.h
-./table_row.lo: ../../include/net-snmp/varbind_api.h
+./table_row.lo: ../../include/net-snmp/library/oid_stash.h
+./table_row.lo: ../../include/net-snmp/library/snmp_impl.h
+./table_row.lo: ../../include/net-snmp/library/snmp.h
+./table_row.lo: ../../include/net-snmp/library/snmp-tc.h
+./table_row.lo: ../../include/net-snmp/library/getopt.h
+./table_row.lo: ../../include/net-snmp/utilities.h
+./table_row.lo: ../../include/net-snmp/library/system.h
+./table_row.lo: ../../include/net-snmp/library/tools.h
+./table_row.lo: ../../include/net-snmp/library/int64.h
+./table_row.lo: ../../include/net-snmp/library/mt_support.h
+./table_row.lo: ../../include/net-snmp/library/snmp_alarm.h
+./table_row.lo: ../../include/net-snmp/library/data_list.h
+./table_row.lo: ../../include/net-snmp/library/check_varbind.h
+./table_row.lo: ../../include/net-snmp/library/container.h
+./table_row.lo: ../../include/net-snmp/library/factory.h
+./table_row.lo: ../../include/net-snmp/library/snmp_logging.h
+./table_row.lo: ../../include/net-snmp/library/container_binary_array.h
+./table_row.lo: ../../include/net-snmp/library/container_list_ssll.h
+./table_row.lo: ../../include/net-snmp/library/container_iterator.h
+./table_row.lo: ../../include/net-snmp/library/container.h
+./table_row.lo: ../../include/net-snmp/library/snmp_assert.h
+./table_row.lo: ../../include/net-snmp/version.h
 ./table_row.lo: ../../include/net-snmp/config_api.h
 ./table_row.lo: ../../include/net-snmp/library/read_config.h
 ./table_row.lo: ../../include/net-snmp/library/default_store.h
@@ -2460,32 +2511,14 @@
 ./table_tdata.lo: ../../include/net-snmp/net-snmp-includes.h
 ./table_tdata.lo: ../../include/net-snmp/definitions.h
 ./table_tdata.lo: ../../include/net-snmp/types.h
+./table_tdata.lo: ../../include/net-snmp/library/types.h
 ./table_tdata.lo: ../../include/net-snmp/library/snmp_api.h
-./table_tdata.lo: ../../include/net-snmp/library/asn1.h
-./table_tdata.lo: ../../include/net-snmp/library/snmp_impl.h
-./table_tdata.lo: ../../include/net-snmp/library/snmp.h
-./table_tdata.lo: ../../include/net-snmp/library/snmp-tc.h
-./table_tdata.lo: ../../include/net-snmp/utilities.h
+./table_tdata.lo: ../../include/net-snmp/varbind_api.h
 ./table_tdata.lo: ../../include/net-snmp/library/snmp_client.h
-./table_tdata.lo: ../../include/net-snmp/library/system.h
-./table_tdata.lo: ../../include/net-snmp/library/tools.h
-./table_tdata.lo: ../../include/net-snmp/library/int64.h
-./table_tdata.lo: ../../include/net-snmp/library/mt_support.h
-./table_tdata.lo: ../../include/net-snmp/library/snmp_alarm.h
-./table_tdata.lo: ../../include/net-snmp/library/callback.h
-./table_tdata.lo: ../../include/net-snmp/library/data_list.h
-./table_tdata.lo: ../../include/net-snmp/library/oid_stash.h
-./table_tdata.lo: ../../include/net-snmp/library/check_varbind.h
-./table_tdata.lo: ../../include/net-snmp/library/container.h
-./table_tdata.lo: ../../include/net-snmp/library/factory.h
-./table_tdata.lo: ../../include/net-snmp/library/snmp_logging.h
-./table_tdata.lo: ../../include/net-snmp/library/container_binary_array.h
-./table_tdata.lo: ../../include/net-snmp/library/container_list_ssll.h
-./table_tdata.lo: ../../include/net-snmp/library/container_iterator.h
-./table_tdata.lo: ../../include/net-snmp/library/container.h
-./table_tdata.lo: ../../include/net-snmp/library/snmp_assert.h
-./table_tdata.lo: ../../include/net-snmp/version.h
+./table_tdata.lo: ../../include/net-snmp/pdu_api.h
+./table_tdata.lo: ../../include/net-snmp/library/asn1.h
 ./table_tdata.lo: ../../include/net-snmp/session_api.h
+./table_tdata.lo: ../../include/net-snmp/library/callback.h
 ./table_tdata.lo: ../../include/net-snmp/library/snmp_transport.h
 ./table_tdata.lo: ../../include/net-snmp/library/snmp_service.h
 ./table_tdata.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -2496,11 +2529,31 @@
 ./table_tdata.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./table_tdata.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./table_tdata.lo: ../../include/net-snmp/library/ucd_compat.h
-./table_tdata.lo: ../../include/net-snmp/pdu_api.h
-./table_tdata.lo: ../../include/net-snmp/mib_api.h
 ./table_tdata.lo: ../../include/net-snmp/library/mib.h
+./table_tdata.lo: ../../include/net-snmp/mib_api.h
 ./table_tdata.lo: ../../include/net-snmp/library/parse.h
-./table_tdata.lo: ../../include/net-snmp/varbind_api.h
+./table_tdata.lo: ../../include/net-snmp/library/oid_stash.h
+./table_tdata.lo: ../../include/net-snmp/library/snmp_impl.h
+./table_tdata.lo: ../../include/net-snmp/library/snmp.h
+./table_tdata.lo: ../../include/net-snmp/library/snmp-tc.h
+./table_tdata.lo: ../../include/net-snmp/library/getopt.h
+./table_tdata.lo: ../../include/net-snmp/utilities.h
+./table_tdata.lo: ../../include/net-snmp/library/system.h
+./table_tdata.lo: ../../include/net-snmp/library/tools.h
+./table_tdata.lo: ../../include/net-snmp/library/int64.h
+./table_tdata.lo: ../../include/net-snmp/library/mt_support.h
+./table_tdata.lo: ../../include/net-snmp/library/snmp_alarm.h
+./table_tdata.lo: ../../include/net-snmp/library/data_list.h
+./table_tdata.lo: ../../include/net-snmp/library/check_varbind.h
+./table_tdata.lo: ../../include/net-snmp/library/container.h
+./table_tdata.lo: ../../include/net-snmp/library/factory.h
+./table_tdata.lo: ../../include/net-snmp/library/snmp_logging.h
+./table_tdata.lo: ../../include/net-snmp/library/container_binary_array.h
+./table_tdata.lo: ../../include/net-snmp/library/container_list_ssll.h
+./table_tdata.lo: ../../include/net-snmp/library/container_iterator.h
+./table_tdata.lo: ../../include/net-snmp/library/container.h
+./table_tdata.lo: ../../include/net-snmp/library/snmp_assert.h
+./table_tdata.lo: ../../include/net-snmp/version.h
 ./table_tdata.lo: ../../include/net-snmp/config_api.h
 ./table_tdata.lo: ../../include/net-snmp/library/read_config.h
 ./table_tdata.lo: ../../include/net-snmp/library/default_store.h
@@ -2562,32 +2615,14 @@
 ./watcher.lo: ../../include/net-snmp/net-snmp-includes.h
 ./watcher.lo: ../../include/net-snmp/definitions.h
 ./watcher.lo: ../../include/net-snmp/types.h
+./watcher.lo: ../../include/net-snmp/library/types.h
 ./watcher.lo: ../../include/net-snmp/library/snmp_api.h
-./watcher.lo: ../../include/net-snmp/library/asn1.h
-./watcher.lo: ../../include/net-snmp/library/snmp_impl.h
-./watcher.lo: ../../include/net-snmp/library/snmp.h
-./watcher.lo: ../../include/net-snmp/library/snmp-tc.h
-./watcher.lo: ../../include/net-snmp/utilities.h
+./watcher.lo: ../../include/net-snmp/varbind_api.h
 ./watcher.lo: ../../include/net-snmp/library/snmp_client.h
-./watcher.lo: ../../include/net-snmp/library/system.h
-./watcher.lo: ../../include/net-snmp/library/tools.h
-./watcher.lo: ../../include/net-snmp/library/int64.h
-./watcher.lo: ../../include/net-snmp/library/mt_support.h
-./watcher.lo: ../../include/net-snmp/library/snmp_alarm.h
-./watcher.lo: ../../include/net-snmp/library/callback.h
-./watcher.lo: ../../include/net-snmp/library/data_list.h
-./watcher.lo: ../../include/net-snmp/library/oid_stash.h
-./watcher.lo: ../../include/net-snmp/library/check_varbind.h
-./watcher.lo: ../../include/net-snmp/library/container.h
-./watcher.lo: ../../include/net-snmp/library/factory.h
-./watcher.lo: ../../include/net-snmp/library/snmp_logging.h
-./watcher.lo: ../../include/net-snmp/library/container_binary_array.h
-./watcher.lo: ../../include/net-snmp/library/container_list_ssll.h
-./watcher.lo: ../../include/net-snmp/library/container_iterator.h
-./watcher.lo: ../../include/net-snmp/library/container.h
-./watcher.lo: ../../include/net-snmp/library/snmp_assert.h
-./watcher.lo: ../../include/net-snmp/version.h
+./watcher.lo: ../../include/net-snmp/pdu_api.h
+./watcher.lo: ../../include/net-snmp/library/asn1.h
 ./watcher.lo: ../../include/net-snmp/session_api.h
+./watcher.lo: ../../include/net-snmp/library/callback.h
 ./watcher.lo: ../../include/net-snmp/library/snmp_transport.h
 ./watcher.lo: ../../include/net-snmp/library/snmp_service.h
 ./watcher.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -2598,11 +2633,31 @@
 ./watcher.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./watcher.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./watcher.lo: ../../include/net-snmp/library/ucd_compat.h
-./watcher.lo: ../../include/net-snmp/pdu_api.h
-./watcher.lo: ../../include/net-snmp/mib_api.h
 ./watcher.lo: ../../include/net-snmp/library/mib.h
+./watcher.lo: ../../include/net-snmp/mib_api.h
 ./watcher.lo: ../../include/net-snmp/library/parse.h
-./watcher.lo: ../../include/net-snmp/varbind_api.h
+./watcher.lo: ../../include/net-snmp/library/oid_stash.h
+./watcher.lo: ../../include/net-snmp/library/snmp_impl.h
+./watcher.lo: ../../include/net-snmp/library/snmp.h
+./watcher.lo: ../../include/net-snmp/library/snmp-tc.h
+./watcher.lo: ../../include/net-snmp/library/getopt.h
+./watcher.lo: ../../include/net-snmp/utilities.h
+./watcher.lo: ../../include/net-snmp/library/system.h
+./watcher.lo: ../../include/net-snmp/library/tools.h
+./watcher.lo: ../../include/net-snmp/library/int64.h
+./watcher.lo: ../../include/net-snmp/library/mt_support.h
+./watcher.lo: ../../include/net-snmp/library/snmp_alarm.h
+./watcher.lo: ../../include/net-snmp/library/data_list.h
+./watcher.lo: ../../include/net-snmp/library/check_varbind.h
+./watcher.lo: ../../include/net-snmp/library/container.h
+./watcher.lo: ../../include/net-snmp/library/factory.h
+./watcher.lo: ../../include/net-snmp/library/snmp_logging.h
+./watcher.lo: ../../include/net-snmp/library/container_binary_array.h
+./watcher.lo: ../../include/net-snmp/library/container_list_ssll.h
+./watcher.lo: ../../include/net-snmp/library/container_iterator.h
+./watcher.lo: ../../include/net-snmp/library/container.h
+./watcher.lo: ../../include/net-snmp/library/snmp_assert.h
+./watcher.lo: ../../include/net-snmp/version.h
 ./watcher.lo: ../../include/net-snmp/config_api.h
 ./watcher.lo: ../../include/net-snmp/library/read_config.h
 ./watcher.lo: ../../include/net-snmp/library/default_store.h
diff --git a/agent/helpers/Makefile.in b/agent/helpers/Makefile.in
index b83af89..c6b732f 100644
--- a/agent/helpers/Makefile.in
+++ b/agent/helpers/Makefile.in
@@ -31,13 +31,13 @@
         serialize.h \
 	stash_cache.h \
 	stash_to_next.h \
-        table.h \
 	table_array.h \
 	table_container.h \
+        table.h \
         table_data.h \
         table_dataset.h \
-        table_iterator.h \
         table_tdata.h \
+        table_iterator.h \
 	watcher.h
 
 # No header 'table_row.h'
diff --git a/agent/helpers/all_helpers.c b/agent/helpers/all_helpers.c
index 02bc8af..1ed108a 100644
--- a/agent/helpers/all_helpers.c
+++ b/agent/helpers/all_helpers.c
@@ -5,15 +5,6 @@
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 
-#ifdef STILL_TO_DO
-        /*
-         * It ought to be possible to just #include these files,
-         *   but they rely on various other types being defined first.
-         *
-         * I really can't face tracking down the dependency chain
-         *   just at the moment.
-         * So we'll just have to live with the warnings....
-         */
 #include <net-snmp/agent/debug_handler.h>
 #include <net-snmp/agent/serialize.h>
 #include <net-snmp/agent/read_only.h>
@@ -21,16 +12,6 @@
 #include <net-snmp/agent/table_dataset.h>
 #include <net-snmp/agent/stash_cache.h>
 
-#else
-
-void  netsnmp_init_debug_helper(void);
-void  netsnmp_init_serialize(void);
-void  netsnmp_init_read_only_helper(void);
-void  netsnmp_init_bulk_to_next_helper(void);
-void  netsnmp_init_table_dataset(void);
-void  netsnmp_init_stash_cache_helper(void);
-#endif
-
 /** call the initialization sequence for all handlers with init_ routines. */
 void
 netsnmp_init_helpers(void)
diff --git a/agent/helpers/bulk_to_next.c b/agent/helpers/bulk_to_next.c
index 4dd1914..e607eda 100644
--- a/agent/helpers/bulk_to_next.c
+++ b/agent/helpers/bulk_to_next.c
@@ -1,11 +1,5 @@
 #include <net-snmp/net-snmp-config.h>
 
-#if HAVE_STRING_H
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 
diff --git a/agent/helpers/cache_handler.c b/agent/helpers/cache_handler.c
index 520d463..bfd6e0a 100644
--- a/agent/helpers/cache_handler.c
+++ b/agent/helpers/cache_handler.c
@@ -1,16 +1,26 @@
+/* Portions of this file are subject to the following copyright(s).  See
+ * the Net-SNMP's COPYING file for more details and other copyrights
+ * that may apply:
+ */
+/*
+ * Portions of this file are copyrighted by:
+ * Copyright (C) 2007 Apple, Inc. All rights reserved.
+ * Use is subject to license terms specified in the COPYING file
+ * distributed with the Net-SNMP package.
+ */
 #include <net-snmp/net-snmp-config.h>
 
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+#include <net-snmp/agent/cache_handler.h>
+
 #if HAVE_STRING_H
 #include <string.h>
 #else
 #include <strings.h>
 #endif
 
-#include <net-snmp/net-snmp-includes.h>
-#include <net-snmp/agent/net-snmp-agent-includes.h>
-
-#include <net-snmp/agent/cache_handler.h>
-
 static netsnmp_cache  *cache_head = NULL;
 static int             cache_outstanding_valid = 0;
 static int             _cache_load( netsnmp_cache *cache );
@@ -117,7 +127,7 @@
 /** find existing cache
  */
 netsnmp_cache *
-netsnmp_cache_find_by_oid(oid * rootoid, int rootoid_len)
+netsnmp_cache_find_by_oid(const oid * rootoid, int rootoid_len)
 {
     netsnmp_cache  *cache;
 
@@ -135,7 +145,7 @@
 netsnmp_cache *
 netsnmp_cache_create(int timeout, NetsnmpCacheLoad * load_hook,
                      NetsnmpCacheFree * free_hook,
-                     oid * rootoid, int rootoid_len)
+                     const oid * rootoid, int rootoid_len)
 {
     netsnmp_cache  *cache = NULL;
 
@@ -173,6 +183,40 @@
     return cache;
 }
 
+/** frees a cache
+ */
+int
+netsnmp_cache_free(netsnmp_cache *cache)
+{
+    netsnmp_cache  *pos;
+
+    if (NULL == cache)
+        return SNMPERR_SUCCESS;
+
+    for (pos = cache_head; pos; pos = pos->next) {
+        if (pos == cache) {
+            size_t          out_len = 0;
+            size_t          buf_len = 0;
+            char           *buf = NULL;
+
+            sprint_realloc_objid((u_char **) &buf, &buf_len, &out_len,
+                                 1, pos->rootoid, pos->rootoid_len);
+            snmp_log(LOG_WARNING,
+		     "not freeing cache with root OID %s (still in list)\n",
+		     buf);
+            free(buf);
+            return SNMP_ERR_GENERR;
+        }
+    }
+
+    if (cache->rootoid)
+        free(cache->rootoid);
+
+    free(cache);
+
+    return SNMPERR_SUCCESS;
+}
+
 /** callback function to call cache load function */
 static void
 _timer_reload(unsigned int regNo, void *clientargs)
@@ -217,7 +261,7 @@
 
     cache->flags &= ~NETSNMP_CACHE_AUTO_RELOAD;
     DEBUGMSGT(("cache_timer:start",
-               "starting timer %d for cache %p\n", cache->timer_id, cache));
+               "starting timer %lu for cache %p\n", cache->timer_id, cache));
     return cache->timer_id;
 }
 
@@ -234,7 +278,7 @@
     }
 
     DEBUGMSGT(("cache_timer:stop",
-               "stopping timer %d for cache %p\n", cache->timer_id, cache));
+               "stopping timer %lu for cache %p\n", cache->timer_id, cache));
 
     snmp_alarm_unregister(cache->timer_id);
     cache->flags |= NETSNMP_CACHE_AUTO_RELOAD;
@@ -275,7 +319,7 @@
 netsnmp_mib_handler *
 netsnmp_get_cache_handler(int timeout, NetsnmpCacheLoad * load_hook,
                           NetsnmpCacheFree * free_hook,
-                          oid * rootoid, int rootoid_len)
+                          const oid * rootoid, int rootoid_len)
 {
     netsnmp_mib_handler *ret = NULL;
     netsnmp_cache  *cache = NULL;
@@ -463,7 +507,7 @@
     case MODE_GET:
     case MODE_GETNEXT:
     case MODE_GETBULK:
-    case MODE_SET_RESERVE1: {
+    case MODE_SET_RESERVE1:
 
         /*
          * only touch cache once per pdu request, to prevent a cache
@@ -474,7 +518,7 @@
          * maybe use a reference counter?
          */
         if (netsnmp_cache_is_valid(reqinfo, addrstr))
-            return SNMP_ERR_NOERROR;
+            break;
 
         /*
          * call the load hook, and update the cache timestamp.
@@ -483,8 +527,7 @@
         netsnmp_cache_check_and_reload(cache);
         netsnmp_cache_reqinfo_insert(cache, reqinfo, addrstr);
         /** next handler called automatically - 'AUTO_NEXT' */
-        }
-        return SNMP_ERR_NOERROR;
+        break;
 
     case MODE_SET_RESERVE2:
     case MODE_SET_FREE:
@@ -492,7 +535,7 @@
     case MODE_SET_UNDO:
         netsnmp_assert(netsnmp_cache_is_valid(reqinfo, addrstr));
         /** next handler called automatically - 'AUTO_NEXT' */
-        return SNMP_ERR_NOERROR;
+        break;
 
         /*
          * A (successful) SET request wouldn't typically trigger a reload of
@@ -506,7 +549,7 @@
             cache->valid = 0;
         }
         /** next handler called automatically - 'AUTO_NEXT' */
-        return SNMP_ERR_NOERROR;
+        break;
 
     default:
         snmp_log(LOG_WARNING, "cache_handler: Unrecognised mode (%d)\n",
@@ -514,8 +557,7 @@
         netsnmp_request_set_error_all(requests, SNMP_ERR_GENERR);
         return SNMP_ERR_GENERR;
     }
-    netsnmp_request_set_error_all(requests, SNMP_ERR_GENERR);
-    return SNMP_ERR_GENERR;     /* should never get here */
+    return SNMP_ERR_NOERROR;
 }
 
 static void
diff --git a/agent/helpers/debug_handler.c b/agent/helpers/debug_handler.c
index 4e35695..832ad2d 100644
--- a/agent/helpers/debug_handler.c
+++ b/agent/helpers/debug_handler.c
@@ -9,13 +9,6 @@
  * distributed with the Net-SNMP package.
  */
 #include <net-snmp/net-snmp-config.h>
-
-#if HAVE_STRING_H
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 
@@ -124,7 +117,7 @@
     for (hptr = reginfo->handler; hptr; hptr = hptr->next) {
         DEBUGMSG(("helper:debug", " -> %s", hptr->handler_name));
         if (hptr->myvoid)
-            DEBUGMSG(("helper:debug", " [myvoid = %x]", hptr->myvoid));
+            DEBUGMSG(("helper:debug", " [myvoid = %p]", hptr->myvoid));
     }
     DEBUGMSG(("helper:debug", "\n"));
 
diff --git a/agent/helpers/instance.c b/agent/helpers/instance.c
index 5c9e16d..9ebdb87 100644
--- a/agent/helpers/instance.c
+++ b/agent/helpers/instance.c
@@ -10,6 +10,11 @@
  */
 #include <net-snmp/net-snmp-config.h>
 
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+#include <net-snmp/agent/instance.h>
+
 #include <stdlib.h>
 #if HAVE_STRING_H
 #include <string.h>
@@ -17,10 +22,6 @@
 #include <strings.h>
 #endif
 
-#include <net-snmp/net-snmp-includes.h>
-#include <net-snmp/agent/net-snmp-agent-includes.h>
-
-#include <net-snmp/agent/instance.h>
 #include <net-snmp/agent/serialize.h>
 #include <net-snmp/agent/read_only.h>
 
@@ -108,7 +109,7 @@
 netsnmp_handler_registration *
 get_reg(const char *name,
         const char *ourname,
-        oid * reg_oid, size_t reg_oid_len,
+        const oid * reg_oid, size_t reg_oid_len,
         void *it,
         int modes,
         Netsnmp_Node_Handler * scalarh, Netsnmp_Node_Handler * subhandler,
@@ -142,115 +143,114 @@
 /* Watched 'long' instances are writable on both 32-bit and 64-bit systems  */
 int
 netsnmp_register_read_only_ulong_instance(const char *name,
-                                          oid * reg_oid,
+                                          const oid * reg_oid,
                                           size_t reg_oid_len, u_long * it,
                                           Netsnmp_Node_Handler *
                                           subhandler)
 {
-    netsnmp_handler_registration *myreg;
-
-    myreg = get_reg(name, "ulong_handler", reg_oid, reg_oid_len, it,
-                    HANDLER_CAN_RONLY, netsnmp_instance_ulong_handler,
-                    subhandler, NULL);
-    return netsnmp_register_read_only_instance(myreg);
+    return netsnmp_register_watched_instance(
+               netsnmp_create_handler_registration(
+                   name, subhandler, reg_oid, reg_oid_len, HANDLER_CAN_RONLY),
+               netsnmp_create_watcher_info(
+                   (void *)it, sizeof(u_long),
+                   ASN_UNSIGNED, WATCHER_FIXED_SIZE));
 }
 
 int
 netsnmp_register_ulong_instance(const char *name,
-                                oid * reg_oid, size_t reg_oid_len,
+                                const oid * reg_oid, size_t reg_oid_len,
                                 u_long * it,
                                 Netsnmp_Node_Handler * subhandler)
 {
-    netsnmp_handler_registration *myreg;
-
-    myreg = get_reg(name, "ulong_handler", reg_oid, reg_oid_len, it,
-                    HANDLER_CAN_RWRITE, netsnmp_instance_ulong_handler,
-                    subhandler, NULL);
-    return netsnmp_register_instance(myreg);
+    return netsnmp_register_watched_instance(
+               netsnmp_create_handler_registration(
+                   name, subhandler, reg_oid, reg_oid_len, HANDLER_CAN_RWRITE),
+               netsnmp_create_watcher_info(
+                   (void *)it, sizeof(u_long),
+                   ASN_UNSIGNED, WATCHER_FIXED_SIZE));
 }
 
 int
 netsnmp_register_read_only_counter32_instance(const char *name,
-                                              oid * reg_oid,
+                                              const oid * reg_oid,
                                               size_t reg_oid_len,
                                               u_long * it,
                                               Netsnmp_Node_Handler *
                                               subhandler)
 {
-    netsnmp_handler_registration *myreg;
-
-    myreg = get_reg(name, "counter32_handler", reg_oid, reg_oid_len, it,
-                    HANDLER_CAN_RONLY, netsnmp_instance_counter32_handler,
-                    subhandler, NULL);
-    return netsnmp_register_read_only_instance(myreg);
+    return netsnmp_register_watched_instance(
+               netsnmp_create_handler_registration(
+                   name, subhandler, reg_oid, reg_oid_len, HANDLER_CAN_RONLY),
+               netsnmp_create_watcher_info(
+                   (void *)it, sizeof(u_long),
+                   ASN_COUNTER, WATCHER_FIXED_SIZE));
 }
 
 int
 netsnmp_register_read_only_long_instance(const char *name,
-                                         oid * reg_oid, size_t reg_oid_len,
+                                         const oid * reg_oid,
+                                         size_t reg_oid_len,
                                          long *it,
                                          Netsnmp_Node_Handler * subhandler)
 {
-    netsnmp_handler_registration *myreg;
-
-    myreg = get_reg(name, "long_handler", reg_oid, reg_oid_len, it,
-                    HANDLER_CAN_RONLY, netsnmp_instance_long_handler,
-                    subhandler, NULL);
-    return netsnmp_register_read_only_instance(myreg);
+    return netsnmp_register_watched_instance(
+               netsnmp_create_handler_registration(
+                   name, subhandler, reg_oid, reg_oid_len, HANDLER_CAN_RONLY),
+               netsnmp_create_watcher_info(
+                   (void *)it, sizeof(long), ASN_INTEGER, WATCHER_FIXED_SIZE));
 }
 
 int
 netsnmp_register_long_instance(const char *name,
-                               oid * reg_oid, size_t reg_oid_len,
+                               const oid * reg_oid, size_t reg_oid_len,
                                long *it, Netsnmp_Node_Handler * subhandler)
 {
-    netsnmp_handler_registration *myreg;
-
-    myreg = get_reg(name, "long_handler", reg_oid, reg_oid_len, it,
-                    HANDLER_CAN_RWRITE, netsnmp_instance_long_handler,
-                    subhandler, NULL);
-    return netsnmp_register_instance(myreg);
+    return netsnmp_register_watched_instance(
+               netsnmp_create_handler_registration(
+                   name, subhandler, reg_oid, reg_oid_len, HANDLER_CAN_RWRITE),
+               netsnmp_create_watcher_info(
+                   (void *)it, sizeof(long), ASN_INTEGER, WATCHER_FIXED_SIZE));
 }
 
 /* Watched 'int' instances are only writable on 32-bit systems  */
 int
 netsnmp_register_read_only_uint_instance(const char *name,
-                                         oid * reg_oid, size_t reg_oid_len,
+                                         const oid * reg_oid,
+                                         size_t reg_oid_len,
                                          unsigned int *it,
                                          Netsnmp_Node_Handler * subhandler)
 {
-    netsnmp_handler_registration *myreg;
-
-    myreg = get_reg(name, "uint_handler", reg_oid, reg_oid_len, it,
-                    HANDLER_CAN_RONLY, netsnmp_instance_uint_handler,
-                    subhandler, NULL);
-    return netsnmp_register_read_only_instance(myreg);
+    return netsnmp_register_watched_instance(
+               netsnmp_create_handler_registration(
+                   name, subhandler, reg_oid, reg_oid_len, HANDLER_CAN_RONLY),
+               netsnmp_create_watcher_info(
+                   (void *)it, sizeof(unsigned int),
+                   ASN_UNSIGNED, WATCHER_FIXED_SIZE));
 }
 
 int
 netsnmp_register_uint_instance(const char *name,
-                               oid * reg_oid, size_t reg_oid_len,
+                               const oid * reg_oid, size_t reg_oid_len,
                                unsigned int *it, Netsnmp_Node_Handler * subhandler)
 {
-    netsnmp_handler_registration *myreg;
-
-    myreg = get_reg(name, "uint_handler", reg_oid, reg_oid_len, it,
-                    HANDLER_CAN_RWRITE, netsnmp_instance_uint_handler,
-                    subhandler, NULL);
-    return netsnmp_register_instance(myreg);
+    return netsnmp_register_watched_instance(
+               netsnmp_create_handler_registration(
+                   name, subhandler, reg_oid, reg_oid_len, HANDLER_CAN_RWRITE),
+               netsnmp_create_watcher_info(
+                   (void *)it, sizeof(unsigned int),
+                   ASN_UNSIGNED, WATCHER_FIXED_SIZE));
 }
 
 int
 netsnmp_register_read_only_int_instance(const char *name,
-                                oid * reg_oid, size_t reg_oid_len,
+                                const oid * reg_oid, size_t reg_oid_len,
                                 int *it, Netsnmp_Node_Handler * subhandler)
 {
-    netsnmp_handler_registration *myreg;
-
-    myreg = get_reg(name, "int_handler", reg_oid, reg_oid_len, it,
-                    HANDLER_CAN_RONLY, netsnmp_instance_int_handler,
-                    subhandler, NULL);
-    return netsnmp_register_read_only_instance(myreg);
+    return netsnmp_register_watched_instance(
+               netsnmp_create_handler_registration(
+                   name, subhandler, reg_oid, reg_oid_len, HANDLER_CAN_RONLY),
+               netsnmp_create_watcher_info(
+                   (void *)it, sizeof(int), ASN_INTEGER, WATCHER_FIXED_SIZE));
 }
 
   /*
@@ -258,7 +258,7 @@
    */
 int
 register_read_only_int_instance(const char *name,
-                                oid * reg_oid, size_t reg_oid_len,
+                                const oid * reg_oid, size_t reg_oid_len,
                                 int *it, Netsnmp_Node_Handler * subhandler)
 {
   return netsnmp_register_read_only_int_instance(name,
@@ -272,115 +272,129 @@
 
 int
 netsnmp_register_read_only_ulong_instance_context(const char *name,
-                                                  oid * reg_oid,
+                                                  const oid * reg_oid,
                                                   size_t reg_oid_len,
                                                   u_long * it,
                                                   Netsnmp_Node_Handler *
                                                   subhandler,
                                                   const char *contextName)
 {
-    netsnmp_handler_registration *myreg;
-
-    myreg = get_reg(name, "ulong_handler", reg_oid, reg_oid_len, it,
-                    HANDLER_CAN_RONLY, netsnmp_instance_ulong_handler,
-                    subhandler, contextName);
-    return netsnmp_register_read_only_instance(myreg);
+    netsnmp_handler_registration *myreg =
+      netsnmp_create_handler_registration(
+          name, subhandler, reg_oid, reg_oid_len, HANDLER_CAN_RONLY);
+    if (myreg && contextName)
+      myreg->contextName = strdup(contextName);
+    return netsnmp_register_watched_instance(
+        myreg, netsnmp_create_watcher_info(
+            (void *)it, sizeof(u_long), ASN_UNSIGNED, WATCHER_FIXED_SIZE));
 }
 
 int
 netsnmp_register_ulong_instance_context(const char *name,
-                                        oid * reg_oid, size_t reg_oid_len,
+                                        const oid * reg_oid, size_t reg_oid_len,
                                         u_long * it,
                                         Netsnmp_Node_Handler * subhandler,
                                         const char *contextName)
 {
-    netsnmp_handler_registration *myreg;
-
-    myreg = get_reg(name, "ulong_handler", reg_oid, reg_oid_len, it,
-                    HANDLER_CAN_RWRITE, netsnmp_instance_ulong_handler,
-                    subhandler, contextName);
-    return netsnmp_register_instance(myreg);
+    netsnmp_handler_registration *myreg =
+      netsnmp_create_handler_registration(
+          name, subhandler, reg_oid, reg_oid_len, HANDLER_CAN_RWRITE);
+    if (myreg && contextName)
+      myreg->contextName = strdup(contextName);
+    return netsnmp_register_watched_instance(
+        myreg, netsnmp_create_watcher_info(
+            (void *)it, sizeof(u_long), ASN_UNSIGNED, WATCHER_FIXED_SIZE));
 }
 
 int
 netsnmp_register_read_only_counter32_instance_context(const char *name,
-                                                      oid * reg_oid,
+                                                      const oid * reg_oid,
                                                       size_t reg_oid_len,
                                                       u_long * it,
                                                       Netsnmp_Node_Handler *
                                                       subhandler,
                                                       const char *contextName)
 {
-    netsnmp_handler_registration *myreg;
-
-    myreg = get_reg(name, "counter32_handler", reg_oid, reg_oid_len, it,
-                    HANDLER_CAN_RONLY, netsnmp_instance_counter32_handler,
-                    subhandler, contextName);
-    return netsnmp_register_read_only_instance(myreg);
+    netsnmp_handler_registration *myreg =
+      netsnmp_create_handler_registration(
+          name, subhandler, reg_oid, reg_oid_len, HANDLER_CAN_RONLY);
+    if (myreg && contextName)
+      myreg->contextName = strdup(contextName);
+    return netsnmp_register_watched_instance(
+        myreg, netsnmp_create_watcher_info(
+            (void *)it, sizeof(u_long), ASN_COUNTER, WATCHER_FIXED_SIZE));
 }
 
 int
 netsnmp_register_read_only_long_instance_context(const char *name,
-                                                 oid * reg_oid,
+                                                 const oid * reg_oid,
                                                  size_t reg_oid_len,
                                                  long *it,
                                                  Netsnmp_Node_Handler
                                                  *subhandler,
                                                  const char *contextName)
 {
-    netsnmp_handler_registration *myreg;
-
-    myreg = get_reg(name, "long_handler", reg_oid, reg_oid_len, it,
-                    HANDLER_CAN_RONLY, netsnmp_instance_long_handler,
-                    subhandler, contextName);
-    return netsnmp_register_read_only_instance(myreg);
+    netsnmp_handler_registration *myreg =
+      netsnmp_create_handler_registration(
+          name, subhandler, reg_oid, reg_oid_len, HANDLER_CAN_RONLY);
+    if (myreg && contextName)
+      myreg->contextName = strdup(contextName);
+    return netsnmp_register_watched_instance(
+        myreg, netsnmp_create_watcher_info(
+            (void *)it, sizeof(long), ASN_INTEGER, WATCHER_FIXED_SIZE));
 }
 
 int
 netsnmp_register_long_instance_context(const char *name,
-                                       oid * reg_oid, size_t reg_oid_len,
+                                       const oid * reg_oid, size_t reg_oid_len,
                                        long *it,
                                        Netsnmp_Node_Handler * subhandler,
                                        const char *contextName)
 {
-    netsnmp_handler_registration *myreg;
-
-    myreg = get_reg(name, "long_handler", reg_oid, reg_oid_len, it,
-                    HANDLER_CAN_RWRITE, netsnmp_instance_long_handler,
-                    subhandler, contextName);
-    return netsnmp_register_instance(myreg);
+    netsnmp_handler_registration *myreg =
+      netsnmp_create_handler_registration(
+          name, subhandler, reg_oid, reg_oid_len, HANDLER_CAN_RWRITE);
+    if (myreg && contextName)
+      myreg->contextName = strdup(contextName);
+    return netsnmp_register_watched_instance(
+        myreg, netsnmp_create_watcher_info(
+            (void *)it, sizeof(long), ASN_INTEGER, WATCHER_FIXED_SIZE));
 }
 
 int
 netsnmp_register_int_instance_context(const char *name,
-                                      oid * reg_oid,
+                                      const oid * reg_oid,
                                       size_t reg_oid_len,
                                       int *it,
                                       Netsnmp_Node_Handler * subhandler,
                                       const char *contextName)
 {
-    netsnmp_handler_registration *myreg;
-
-    myreg = get_reg(name, "int_handler", reg_oid, reg_oid_len, it,
-                    HANDLER_CAN_RWRITE, netsnmp_instance_int_handler,
-                    subhandler, contextName);
-    return netsnmp_register_instance(myreg);
+    netsnmp_handler_registration *myreg =
+      netsnmp_create_handler_registration(
+          name, subhandler, reg_oid, reg_oid_len, HANDLER_CAN_RWRITE);
+    if (myreg && contextName)
+      myreg->contextName = strdup(contextName);
+    return netsnmp_register_watched_instance(
+        myreg, netsnmp_create_watcher_info(
+            (void *)it, sizeof(int), ASN_INTEGER, WATCHER_FIXED_SIZE));
 }
 
 int
 netsnmp_register_read_only_int_instance_context(const char *name,
-                                                oid * reg_oid,
+                                                const oid * reg_oid,
                                                 size_t reg_oid_len,
                                                 int *it,
                                                 Netsnmp_Node_Handler * subhandler,
                                                 const char *contextName)
 {
-    netsnmp_handler_registration *myreg;
-
-    myreg = get_reg(name, "int_handler", reg_oid, reg_oid_len, it,
-                    HANDLER_CAN_RONLY, netsnmp_instance_int_handler,
-                    subhandler, contextName);
-    return netsnmp_register_read_only_instance(myreg);
+    netsnmp_handler_registration *myreg =
+      netsnmp_create_handler_registration(
+          name, subhandler, reg_oid, reg_oid_len, HANDLER_CAN_RONLY);
+    if (myreg && contextName)
+      myreg->contextName = strdup(contextName);
+    return netsnmp_register_watched_instance(
+        myreg, netsnmp_create_watcher_info(
+            (void *)it, sizeof(int), ASN_INTEGER, WATCHER_FIXED_SIZE));
 }
 
 /*
@@ -388,7 +402,7 @@
  */
 int
 register_read_only_int_instance_context(const char *name,
-                                        oid * reg_oid, size_t reg_oid_len,
+                                        const oid * reg_oid, size_t reg_oid_len,
                                         int *it,
                                         Netsnmp_Node_Handler * subhandler,
                                         const char *contextName)
@@ -459,17 +473,21 @@
  */
 int
 netsnmp_register_int_instance(const char *name,
-                              oid * reg_oid, size_t reg_oid_len,
+                              const oid * reg_oid, size_t reg_oid_len,
                               int *it, Netsnmp_Node_Handler * subhandler)
 {
-    netsnmp_handler_registration *myreg;
-
-    myreg = get_reg(name, "int_handler", reg_oid, reg_oid_len, it,
-                    HANDLER_CAN_RWRITE, netsnmp_instance_int_handler,
-                    subhandler, NULL);
-    return netsnmp_register_instance(myreg);
+    return netsnmp_register_watched_instance(
+               netsnmp_create_handler_registration(
+                   name, subhandler, reg_oid, reg_oid_len, HANDLER_CAN_RWRITE),
+               netsnmp_create_watcher_info(
+                   (void *)it, sizeof(int), ASN_INTEGER, WATCHER_FIXED_SIZE));
 }
 
+#ifndef NETSNMP_NO_DEPRECATED_FUNCTIONS
+
+/**
+ * \deprecated This function is unused and scheduled for removal in Net-SNMP 5.6
+ */
 int
 netsnmp_instance_ulong_handler(netsnmp_mib_handler *handler,
                                netsnmp_handler_registration *reginfo,
@@ -547,6 +565,9 @@
     return SNMP_ERR_NOERROR;
 }
 
+/**
+ * \deprecated This function is unused and scheduled for removal in Net-SNMP 5.6
+ */
 int
 netsnmp_instance_counter32_handler(netsnmp_mib_handler *handler,
                                    netsnmp_handler_registration *reginfo,
@@ -583,6 +604,9 @@
     return SNMP_ERR_NOERROR;
 }
 
+/**
+ * \deprecated This function is unused and scheduled for removal in Net-SNMP 5.6
+ */
 int
 netsnmp_instance_long_handler(netsnmp_mib_handler *handler,
                               netsnmp_handler_registration *reginfo,
@@ -658,6 +682,9 @@
     return SNMP_ERR_NOERROR;
 }
 
+/**
+ * \deprecated This function is unused and scheduled for removal in Net-SNMP 5.6
+ */
 int
 netsnmp_instance_int_handler(netsnmp_mib_handler *handler,
                              netsnmp_handler_registration *reginfo,
@@ -738,6 +765,8 @@
     return SNMP_ERR_NOERROR;
 }
 
+#endif /* NETSNMP_NO_DEPRECATED_FUNCTIONS */
+
 int
 netsnmp_instance_num_file_handler(netsnmp_mib_handler *handler,
                                   netsnmp_handler_registration *reginfo,
@@ -867,6 +896,11 @@
     return SNMP_ERR_NOERROR;
 }
 
+#ifndef NETSNMP_NO_DEPRECATED_FUNCTIONS
+
+/**
+ * \deprecated This function is unused and scheduled for removal in Net-SNMP 5.6
+ */
 int
 netsnmp_instance_uint_handler(netsnmp_mib_handler *handler,
                               netsnmp_handler_registration *reginfo,
@@ -947,6 +981,8 @@
     return SNMP_ERR_NOERROR;
 }
 
+#endif /* NETSNMP_NO_DEPRECATED_FUNCTIONS */
+
 int
 netsnmp_instance_helper_handler(netsnmp_mib_handler *handler,
                                 netsnmp_handler_registration *reginfo,
diff --git a/agent/helpers/null.c b/agent/helpers/null.c
index d110eb8..97dfc92 100644
--- a/agent/helpers/null.c
+++ b/agent/helpers/null.c
@@ -1,16 +1,16 @@
 #include <net-snmp/net-snmp-config.h>
 
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+#include <net-snmp/agent/null.h>
+
 #if HAVE_STRING_H
 #include <string.h>
 #else
 #include <strings.h>
 #endif
 
-#include <net-snmp/net-snmp-includes.h>
-#include <net-snmp/agent/net-snmp-agent-includes.h>
-
-#include <net-snmp/agent/null.h>
-
 int
 netsnmp_register_null(oid * loc, size_t loc_len)
 {
@@ -23,14 +23,16 @@
 {
     netsnmp_handler_registration *reginfo;
     reginfo = SNMP_MALLOC_TYPEDEF(netsnmp_handler_registration);
-    reginfo->handlerName = strdup("");
-    reginfo->rootoid = loc;
-    reginfo->rootoid_len = loc_len;
-    reginfo->handler =
-        netsnmp_create_handler("null", netsnmp_null_handler);
-    if (contextName)
-        reginfo->contextName = strdup(contextName);
-    reginfo->modes = HANDLER_CAN_DEFAULT;
+    if (reginfo != NULL) {
+        reginfo->handlerName = strdup("");
+        reginfo->rootoid = loc;
+        reginfo->rootoid_len = loc_len;
+        reginfo->handler =
+            netsnmp_create_handler("null", netsnmp_null_handler);
+        if (contextName)
+            reginfo->contextName = strdup(contextName);
+        reginfo->modes = HANDLER_CAN_DEFAULT | HANDLER_CAN_GETBULK;
+    }
     return netsnmp_register_handler(reginfo);
 }
 
diff --git a/agent/helpers/old_api.c b/agent/helpers/old_api.c
index 6e36776..ec26263 100644
--- a/agent/helpers/old_api.c
+++ b/agent/helpers/old_api.c
@@ -1,15 +1,16 @@
 #include <net-snmp/net-snmp-config.h>
 
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+#include <net-snmp/agent/old_api.h>
+
 #if HAVE_STRING_H
 #include <string.h>
 #else
 #include <strings.h>
 #endif
 
-#include <net-snmp/net-snmp-includes.h>
-#include <net-snmp/agent/net-snmp-agent-includes.h>
-
-#include <net-snmp/agent/old_api.h>
 #include <net-snmp/agent/agent_callbacks.h>
 
 #define MIB_CLIENTS_ARE_EVIL 1
@@ -67,6 +68,8 @@
         struct variable *vp;
         netsnmp_handler_registration *reginfo =
             SNMP_MALLOC_TYPEDEF(netsnmp_handler_registration);
+        if (reginfo == NULL)
+            return SNMP_ERR_GENERR;
 
         vp = netsnmp_memdup((const struct variable *)
                             ((const char *) var + varsize * i),
@@ -77,6 +80,12 @@
         reginfo->rootoid_len = (mibloclen + vp->namelen);
         reginfo->rootoid =
             (oid *) malloc(reginfo->rootoid_len * sizeof(oid));
+        if (reginfo->rootoid == NULL) {
+            SNMP_FREE(vp);
+            SNMP_FREE(reginfo->handlerName);
+            SNMP_FREE(reginfo);
+            return SNMP_ERR_GENERR;
+        }
 
         memcpy(reginfo->rootoid, mibloc, mibloclen * sizeof(oid));
         memcpy(reginfo->rootoid + mibloclen, vp->name, vp->namelen
@@ -403,7 +412,7 @@
  */
 static netsnmp_agent_session *current_agent_session = NULL;
 netsnmp_agent_session *
-netsnmp_get_current_agent_session()
+netsnmp_get_current_agent_session(void)
 {
     return current_agent_session;
 }
diff --git a/agent/helpers/read_only.c b/agent/helpers/read_only.c
index 512f94b..b85cfb5 100644
--- a/agent/helpers/read_only.c
+++ b/agent/helpers/read_only.c
@@ -1,11 +1,5 @@
 #include <net-snmp/net-snmp-config.h>
 
-#if HAVE_STRING_H
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 
@@ -64,13 +58,10 @@
     case MODE_GETBULK:
         /* next handler called automatically - 'AUTO_NEXT' */
         return SNMP_ERR_NOERROR;
-
-    default:
-        netsnmp_request_set_error_all(requests, SNMP_ERR_GENERR);
-        return SNMP_ERR_GENERR;
     }
+
     netsnmp_request_set_error_all(requests, SNMP_ERR_GENERR);
-    return SNMP_ERR_GENERR;     /* should never get here */
+    return SNMP_ERR_GENERR;
 }
 
 /** initializes the read_only helper which then registers a read_only
diff --git a/agent/helpers/row_merge.c b/agent/helpers/row_merge.c
index 6b64430..9ae7ea8 100644
--- a/agent/helpers/row_merge.c
+++ b/agent/helpers/row_merge.c
@@ -1,16 +1,16 @@
 #include <net-snmp/net-snmp-config.h>
 
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+#include <net-snmp/agent/row_merge.h>
+
 #if HAVE_STRING_H
 #include <string.h>
 #else
 #include <strings.h>
 #endif
 
-#include <net-snmp/net-snmp-includes.h>
-#include <net-snmp/agent/net-snmp-agent-includes.h>
-
-#include <net-snmp/agent/row_merge.h>
-
 /** @defgroup row_merge row_merge
  *  Calls sub handlers with request for one row at a time.
  *  @ingroup utilities
diff --git a/agent/helpers/scalar.c b/agent/helpers/scalar.c
index 42c66b4..23b6bb7 100644
--- a/agent/helpers/scalar.c
+++ b/agent/helpers/scalar.c
@@ -10,6 +10,11 @@
  */
 #include <net-snmp/net-snmp-config.h>
 
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+#include <net-snmp/agent/scalar.h>
+
 #include <stdlib.h>
 #if HAVE_STRING_H
 #include <string.h>
@@ -17,10 +22,6 @@
 #include <strings.h>
 #endif
 
-#include <net-snmp/net-snmp-includes.h>
-#include <net-snmp/agent/net-snmp-agent-includes.h>
-
-#include <net-snmp/agent/scalar.h>
 #include <net-snmp/agent/instance.h>
 #include <net-snmp/agent/serialize.h>
 #include <net-snmp/agent/read_only.h>
diff --git a/agent/helpers/scalar_group.c b/agent/helpers/scalar_group.c
index a5d119e..09cee1a 100644
--- a/agent/helpers/scalar_group.c
+++ b/agent/helpers/scalar_group.c
@@ -1,5 +1,10 @@
 #include <net-snmp/net-snmp-config.h>
 
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+#include <net-snmp/agent/scalar_group.h>
+
 #include <stdlib.h>
 #if HAVE_STRING_H
 #include <string.h>
@@ -7,13 +12,8 @@
 #include <strings.h>
 #endif
 
-#include <net-snmp/net-snmp-includes.h>
-#include <net-snmp/agent/net-snmp-agent-includes.h>
-
-#include <net-snmp/agent/scalar_group.h>
-#include <net-snmp/agent/scalar.h>
+#include <net-snmp/agent/instance.h>
 #include <net-snmp/agent/serialize.h>
-#include <net-snmp/agent/read_only.h>
 
 /** @defgroup scalar_group_group scalar_group
  *  Process groups of scalars.
@@ -48,7 +48,6 @@
                               oid first, oid last)
 {
     netsnmp_inject_handler(reginfo, netsnmp_get_instance_handler());
-    netsnmp_inject_handler(reginfo, netsnmp_get_scalar_handler());
     netsnmp_inject_handler(reginfo, netsnmp_get_scalar_group_handler(first, last));
     return netsnmp_register_serialize(reginfo);
 }
@@ -128,12 +127,13 @@
                 netsnmp_set_request_error(reqinfo, requests, ret);
                 return SNMP_ERR_NOERROR;
 	    }
-            root_tmp[reginfo->rootoid_len++] = subid;
+            root_tmp[reginfo->rootoid_len] = subid;
+            reginfo->rootoid_len += 2;
             reginfo->rootoid = root_tmp;
             ret = netsnmp_call_next_handler(handler, reginfo, reqinfo,
                                             requests);
             reginfo->rootoid = root_save;
-            reginfo->rootoid_len--;
+            reginfo->rootoid_len -= 2;
             return ret;
         }
         break;
@@ -162,7 +162,8 @@
 	else if (subid > sgroup->ubound)
             return SNMP_ERR_NOERROR;
         
-        root_tmp[reginfo->rootoid_len++] = subid;
+        root_tmp[reginfo->rootoid_len] = subid;
+        reginfo->rootoid_len += 2;
         reginfo->rootoid = root_tmp;
         ret = netsnmp_call_next_handler(handler, reginfo, reqinfo,
                                             requests);
@@ -175,12 +176,12 @@
              requests->requestvb->type == SNMP_NOSUCHOBJECT ||
              requests->requestvb->type == SNMP_NOSUCHINSTANCE)) {
             snmp_set_var_objid(requests->requestvb,
-                               reginfo->rootoid, reginfo->rootoid_len);
-            requests->requestvb->name[reginfo->rootoid_len-1] = ++subid;
+                               reginfo->rootoid, reginfo->rootoid_len - 1);
+            requests->requestvb->name[reginfo->rootoid_len - 2] = ++subid;
             requests->requestvb->type = ASN_PRIV_RETRY;
         }
         reginfo->rootoid = root_save;
-        reginfo->rootoid_len--;
+        reginfo->rootoid_len -= 2;
         return ret;
     }
     /*
diff --git a/agent/helpers/serialize.c b/agent/helpers/serialize.c
index 892f9b3..eec66b4 100644
--- a/agent/helpers/serialize.c
+++ b/agent/helpers/serialize.c
@@ -1,11 +1,5 @@
 #include <net-snmp/net-snmp-config.h>
 
-#if HAVE_STRING_H
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 
diff --git a/agent/helpers/stash_cache.c b/agent/helpers/stash_cache.c
index efb1eb4..5252cb2 100644
--- a/agent/helpers/stash_cache.c
+++ b/agent/helpers/stash_cache.c
@@ -1,15 +1,10 @@
 #include <net-snmp/net-snmp-config.h>
 
-#if HAVE_STRING_H
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 
 #include <net-snmp/agent/stash_cache.h>
+
 #include <net-snmp/agent/stash_to_next.h>
 
 extern NetsnmpCacheLoad _netsnmp_stash_cache_load;
@@ -32,7 +27,8 @@
     netsnmp_stash_cache_info *cinfo;
 
     cinfo = SNMP_MALLOC_TYPEDEF(netsnmp_stash_cache_info);
-    cinfo->cache_length = 30;
+    if (cinfo != NULL)
+        cinfo->cache_length = 30;
     return cinfo;
 }
 
@@ -155,7 +151,6 @@
                                          cdata->val.string, cdata->val_len);
             }
         }
-        return SNMP_ERR_NOERROR;
         break;
 
     case MODE_GETNEXT:
@@ -178,7 +173,6 @@
                 }
             }
         }
-        return SNMP_ERR_NOERROR;
         break;
 
     default:
@@ -186,7 +180,8 @@
         return netsnmp_call_next_handler(handler, reginfo, reqinfo,
                                          requests);
     }
-    return SNMP_ERR_GENERR;     /* should never get here */
+
+    return SNMP_ERR_NOERROR;
 }
 
 /** updates a given cache depending on whether it needs to or not.
diff --git a/agent/helpers/stash_to_next.c b/agent/helpers/stash_to_next.c
index aabaaa8..f679e04 100644
--- a/agent/helpers/stash_to_next.c
+++ b/agent/helpers/stash_to_next.c
@@ -1,17 +1,12 @@
 #include <net-snmp/net-snmp-config.h>
 
-#if HAVE_STRING_H
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 
-#include <net-snmp/agent/stash_cache.h>
 #include <net-snmp/agent/stash_to_next.h>
 
+#include <net-snmp/agent/stash_cache.h>
+
 /** @defgroup stash_to_next stash_to_next
  *  Convert GET_STASH requests into GETNEXT requests for the handler.
  *  The purpose of this handler is to convert a GET_STASH auto-cache request
diff --git a/agent/helpers/table.c b/agent/helpers/table.c
index 32a0803..374ef48 100644
--- a/agent/helpers/table.c
+++ b/agent/helpers/table.c
@@ -12,20 +12,26 @@
  * Use is subject to license terms specified in the COPYING file
  * distributed with the Net-SNMP package.
  */
+/*
+ * Portions of this file are copyrighted by:
+ * Copyright (C) 2007 Apple, Inc. All rights reserved.
+ * Use is subject to license terms specified in the COPYING file
+ * distributed with the Net-SNMP package.
+ */
 
 #include <net-snmp/net-snmp-config.h>
 
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+#include <net-snmp/agent/table.h>
+
 #if HAVE_STRING_H
 #include <string.h>
 #else
 #include <strings.h>
 #endif
 
-
-#include <net-snmp/net-snmp-includes.h>
-#include <net-snmp/agent/net-snmp-agent-includes.h>
-
-#include <net-snmp/agent/table.h>
 #include <net-snmp/library/snmp_assert.h>
 
 static void     table_helper_cleanup(netsnmp_agent_request_info *reqinfo,
@@ -108,10 +114,22 @@
 netsnmp_register_table(netsnmp_handler_registration *reginfo,
                        netsnmp_table_registration_info *tabreq)
 {
-    netsnmp_inject_handler(reginfo, netsnmp_get_table_handler(tabreq));
+    int rc = netsnmp_inject_handler(reginfo, netsnmp_get_table_handler(tabreq));
+    if (SNMPERR_SUCCESS != rc)
+        return rc;
+
     return netsnmp_register_handler(reginfo);
 }
 
+int
+netsnmp_unregister_table(netsnmp_handler_registration *reginfo)
+{
+    /* Locate "this" reginfo */
+    /* SNMP_FREE(reginfo->myvoid); */
+    /* reginfo->myvoid = NULL; */
+    return netsnmp_unregister_handler(reginfo);
+}
+
 /** Extracts the processed table information from a given request.
  *  Call this from subhandlers on a request to extract the processed
  *  netsnmp_request_info information.  The resulting information includes the
@@ -260,7 +278,7 @@
                 DEBUGMSGOID(("helper:table:set", var->name, var->name_length));
                 out_len = 0;
                 if (sprint_realloc_by_type(&buf, &buf_len, &out_len, 1,
-                                           var, 0, 0, 0)) {
+                                           var, NULL, NULL, NULL)) {
                     DEBUGMSG(("helper:table:set"," type=%d(%02x), value=%s\n",
                               var->type, var->type, buf));
                 } else {
@@ -352,6 +370,11 @@
         tbl_req_info = netsnmp_extract_table_info(request);
         if (NULL == tbl_req_info) {
             tbl_req_info = SNMP_MALLOC_TYPEDEF(netsnmp_table_request_info);
+            if (tbl_req_info == NULL) {
+                table_helper_cleanup(reqinfo, request,
+                                     SNMP_ERR_GENERR);
+                continue;
+            }
             tbl_req_info->reg_info = tbl_info;
             tbl_req_info->indexes = snmp_clone_varbind(tbl_info->indexes);
             tbl_req_info->number_indexes = 0;       /* none yet */
@@ -371,7 +394,7 @@
             /*
              * oid is long enough to contain COLUMN info
              */
-            DEBUGMSGTL(("helper:table:col", "  have at least a column (%d)\n",
+            DEBUGMSGTL(("helper:table:col", "  have at least a column (%ld)\n",
                         var->name[oid_column_pos]));
             if (var->name[oid_column_pos] < tbl_info->min_column) {
                 DEBUGMSGTL(("helper:table:col",
@@ -427,7 +450,7 @@
                     continue;
                 if (tbl_req_info->colnum != var->name[oid_column_pos]) {
                     DEBUGMSGTL(("helper:table:col",
-                                "    which doesn't match req %d - truncating index info\n",
+                                "    which doesn't match req %ld - truncating index info\n",
                                    var->name[oid_column_pos]));
                     /*
                      * different column! truncate useless index info 
@@ -447,8 +470,8 @@
                  */
                 tbl_req_info->index_oid_len =
                     var->name_length - oid_index_pos;
-                DEBUGMSGTL(("helper:table", "    have %d bytes of index\n",
-                            tbl_req_info->index_oid_len));
+                DEBUGMSGTL(("helper:table", "    have %lu bytes of index\n",
+                            (unsigned long)tbl_req_info->index_oid_len));
                 netsnmp_assert(tbl_req_info->index_oid_len < MAX_OID_LEN);
                 memcpy(tbl_req_info->index_oid, &var->name[oid_index_pos],
                        tbl_req_info->index_oid_len * sizeof(oid));
@@ -564,7 +587,7 @@
                      count++, vb = vb->next_variable) {
                     out_len = 0;
                     if (sprint_realloc_by_type(&buf, &buf_len, &out_len, 1,
-                                               vb, 0, 0, 0)) {
+                                               vb, NULL, NULL, NULL)) {
                         DEBUGMSG(("helper:table:results",
                                   "   index: type=%d(%02x), value=%s",
                                   vb->type, vb->type, buf));
@@ -733,10 +756,35 @@
 netsnmp_sparse_table_register(netsnmp_handler_registration *reginfo,
                        netsnmp_table_registration_info *tabreq)
 {
-    netsnmp_inject_handler(reginfo,
-        netsnmp_create_handler(SPARSE_TABLE_HANDLER_NAME,
-                               sparse_table_helper_handler));
-    netsnmp_inject_handler(reginfo, netsnmp_get_table_handler(tabreq));
+    netsnmp_mib_handler *handler1, *handler2;
+    int rc;
+
+    handler1 = netsnmp_create_handler(SPARSE_TABLE_HANDLER_NAME,
+                                     sparse_table_helper_handler);
+    if (NULL == handler1)
+        return SNMP_ERR_GENERR;
+
+    handler2 = netsnmp_get_table_handler(tabreq);
+    if (NULL == handler2 ) {
+        netsnmp_handler_free(handler1);
+        return SNMP_ERR_GENERR;
+    }
+
+    rc = netsnmp_inject_handler(reginfo, handler1);
+    if (SNMPERR_SUCCESS != rc) {
+        netsnmp_handler_free(handler1);
+        netsnmp_handler_free(handler2);
+        return rc;
+    }
+
+    rc = netsnmp_inject_handler(reginfo, handler2);
+    if (SNMPERR_SUCCESS != rc) {
+        /** handler1 is in reginfo... remove and free?? */
+        netsnmp_handler_free(handler2);
+        return rc;
+    }
+
+    /** both handlers now in reginfo, so nothing to do on error */
     return netsnmp_register_handler(reginfo);
 }
 
@@ -929,6 +977,26 @@
     return 0;
 }
 
+void
+netsnmp_table_registration_info_free(netsnmp_table_registration_info *tri)
+{
+    if (NULL == tri)
+        return;
+
+    if (NULL != tri->indexes)
+        snmp_free_varbind(tri->indexes);
+
+#if 0
+    /*
+     * sigh... example use of valid_columns points to static memory,
+     * so freeing it would be bad... we'll just have to live with any
+     * leaks, for now...
+     */
+#endif
+
+    free(tri);
+}
+
 /** @} */
 
 /*
@@ -1054,30 +1122,16 @@
  *
  */
 void
-#if HAVE_STDARG_H
 netsnmp_table_helper_add_indexes(netsnmp_table_registration_info *tinfo,
                                  ...)
-#else
-netsnmp_table_helper_add_indexes(va_alist)
-     va_dcl
-#endif
 {
     va_list         debugargs;
     int             type;
 
-#if HAVE_STDARG_H
     va_start(debugargs, tinfo);
-#else
-    netsnmp_table_registration_info *tinfo;
-
-    va_start(debugargs);
-    tinfo = va_arg(debugargs, netsnmp_table_registration_info *);
-#endif
-
     while ((type = va_arg(debugargs, int)) != 0) {
         netsnmp_table_helper_add_index(tinfo, type);
     }
-
     va_end(debugargs);
 }
 
diff --git a/agent/helpers/table_array.c b/agent/helpers/table_array.c
index 19b9c5c..c7f52f9 100644
--- a/agent/helpers/table_array.c
+++ b/agent/helpers/table_array.c
@@ -5,17 +5,18 @@
 
 #include <net-snmp/net-snmp-config.h>
 
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+#include <net-snmp/agent/table_array.h>
+
 #if HAVE_STRING_H
 #include <string.h>
 #else
 #include <strings.h>
 #endif
 
-#include <net-snmp/net-snmp-includes.h>
-#include <net-snmp/agent/net-snmp-agent-includes.h>
-
 #include <net-snmp/agent/table.h>
-#include <net-snmp/agent/table_array.h>
 #include <net-snmp/library/container.h>
 #include <net-snmp/library/snmp_assert.h>
 
@@ -564,6 +565,8 @@
             DEBUGMSG(("table_array:group", "\n"));
             g = (netsnmp_request_group *) tmp;
             i = SNMP_MALLOC_TYPEDEF(netsnmp_request_group_item);
+            if (i == NULL)
+                return;
             i->ri = current;
             i->tri = tblreq_info;
             i->next = g->list;
@@ -579,6 +582,11 @@
         DEBUGMSG(("table_array:group", "\n"));
         g = SNMP_MALLOC_TYPEDEF(netsnmp_request_group);
         i = SNMP_MALLOC_TYPEDEF(netsnmp_request_group_item);
+        if (i == NULL || g == NULL) {
+            SNMP_FREE(i);
+            SNMP_FREE(g);
+            return;
+        }
         g->list = i;
         g->table = tad->table;
         i->ri = current;
diff --git a/agent/helpers/table_container.c b/agent/helpers/table_container.c
index d08bff2..85cdb41 100644
--- a/agent/helpers/table_container.c
+++ b/agent/helpers/table_container.c
@@ -5,17 +5,18 @@
 
 #include <net-snmp/net-snmp-config.h>
 
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+#include <net-snmp/agent/table_container.h>
+
 #if HAVE_STRING_H
 #include <string.h>
 #else
 #include <strings.h>
 #endif
 
-#include <net-snmp/net-snmp-includes.h>
-#include <net-snmp/agent/net-snmp-agent-includes.h>
-
 #include <net-snmp/agent/table.h>
-#include <net-snmp/agent/table_container.h>
 #include <net-snmp/library/container.h>
 #include <net-snmp/library/snmp_assert.h>
 
@@ -315,6 +316,24 @@
     return netsnmp_register_table(reginfo, tabreg);
 }
 
+int
+netsnmp_container_table_unregister(netsnmp_handler_registration *reginfo)
+{
+    container_table_data *tad;
+
+    if (!reginfo)
+        return MIB_UNREGISTRATION_FAILED;
+    tad = (container_table_data *)
+        netsnmp_find_handler_data_by_name(reginfo, "table_container");
+    if (tad) {
+        CONTAINER_FREE( tad->table );
+        tad->table = NULL;
+        free(tad);
+        reginfo->handler->myvoid = NULL;
+    }
+    return netsnmp_unregister_table( reginfo );
+}
+
 /** retrieve the container used by the table_container helper */
 netsnmp_container*
 netsnmp_container_table_container_extract(netsnmp_request_info *request)
diff --git a/agent/helpers/table_data.c b/agent/helpers/table_data.c
index 317331a..c3a7f9e 100644
--- a/agent/helpers/table_data.c
+++ b/agent/helpers/table_data.c
@@ -1,16 +1,17 @@
 #include <net-snmp/net-snmp-config.h>
 
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+#include <net-snmp/agent/table_data.h>
+
 #if HAVE_STRING_H
 #include <string.h>
 #else
 #include <strings.h>
 #endif
 
-#include <net-snmp/net-snmp-includes.h>
-#include <net-snmp/agent/net-snmp-agent-includes.h>
-
 #include <net-snmp/agent/table.h>
-#include <net-snmp/agent/table_data.h>
 #include <net-snmp/agent/read_only.h>
 
 /** @defgroup table_data table_data
@@ -80,16 +81,16 @@
     if (row->indexes) {
         newrow->indexes = snmp_clone_varbind(newrow->indexes);
         if (!newrow->indexes) {
-            free (newrow);
+            free(newrow);
             return NULL;
         }
     }
 
     if (row->index_oid) {
-        newrow->index_oid = netsnmp_memdup(row->index_oid,
-                                           row->index_oid_len * sizeof(oid));
+        newrow->index_oid =
+            snmp_duplicate_objid(row->index_oid, row->index_oid_len);
         if (!newrow->index_oid) {
-            free (newrow);
+            free(newrow);
             return NULL;
         }
     }
@@ -227,7 +228,7 @@
 }
 
 /** swaps out origrow with newrow.  This does *not* delete/free anything! */
-NETSNMP_INLINE void
+void
 netsnmp_table_data_replace_row(netsnmp_table_data *table,
                                netsnmp_table_row *origrow,
                                netsnmp_table_row *newrow)
@@ -342,8 +343,8 @@
     if (old_row->indexes)
         new_row->indexes = snmp_clone_varbind(old_row->indexes);
     if (old_row->index_oid)
-        new_row->index_oid = netsnmp_memdup(old_row->index_oid,
-                                         old_row->index_oid_len * sizeof(oid));
+        new_row->index_oid =
+            snmp_duplicate_objid(old_row->index_oid, old_row->index_oid_len);
     /* XXX - Doesn't copy table-specific row structure */
     return 0;
 }
@@ -414,6 +415,13 @@
     return netsnmp_register_table_data(reginfo, table, table_info);
 }
 
+int
+netsnmp_unregister_table_data(netsnmp_handler_registration *reginfo)
+{
+    /* free table; */
+    return netsnmp_unregister_table(reginfo);
+}
+
 /*
  * The helper handler that takes care of passing a specific row of
  * data down to the lower handler(s).  It sets request->processed if
@@ -678,7 +686,7 @@
 }
 
 /** inserts a newly created table_data row into a request */
-NETSNMP_INLINE void
+void
 netsnmp_insert_table_row(netsnmp_request_info *request,
                          netsnmp_table_row *row)
 {
diff --git a/agent/helpers/table_dataset.c b/agent/helpers/table_dataset.c
index f92e3e1..23e0deb 100644
--- a/agent/helpers/table_dataset.c
+++ b/agent/helpers/table_dataset.c
@@ -1,14 +1,16 @@
 #include <net-snmp/net-snmp-config.h>
 
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+#include <net-snmp/agent/table_dataset.h>
+
 #if HAVE_STRING_H
 #include <string.h>
 #else
 #include <strings.h>
 #endif
 
-#include <net-snmp/net-snmp-includes.h>
-#include <net-snmp/agent/net-snmp-agent-includes.h>
-
 static netsnmp_data_list *auto_tables;
 
 typedef struct data_set_tables_s {
@@ -72,78 +74,6 @@
  *
  * ================================== */
 
-/** Create a netsnmp_table_data_set structure given a table_data definition */
-netsnmp_table_data_set *
-netsnmp_create_table_data_set(const char *table_name)
-{
-    netsnmp_table_data_set *table_set =
-        SNMP_MALLOC_TYPEDEF(netsnmp_table_data_set);
-    if (!table_set)
-        return NULL;
-    table_set->table = netsnmp_create_table_data(table_name);
-    return table_set;
-}
-
-void netsnmp_delete_table_data_set(netsnmp_table_data_set *table_set)
-{
-    netsnmp_table_data_set_storage *ptr, *next;
-    netsnmp_table_row *prow, *pnextrow;
-
-    for (ptr = table_set->default_row; ptr; ptr = next) {
-        next = ptr->next;
-        free(ptr);
-    }
-    table_set->default_row = NULL;
-    for (prow = table_set->table->first_row; prow; prow = pnextrow) {
-        pnextrow = prow->next;
-        netsnmp_table_dataset_remove_and_delete_row(table_set, prow);
-    }
-    table_set->table->first_row = NULL;
-    netsnmp_table_data_delete_table(table_set->table);
-    free(table_set);
-}
-
-/** clones a dataset row, including all data. */
-netsnmp_table_row *
-netsnmp_table_data_set_clone_row(netsnmp_table_row *row)
-{
-    netsnmp_table_data_set_storage *data, **newrowdata;
-    netsnmp_table_row *newrow;
-
-    if (!row)
-        return NULL;
-
-    newrow = netsnmp_table_data_clone_row(row);
-    if (!newrow)
-        return NULL;
-
-    data = (netsnmp_table_data_set_storage *) row->data;
-
-    if (data) {
-        for (newrowdata =
-             (netsnmp_table_data_set_storage **) &(newrow->data); data;
-             newrowdata = &((*newrowdata)->next), data = data->next) {
-
-            *newrowdata = netsnmp_memdup(data,
-                   sizeof(netsnmp_table_data_set_storage));
-            if (!*newrowdata) {
-                netsnmp_table_dataset_delete_row(newrow);
-                return NULL;
-            }
-
-            if (data->data.voidp) {
-                (*newrowdata)->data.voidp = netsnmp_memdup(data->data.voidp,
-                                                           data->data_len);
-                if (!(*newrowdata)->data.voidp) {
-                    netsnmp_table_dataset_delete_row(newrow);
-                    return NULL;
-                }
-            }
-        }
-    }
-    return newrow;
-}
-
 /** deletes a single dataset table data.
  *  returns the (possibly still good) next pointer of the deleted data object.
  */
@@ -230,6 +160,78 @@
     netsnmp_table_dataset_delete_all_data(data);
 }
 
+/** Create a netsnmp_table_data_set structure given a table_data definition */
+netsnmp_table_data_set *
+netsnmp_create_table_data_set(const char *table_name)
+{
+    netsnmp_table_data_set *table_set =
+        SNMP_MALLOC_TYPEDEF(netsnmp_table_data_set);
+    if (!table_set)
+        return NULL;
+    table_set->table = netsnmp_create_table_data(table_name);
+    return table_set;
+}
+
+void netsnmp_delete_table_data_set(netsnmp_table_data_set *table_set)
+{
+    netsnmp_table_data_set_storage *ptr, *next;
+    netsnmp_table_row *prow, *pnextrow;
+
+    for (ptr = table_set->default_row; ptr; ptr = next) {
+        next = ptr->next;
+        free(ptr);
+    }
+    table_set->default_row = NULL;
+    for (prow = table_set->table->first_row; prow; prow = pnextrow) {
+        pnextrow = prow->next;
+        netsnmp_table_dataset_remove_and_delete_row(table_set, prow);
+    }
+    table_set->table->first_row = NULL;
+    netsnmp_table_data_delete_table(table_set->table);
+    free(table_set);
+}
+
+/** clones a dataset row, including all data. */
+netsnmp_table_row *
+netsnmp_table_data_set_clone_row(netsnmp_table_row *row)
+{
+    netsnmp_table_data_set_storage *data, **newrowdata;
+    netsnmp_table_row *newrow;
+
+    if (!row)
+        return NULL;
+
+    newrow = netsnmp_table_data_clone_row(row);
+    if (!newrow)
+        return NULL;
+
+    data = (netsnmp_table_data_set_storage *) row->data;
+
+    if (data) {
+        for (newrowdata =
+             (netsnmp_table_data_set_storage **) &(newrow->data); data;
+             newrowdata = &((*newrowdata)->next), data = data->next) {
+
+            *newrowdata = netsnmp_memdup(data,
+                sizeof(netsnmp_table_data_set_storage));
+            if (!*newrowdata) {
+                netsnmp_table_dataset_delete_row(newrow);
+                return NULL;
+            }
+
+            if (data->data.voidp) {
+                (*newrowdata)->data.voidp =
+                    netsnmp_memdup(data->data.voidp, data->data_len);
+                if (!(*newrowdata)->data.voidp) {
+                    netsnmp_table_dataset_delete_row(newrow);
+                    return NULL;
+                }
+            }
+        }
+    }
+    return newrow;
+}
+
 /* ==================================
  *
  * Data Set API: Default row operations
@@ -288,6 +290,8 @@
     }
 
     new_col = SNMP_MALLOC_TYPEDEF(netsnmp_table_data_set_storage);
+    if (new_col == NULL)
+        return SNMPERR_GENERR;
     new_col->type = type;
     new_col->writable = writable;
     new_col->column = column;
@@ -324,13 +328,7 @@
  *  repeatedly for you.
  */
 void
-#if HAVE_STDARG_H
 netsnmp_table_set_multi_add_default_row(netsnmp_table_data_set *tset, ...)
-#else
-netsnmp_table_set_multi_add_default_row(va_dcl
-    )
-     va_dcl
-#endif
 {
     va_list         debugargs;
     unsigned int    column;
@@ -338,14 +336,7 @@
     void           *data;
     size_t          data_len;
 
-#if HAVE_STDARG_H
     va_start(debugargs, tset);
-#else
-    netsnmp_table_data_set *tset;
-
-    va_start(debugargs);
-    tset = va_arg(debugargs, netsnmp_table_data_set *);
-#endif
 
     while ((column = va_arg(debugargs, unsigned int)) != 0) {
         type = va_arg(debugargs, int);
@@ -403,6 +394,8 @@
          * allocate the table if one wasn't allocated 
          */
         table_info = SNMP_MALLOC_TYPEDEF(netsnmp_table_registration_info);
+        if (table_info == NULL)
+            return SNMP_ERR_GENERR;
     }
 
     if (NULL == table_info->indexes && data_set->table->indexes_template) {
@@ -446,11 +439,14 @@
     netsnmp_table_row *newrow   = NULL;
 
     newrowstash = SNMP_MALLOC_TYPEDEF(newrow_stash);
-    newrowstash->created = 1;
-    newrow = netsnmp_table_data_set_create_row_from_defaults
-                        (datatable->default_row);
-    newrow->indexes = snmp_clone_varbind(table_info->indexes);
-    newrowstash->newrow = newrow;
+
+    if (newrowstash != NULL) {
+        newrowstash->created = 1;
+        newrow = netsnmp_table_data_set_create_row_from_defaults
+            (datatable->default_row);
+        newrow->indexes = snmp_clone_varbind(table_info->indexes);
+        newrowstash->newrow = newrow;
+    }
 
     return newrowstash;
 }
@@ -469,8 +465,6 @@
     netsnmp_table_row *row, *newrow = NULL;
     netsnmp_table_request_info *table_info;
     netsnmp_request_info *request;
-    oid            *suffix;
-    size_t          suffix_len;
     netsnmp_oid_stash_node **stashp = NULL;
 
     if (!handler)
@@ -480,6 +474,11 @@
     for (request = requests; request; request = request->next) {
         netsnmp_table_data_set *datatable =
             (netsnmp_table_data_set *) handler->myvoid;
+        const oid * const suffix =
+            requests->requestvb->name + reginfo->rootoid_len + 2;
+        const size_t suffix_len =
+            requests->requestvb->name_length - (reginfo->rootoid_len + 2);
+
         if (request->processed)
             continue;
 
@@ -488,9 +487,6 @@
          */
         row = netsnmp_extract_table_row(request);
         table_info = netsnmp_extract_table_info(request);
-        suffix = requests->requestvb->name + reginfo->rootoid_len + 2;
-        suffix_len = requests->requestvb->name_length -
-            (reginfo->rootoid_len + 2);
 
         if (MODE_IS_SET(reqinfo->mode)) {
 
@@ -557,6 +553,11 @@
                      * existing row that needs to be modified 
                      */
                     newrowstash = SNMP_MALLOC_TYPEDEF(newrow_stash);
+                    if (newrowstash == NULL) {
+                        netsnmp_set_request_error(reqinfo, request,
+                                                  SNMP_ERR_GENERR);
+                        continue;
+                    }
                     newrow = netsnmp_table_data_set_clone_row(row);
                     newrowstash->newrow = newrow;
                 }
@@ -1044,7 +1045,7 @@
         }
 
         DEBUGMSGTL(("table_set_add_table",
-                    "adding column %s(%d) of type %d (access %d)\n",
+                    "adding column %s(%ld) of type %d (access %d)\n",
                     tp->label, tp->subid, type, tp->access));
 
         switch (tp->access) {
@@ -1057,7 +1058,7 @@
             /* fallthrough */
         case MIB_ACCESS_READONLY:
             DEBUGMSGTL(("table_set_add_table",
-                        "adding column %d of type %d\n", tp->subid, type));
+                        "adding column %ld of type %d\n", tp->subid, type));
             netsnmp_table_set_add_default_row(table_set, tp->subid, type,
                                               canwrite, NULL, 0);
             mincol = SNMP_MIN(mincol, tp->subid);
@@ -1311,25 +1312,13 @@
 /** adds multiple indexes to a table_dataset helper object.
  *  To end the list, use a 0 after the list of ASN index types. */
 void
-#if HAVE_STDARG_H
 netsnmp_table_set_add_indexes(netsnmp_table_data_set *tset,
                               ...)
-#else
-netsnmp_table_set_add_indexes(va_alist)
-     va_dcl
-#endif
 {
     va_list         debugargs;
     int             type;
 
-#if HAVE_STDARG_H
     va_start(debugargs, tset);
-#else
-    netsnmp_table_data_set *tset;
-
-    va_start(debugargs);
-    tset = va_arg(debugargs, netsnmp_table_data_set *);
-#endif
 
     if (tset)
         while ((type = va_arg(debugargs, int)) != 0)
diff --git a/agent/helpers/table_iterator.c b/agent/helpers/table_iterator.c
index e7742ed..bcca797 100644
--- a/agent/helpers/table_iterator.c
+++ b/agent/helpers/table_iterator.c
@@ -84,18 +84,19 @@
 
 #include <net-snmp/net-snmp-config.h>
 
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+#include <net-snmp/agent/table_iterator.h>
+
 #if HAVE_STRING_H
 #include <string.h>
 #else
 #include <strings.h>
 #endif
 
-#include <net-snmp/net-snmp-includes.h>
-#include <net-snmp/agent/net-snmp-agent-includes.h>
-
 #include <net-snmp/agent/table.h>
 #include <net-snmp/agent/serialize.h>
-#include <net-snmp/agent/table_iterator.h>
 #include <net-snmp/agent/stash_cache.h>
 
 /* ==================================
@@ -345,6 +346,8 @@
     /* no existing cached state.  make a new one. */
     if (!ti_info) {
         ti_info = SNMP_MALLOC_TYPEDEF(ti_cache_info);
+        if (ti_info == NULL)
+            return NULL;
         netsnmp_request_add_list_data(request,
                                       netsnmp_create_data_list
                                       (TI_REQUEST_CACHE,
@@ -408,7 +411,7 @@
     
     iinfo = (netsnmp_iterator_info *) handler->myvoid;
     if (!iinfo || !reginfo || !reqinfo)
-        return SNMPERR_GENERR;
+        return SNMP_ERR_GENERR;
 
     tbl_info = iinfo->table_reginfo;
 
@@ -437,6 +440,8 @@
 
         /* XXX: move this malloc to stash_cache handler? */
         reqtmp = SNMP_MALLOC_TYPEDEF(netsnmp_request_info);
+        if (reqtmp == NULL)
+            return SNMP_ERR_GENERR;
         reqtmp->subtree = requests->subtree;
         table_info = netsnmp_extract_table_info(requests);
         netsnmp_request_add_list_data(reqtmp,
@@ -453,6 +458,14 @@
             if (request->processed)
                 continue;
             table_info = netsnmp_extract_table_info(request);
+            if (table_info == NULL) {
+                /*
+                 * Cleanup 
+                 */
+                if (free_this_index_search)
+                    snmp_free_varbind(free_this_index_search);
+                return SNMP_ERR_GENERR;
+            }
             if (table_info->colnum < tbl_info->min_column - 1) {
                 /* XXX: optimize better than this */
                 /* for now, just increase to colnum-1 */
@@ -467,6 +480,14 @@
                 netsnmp_request_get_list_data(request, TI_REQUEST_CACHE);
             if (!ti_info) {
                 ti_info = SNMP_MALLOC_TYPEDEF(ti_cache_info);
+                if (ti_info == NULL) {
+                    /*
+                     * Cleanup 
+                     */
+                    if (free_this_index_search)
+                        snmp_free_varbind(free_this_index_search);
+                    return SNMP_ERR_GENERR;
+                }
                 netsnmp_request_add_list_data(request,
                                               netsnmp_create_data_list
                                               (TI_REQUEST_CACHE,
@@ -557,6 +578,16 @@
 
                     /* XXX: store in an array for faster retrival */
                     table_info = netsnmp_extract_table_info(request);
+                    if (table_info == NULL) {
+                        /*
+                         * Cleanup 
+                         */
+                        if (free_this_index_search)
+                            snmp_free_varbind(free_this_index_search);
+                        netsnmp_free_request_data_sets(reqtmp);
+                        SNMP_FREE(reqtmp);
+                        return SNMP_ERR_GENERR;
+                    }
                     coloid[reginfo->rootoid_len + 1] = table_info->colnum;
 
                     ti_info =
@@ -571,11 +602,25 @@
                         if (snmp_oid_compare(myname, myname_len,
                                              request->requestvb->name,
                                              request->requestvb->name_length) == 0) {
-                            /* keep this */
-                            netsnmp_iterator_remember(request,
-                                                      myname, myname_len,
-                                                      callback_data_context,
-                                                      callback_loop_context, iinfo);
+                            /* 
+                             * keep this
+                             */
+                            if (netsnmp_iterator_remember(request,
+                                                          myname,
+                                                          myname_len,
+                                                          callback_data_context,
+                                                          callback_loop_context,
+                                                          iinfo) == NULL) {
+                                /*
+                                 * Cleanup 
+                                 */
+                                if (free_this_index_search)
+                                    snmp_free_varbind
+                                        (free_this_index_search);
+                                netsnmp_free_request_data_sets(reqtmp);
+                                SNMP_FREE(reqtmp);
+                                return SNMP_ERR_GENERR;
+                            }
                             request_count--;   /* One less to look for */
                         } else {
                             if (iinfo->free_data_context && callback_data_context) {
@@ -612,6 +657,15 @@
                             table_info->colnum = i;
                             vb = reqtmp->requestvb =
                                 SNMP_MALLOC_TYPEDEF(netsnmp_variable_list);
+                            if (vb == NULL) {
+                                /*
+                                 * Cleanup 
+                                 */
+                                if (free_this_index_search)
+                                    snmp_free_varbind
+                                        (free_this_index_search);
+                                return SNMP_ERR_GENERR;
+                            }
                             vb->type = ASN_NULL;
                             snmp_set_var_objid(vb, myname, myname_len);
                             netsnmp_call_next_handler(handler, reginfo,
@@ -633,11 +687,23 @@
                         if (netsnmp_check_getnext_reply
                             (request, coloid, coloid_len, index_search,
                              &ti_info->results)) {
-                            netsnmp_iterator_remember(request,
-                                                      ti_info->results->name,
-                                                      ti_info->results->name_length,
-                                                      callback_data_context,
-                                                      callback_loop_context, iinfo);
+                            if (netsnmp_iterator_remember(request,
+                                                          ti_info->
+                                                          results->name,
+                                                          ti_info->
+                                                          results->
+                                                          name_length,
+                                                          callback_data_context,
+                                                          callback_loop_context,
+                                                          iinfo) == NULL) {
+                                /*
+                                 * Cleanup 
+                                 */
+                                if (free_this_index_search)
+                                    snmp_free_varbind
+                                        (free_this_index_search);
+                                return SNMP_ERR_GENERR;
+                            }
                             /*
                              *  If we've been told that the rows are sorted,
                              *   then the first valid one we find
@@ -945,7 +1011,7 @@
 
     vp1 = snmp_clone_varbind(iinfo->indexes);
     vp2 = iinfo->get_first_data_point( &ctx1, &ctx2, vp1, iinfo );
-    DEBUGMSGTL(("table:iterator:get", "first DP: %x %x %x\n",
+    DEBUGMSGTL(("table:iterator:get", "first DP: %p %p %p\n",
                                        ctx1, ctx2, vp2));
 
     /* XXX - free context ? */
@@ -964,7 +1030,7 @@
         }
         
         vp2 = iinfo->get_next_data_point( &ctx1, &ctx2, vp2, iinfo );
-        DEBUGMSGTL(("table:iterator:get", "next DP: %x %x %x\n",
+        DEBUGMSGTL(("table:iterator:get", "next DP: %p %p %p\n",
                                            ctx1, ctx2, vp2));
         /* XXX - free context ? */
     }
@@ -994,7 +1060,7 @@
 
     vp1 = snmp_clone_varbind(iinfo->indexes);
     vp2 = iinfo->get_first_data_point( &ctx1, &ctx2, vp1, iinfo );
-    DEBUGMSGTL(("table:iterator:get", "first DP: %x %x %x\n",
+    DEBUGMSGTL(("table:iterator:get", "first DP: %p %p %p\n",
                                        ctx1, ctx2, vp2));
 
     if ( !instance || !len ) {
@@ -1031,7 +1097,7 @@
         }
         
         vp2 = iinfo->get_next_data_point( &ctx1, &ctx2, vp2, iinfo );
-        DEBUGMSGTL(("table:iterator:get", "next DP: %x %x %x\n",
+        DEBUGMSGTL(("table:iterator:get", "next DP: %p %p %p\n",
                                            ctx1, ctx2, vp2));
         /* XXX - free context ? */
     }
@@ -1060,7 +1126,7 @@
         return 0;
     }
     
-    DEBUGMSGTL(("table:iterator:count", "first DP: %x %x %x\n",
+    DEBUGMSGTL(("table:iterator:count", "first DP: %p %p %p\n",
                                          ctx1, ctx2, vp2));
 
     /* XXX - free context ? */
@@ -1068,7 +1134,7 @@
     while (vp2) {
         i++;
         vp2 = iinfo->get_next_data_point( &ctx1, &ctx2, vp2, iinfo );
-        DEBUGMSGTL(("table:iterator:count", "next DP: %x %x %x (%d)\n",
+        DEBUGMSGTL(("table:iterator:count", "next DP: %p %p %p (%d)\n",
                                              ctx1, ctx2, vp2, i));
         /* XXX - free context ? */
     }
diff --git a/agent/helpers/table_row.c b/agent/helpers/table_row.c
index 7c8a4c4..bbc484f 100644
--- a/agent/helpers/table_row.c
+++ b/agent/helpers/table_row.c
@@ -136,7 +136,7 @@
                       MAX_OID_LEN-row_oid_len, &len, NULL, 0, index);
     row_oid_len += len;
     free(reginfo->rootoid);
-    reginfo->rootoid = netsnmp_memdup(row_oid, row_oid_len * sizeof(oid));
+    reginfo->rootoid = snmp_duplicate_objid(row_oid, row_oid_len);
     reginfo->rootoid_len = row_oid_len;
 
      
diff --git a/agent/helpers/table_tdata.c b/agent/helpers/table_tdata.c
index 46d3e18..a57e00c 100644
--- a/agent/helpers/table_tdata.c
+++ b/agent/helpers/table_tdata.c
@@ -1,16 +1,17 @@
 #include <net-snmp/net-snmp-config.h>
 
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+#include <net-snmp/agent/table_tdata.h>
+
 #if HAVE_STRING_H
 #include <string.h>
 #else
 #include <strings.h>
 #endif
 
-#include <net-snmp/net-snmp-includes.h>
-#include <net-snmp/agent/net-snmp-agent-includes.h>
-
 #include <net-snmp/agent/table.h>
-#include <net-snmp/agent/table_tdata.h>
 #include <net-snmp/agent/table_container.h>
 #include <net-snmp/agent/read_only.h>
 
@@ -108,8 +109,8 @@
     }
 
     if (row->oid_index.oids) {
-        newrow->oid_index.oids = netsnmp_memdup(row->oid_index.oids,
-                                              row->oid_index.len * sizeof(oid));
+        newrow->oid_index.oids =
+            snmp_duplicate_objid(row->oid_index.oids, row->oid_index.len);
         if (!newrow->oid_index.oids) {
             if (newrow->indexes)
                 snmp_free_varbind(newrow->indexes);
@@ -138,8 +139,8 @@
     }
 
     if (src_row->oid_index.oids) {
-        dst_row->oid_index.oids = netsnmp_memdup(src_row->oid_index.oids,
-                                          src_row->oid_index.len * sizeof(oid));
+        dst_row->oid_index.oids = snmp_duplicate_objid(src_row->oid_index.oids,
+                                                       src_row->oid_index.len);
         if (!dst_row->oid_index.oids)
             return -1;
     }
@@ -214,7 +215,7 @@
      * add this row to the stored table
      */
     CONTAINER_INSERT( table->container, row );
-    DEBUGMSGTL(("tdata_add_row", "added row (%x)\n", row));
+    DEBUGMSGTL(("tdata_add_row", "added row (%p)\n", row));
 
     return SNMPERR_SUCCESS;
 }
@@ -354,6 +355,13 @@
                   table->container, TABLE_CONTAINER_KEY_NETSNMP_INDEX);
 }
 
+int
+netsnmp_tdata_unregister(netsnmp_handler_registration    *reginfo)
+{
+    /* free table; */
+    return netsnmp_container_table_unregister(reginfo);
+}
+
 /** extracts the tdata table from the request structure */
 netsnmp_tdata *
 netsnmp_tdata_extract_table(netsnmp_request_info *request)
diff --git a/agent/helpers/watcher.c b/agent/helpers/watcher.c
index 9cbb4d3..8ef456a 100644
--- a/agent/helpers/watcher.c
+++ b/agent/helpers/watcher.c
@@ -1,19 +1,15 @@
 #include <net-snmp/net-snmp-config.h>
 
-#include <stdlib.h>
-#if HAVE_STRING_H
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 
 #include <net-snmp/agent/watcher.h>
+
 #include <net-snmp/agent/instance.h>
 #include <net-snmp/agent/scalar.h>
 
+#include <string.h>
+
 /** @defgroup watcher watcher
  *  Watch a specified variable and process it as an instance or scalar object
  *  @ingroup leaf
@@ -33,19 +29,47 @@
 }
 
 netsnmp_watcher_info *
+netsnmp_init_watcher_info6(netsnmp_watcher_info *winfo,
+                           void *data, size_t size, u_char type,
+                           int flags, size_t max_size, size_t* size_p)
+{
+    winfo->data = data;
+    winfo->data_size = size;
+    winfo->max_size = max_size;
+    winfo->type = type;
+    winfo->flags = flags;
+    winfo->data_size_p = size_p;
+    return winfo;
+}
+
+netsnmp_watcher_info *
+netsnmp_create_watcher_info6(void *data, size_t size, u_char type,
+                             int flags, size_t max_size, size_t* size_p)
+{
+    netsnmp_watcher_info *winfo = SNMP_MALLOC_TYPEDEF(netsnmp_watcher_info);
+    if (winfo)
+        netsnmp_init_watcher_info6(winfo, data, size, type, flags, max_size,
+                                   size_p);
+    return winfo;
+}
+
+netsnmp_watcher_info *
+netsnmp_init_watcher_info(netsnmp_watcher_info *winfo,
+                          void *data, size_t size, u_char type, int flags)
+{
+  return netsnmp_init_watcher_info6(winfo, data, size,
+				    type, (flags ? flags : WATCHER_FIXED_SIZE),
+				    size,  /* Probably wrong for non-fixed
+					    * size data */
+				    NULL);
+}
+
+netsnmp_watcher_info *
 netsnmp_create_watcher_info(void *data, size_t size, u_char type, int flags)
 {
     netsnmp_watcher_info *winfo = SNMP_MALLOC_TYPEDEF(netsnmp_watcher_info);
-
-    winfo->data      = data;
-    winfo->data_size = size;
-    winfo->max_size  = size;	/* Probably wrong for non-fixed size data */
-    winfo->type      = type;
-    if (flags)
-        winfo->flags = flags;
-    else
-        winfo->flags = WATCHER_FIXED_SIZE;
-
+    if (winfo)
+        netsnmp_init_watcher_info(winfo, data, size, type, flags);
     return winfo;
 }
 
@@ -75,7 +99,59 @@
     return netsnmp_register_scalar(reginfo);
 }
 
+/** @cond */
 
+NETSNMP_STATIC_INLINE size_t
+get_data_size(const netsnmp_watcher_info* winfo)
+{
+    if (winfo->flags & WATCHER_SIZE_STRLEN)
+        return strlen((const char*)winfo->data);
+    else {
+        size_t res;
+        if (winfo->flags & WATCHER_SIZE_IS_PTR)
+            res = *winfo->data_size_p;
+        else
+            res = winfo->data_size;
+        if (winfo->flags & WATCHER_SIZE_UNIT_OIDS)
+          res *= sizeof(oid);
+        return res;
+    }
+}
+
+NETSNMP_STATIC_INLINE void
+set_data(netsnmp_watcher_info* winfo, void* data, size_t size)
+{
+    memcpy(winfo->data, data, size);
+    if (winfo->flags & WATCHER_SIZE_STRLEN)
+        ((char*)winfo->data)[size] = '\0';
+    else {
+        if (winfo->flags & WATCHER_SIZE_UNIT_OIDS)
+          size /= sizeof(oid);
+        if (winfo->flags & WATCHER_SIZE_IS_PTR)
+            *winfo->data_size_p = size;
+        else
+            winfo->data_size = size;
+    }
+}
+
+typedef struct {
+    size_t size;
+    char data[1];
+} netsnmp_watcher_cache;
+
+NETSNMP_STATIC_INLINE netsnmp_watcher_cache*
+netsnmp_watcher_cache_create(const void* data, size_t size)
+{
+    netsnmp_watcher_cache *res =
+        malloc(sizeof(netsnmp_watcher_cache) + size - 1);
+    if (res) {
+        res->size = size;
+        memcpy(res->data, data, size);
+    }
+    return res;
+}
+
+/** @endcond */
 
 int
 netsnmp_watcher_helper_handler(netsnmp_mib_handler *handler,
@@ -83,8 +159,8 @@
                                netsnmp_agent_request_info *reqinfo,
                                netsnmp_request_info *requests)
 {
-    netsnmp_watcher_info *winfo = (netsnmp_watcher_info *) handler->myvoid;
-    u_char              *old_data;
+    netsnmp_watcher_info  *winfo = (netsnmp_watcher_info *) handler->myvoid;
+    netsnmp_watcher_cache *old_data;
 
     DEBUGMSGTL(("helper:watcher", "Got request:  %d\n", reqinfo->mode));
     DEBUGMSGTL(( "helper:watcher", "  oid:"));
@@ -100,7 +176,7 @@
         snmp_set_var_typed_value(requests->requestvb,
                                  winfo->type,
                                  winfo->data,
-                                 winfo->data_size);
+                                 get_data_size(winfo));
         break;
 
         /*
@@ -108,18 +184,19 @@
          */
     case MODE_SET_RESERVE1:
         if (requests->requestvb->type != winfo->type) {
-            netsnmp_set_request_error(reqinfo, requests,
-                                      SNMP_ERR_WRONGTYPE);
+            netsnmp_set_request_error(reqinfo, requests, SNMP_ERR_WRONGTYPE);
             handler->flags |= MIB_HANDLER_AUTO_NEXT_OVERRIDE_ONCE;
-        }
-
-        if (((winfo->flags & WATCHER_MAX_SIZE) &&
-               requests->requestvb->val_len >  winfo->max_size) ||
+        } else if (((winfo->flags & WATCHER_MAX_SIZE) &&
+                     requests->requestvb->val_len > winfo->max_size) ||
             ((winfo->flags & WATCHER_FIXED_SIZE) &&
-               requests->requestvb->val_len != winfo->data_size)) {
-             netsnmp_set_request_error(reqinfo, requests,
-                                      SNMP_ERR_WRONGLENGTH);
-             handler->flags |= MIB_HANDLER_AUTO_NEXT_OVERRIDE_ONCE;
+                requests->requestvb->val_len != get_data_size(winfo))) {
+            netsnmp_set_request_error(reqinfo, requests, SNMP_ERR_WRONGLENGTH);
+            handler->flags |= MIB_HANDLER_AUTO_NEXT_OVERRIDE_ONCE;
+        } else if ((winfo->flags & WATCHER_SIZE_STRLEN) &&
+            (memchr(requests->requestvb->val.string, '\0',
+                requests->requestvb->val_len) != NULL)) {
+            netsnmp_set_request_error(reqinfo, requests, SNMP_ERR_WRONGVALUE);
+            handler->flags |= MIB_HANDLER_AUTO_NEXT_OVERRIDE_ONCE;
         }
         break;
 
@@ -127,16 +204,16 @@
         /*
          * store old info for undo later 
          */
-        old_data = netsnmp_memdup(winfo->data, winfo->data_size);
+        old_data =
+            netsnmp_watcher_cache_create(winfo->data, get_data_size(winfo));
         if (old_data == NULL) {
             netsnmp_set_request_error(reqinfo, requests,
                                       SNMP_ERR_RESOURCEUNAVAILABLE);
             handler->flags |= MIB_HANDLER_AUTO_NEXT_OVERRIDE_ONCE;
-            return SNMP_ERR_NOERROR;
-        }
-        netsnmp_request_add_list_data(requests,
-                                      netsnmp_create_data_list
-                                      ("watcher", old_data, free));
+        } else
+            netsnmp_request_add_list_data(requests,
+                                          netsnmp_create_data_list
+                                          ("watcher", old_data, free));
         break;
 
     case MODE_SET_FREE:
@@ -149,18 +226,16 @@
         /*
          * update current 
          */
-        memcpy(winfo->data, (void *)requests->requestvb->val.string,
-                                    requests->requestvb->val_len);
+        set_data(winfo, (void *)requests->requestvb->val.string,
+                                requests->requestvb->val_len);
         break;
 
     case MODE_SET_UNDO:
-        memcpy(winfo->data,
-               netsnmp_request_get_list_data(requests, "watcher"),
-               winfo->data_size);
+        old_data = netsnmp_request_get_list_data(requests, "watcher");
+        set_data(winfo, old_data->data, old_data->size);
         break;
 
     case MODE_SET_COMMIT:
-        winfo->data_size = requests->requestvb->val_len;
         break;
 
     }
@@ -349,7 +424,7 @@
 
 int
 netsnmp_register_ulong_scalar(const char *name,
-                              oid * reg_oid, size_t reg_oid_len,
+                              const oid * reg_oid, size_t reg_oid_len,
                               u_long * it,
                               Netsnmp_Node_Handler * subhandler)
 {
@@ -365,7 +440,7 @@
 
 int
 netsnmp_register_read_only_ulong_scalar(const char *name,
-                              oid * reg_oid, size_t reg_oid_len,
+                              const oid * reg_oid, size_t reg_oid_len,
                               u_long * it,
                               Netsnmp_Node_Handler * subhandler)
 {
@@ -381,7 +456,7 @@
 
 int
 netsnmp_register_long_scalar(const char *name,
-                              oid * reg_oid, size_t reg_oid_len,
+                              const oid * reg_oid, size_t reg_oid_len,
                               long * it,
                               Netsnmp_Node_Handler * subhandler)
 {
@@ -397,7 +472,7 @@
 
 int
 netsnmp_register_read_only_long_scalar(const char *name,
-                              oid * reg_oid, size_t reg_oid_len,
+                              const oid * reg_oid, size_t reg_oid_len,
                               long * it,
                               Netsnmp_Node_Handler * subhandler)
 {
@@ -414,7 +489,7 @@
 
 int
 netsnmp_register_int_scalar(const char *name,
-                              oid * reg_oid, size_t reg_oid_len,
+                              const oid * reg_oid, size_t reg_oid_len,
                               int * it,
                               Netsnmp_Node_Handler * subhandler)
 {
@@ -430,7 +505,7 @@
 
 int
 netsnmp_register_read_only_int_scalar(const char *name,
-                              oid * reg_oid, size_t reg_oid_len,
+                              const oid * reg_oid, size_t reg_oid_len,
                               int * it,
                               Netsnmp_Node_Handler * subhandler)
 {
@@ -447,7 +522,7 @@
 
 int
 netsnmp_register_read_only_counter32_scalar(const char *name,
-                              oid * reg_oid, size_t reg_oid_len,
+                              const oid * reg_oid, size_t reg_oid_len,
                               u_long * it,
                               Netsnmp_Node_Handler * subhandler)
 {
diff --git a/agent/mib_modules.c b/agent/mib_modules.c
index 95e4695..ea8271c 100644
--- a/agent/mib_modules.c
+++ b/agent/mib_modules.c
@@ -49,9 +49,6 @@
 #include <net-snmp/agent/table.h>
 #include <net-snmp/agent/table_iterator.h>
 #include "mib_module_includes.h"
-#ifdef USING_AGENTX_SUBAGENT_MODULE
-#include "mibgroup/agentx/subagent.h"
-#endif
 
 static int need_shutdown = 0;
 
diff --git a/agent/mibgroup/Makefile.depend b/agent/mibgroup/Makefile.depend
index deabf02..fdd5fbb 100644
--- a/agent/mibgroup/Makefile.depend
+++ b/agent/mibgroup/Makefile.depend
@@ -8,32 +8,14 @@
 ./header_complex.lo: ../../include/net-snmp/net-snmp-includes.h
 ./header_complex.lo: ../../include/net-snmp/definitions.h
 ./header_complex.lo: ../../include/net-snmp/types.h
+./header_complex.lo: ../../include/net-snmp/library/types.h
 ./header_complex.lo: ../../include/net-snmp/library/snmp_api.h
-./header_complex.lo: ../../include/net-snmp/library/asn1.h
-./header_complex.lo: ../../include/net-snmp/library/snmp_impl.h
-./header_complex.lo: ../../include/net-snmp/library/snmp.h
-./header_complex.lo: ../../include/net-snmp/library/snmp-tc.h
-./header_complex.lo: ../../include/net-snmp/utilities.h
+./header_complex.lo: ../../include/net-snmp/varbind_api.h
 ./header_complex.lo: ../../include/net-snmp/library/snmp_client.h
-./header_complex.lo: ../../include/net-snmp/library/system.h
-./header_complex.lo: ../../include/net-snmp/library/tools.h
-./header_complex.lo: ../../include/net-snmp/library/int64.h
-./header_complex.lo: ../../include/net-snmp/library/mt_support.h
-./header_complex.lo: ../../include/net-snmp/library/snmp_alarm.h
-./header_complex.lo: ../../include/net-snmp/library/callback.h
-./header_complex.lo: ../../include/net-snmp/library/data_list.h
-./header_complex.lo: ../../include/net-snmp/library/oid_stash.h
-./header_complex.lo: ../../include/net-snmp/library/check_varbind.h
-./header_complex.lo: ../../include/net-snmp/library/container.h
-./header_complex.lo: ../../include/net-snmp/library/factory.h
-./header_complex.lo: ../../include/net-snmp/library/snmp_logging.h
-./header_complex.lo: ../../include/net-snmp/library/container_binary_array.h
-./header_complex.lo: ../../include/net-snmp/library/container_list_ssll.h
-./header_complex.lo: ../../include/net-snmp/library/container_iterator.h
-./header_complex.lo: ../../include/net-snmp/library/container.h
-./header_complex.lo: ../../include/net-snmp/library/snmp_assert.h
-./header_complex.lo: ../../include/net-snmp/version.h
+./header_complex.lo: ../../include/net-snmp/pdu_api.h
+./header_complex.lo: ../../include/net-snmp/library/asn1.h
 ./header_complex.lo: ../../include/net-snmp/session_api.h
+./header_complex.lo: ../../include/net-snmp/library/callback.h
 ./header_complex.lo: ../../include/net-snmp/library/snmp_transport.h
 ./header_complex.lo: ../../include/net-snmp/library/snmp_service.h
 ./header_complex.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -44,11 +26,31 @@
 ./header_complex.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./header_complex.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./header_complex.lo: ../../include/net-snmp/library/ucd_compat.h
-./header_complex.lo: ../../include/net-snmp/pdu_api.h
-./header_complex.lo: ../../include/net-snmp/mib_api.h
 ./header_complex.lo: ../../include/net-snmp/library/mib.h
+./header_complex.lo: ../../include/net-snmp/mib_api.h
 ./header_complex.lo: ../../include/net-snmp/library/parse.h
-./header_complex.lo: ../../include/net-snmp/varbind_api.h
+./header_complex.lo: ../../include/net-snmp/library/oid_stash.h
+./header_complex.lo: ../../include/net-snmp/library/snmp_impl.h
+./header_complex.lo: ../../include/net-snmp/library/snmp.h
+./header_complex.lo: ../../include/net-snmp/library/snmp-tc.h
+./header_complex.lo: ../../include/net-snmp/library/getopt.h
+./header_complex.lo: ../../include/net-snmp/utilities.h
+./header_complex.lo: ../../include/net-snmp/library/system.h
+./header_complex.lo: ../../include/net-snmp/library/tools.h
+./header_complex.lo: ../../include/net-snmp/library/int64.h
+./header_complex.lo: ../../include/net-snmp/library/mt_support.h
+./header_complex.lo: ../../include/net-snmp/library/snmp_alarm.h
+./header_complex.lo: ../../include/net-snmp/library/data_list.h
+./header_complex.lo: ../../include/net-snmp/library/check_varbind.h
+./header_complex.lo: ../../include/net-snmp/library/container.h
+./header_complex.lo: ../../include/net-snmp/library/factory.h
+./header_complex.lo: ../../include/net-snmp/library/snmp_logging.h
+./header_complex.lo: ../../include/net-snmp/library/container_binary_array.h
+./header_complex.lo: ../../include/net-snmp/library/container_list_ssll.h
+./header_complex.lo: ../../include/net-snmp/library/container_iterator.h
+./header_complex.lo: ../../include/net-snmp/library/container.h
+./header_complex.lo: ../../include/net-snmp/library/snmp_assert.h
+./header_complex.lo: ../../include/net-snmp/version.h
 ./header_complex.lo: ../../include/net-snmp/config_api.h
 ./header_complex.lo: ../../include/net-snmp/library/read_config.h
 ./header_complex.lo: ../../include/net-snmp/library/default_store.h
@@ -115,32 +117,14 @@
 ./testhandler.lo: ../../include/net-snmp/net-snmp-includes.h
 ./testhandler.lo: ../../include/net-snmp/definitions.h
 ./testhandler.lo: ../../include/net-snmp/types.h
+./testhandler.lo: ../../include/net-snmp/library/types.h
 ./testhandler.lo: ../../include/net-snmp/library/snmp_api.h
-./testhandler.lo: ../../include/net-snmp/library/asn1.h
-./testhandler.lo: ../../include/net-snmp/library/snmp_impl.h
-./testhandler.lo: ../../include/net-snmp/library/snmp.h
-./testhandler.lo: ../../include/net-snmp/library/snmp-tc.h
-./testhandler.lo: ../../include/net-snmp/utilities.h
+./testhandler.lo: ../../include/net-snmp/varbind_api.h
 ./testhandler.lo: ../../include/net-snmp/library/snmp_client.h
-./testhandler.lo: ../../include/net-snmp/library/system.h
-./testhandler.lo: ../../include/net-snmp/library/tools.h
-./testhandler.lo: ../../include/net-snmp/library/int64.h
-./testhandler.lo: ../../include/net-snmp/library/mt_support.h
-./testhandler.lo: ../../include/net-snmp/library/snmp_alarm.h
-./testhandler.lo: ../../include/net-snmp/library/callback.h
-./testhandler.lo: ../../include/net-snmp/library/data_list.h
-./testhandler.lo: ../../include/net-snmp/library/oid_stash.h
-./testhandler.lo: ../../include/net-snmp/library/check_varbind.h
-./testhandler.lo: ../../include/net-snmp/library/container.h
-./testhandler.lo: ../../include/net-snmp/library/factory.h
-./testhandler.lo: ../../include/net-snmp/library/snmp_logging.h
-./testhandler.lo: ../../include/net-snmp/library/container_binary_array.h
-./testhandler.lo: ../../include/net-snmp/library/container_list_ssll.h
-./testhandler.lo: ../../include/net-snmp/library/container_iterator.h
-./testhandler.lo: ../../include/net-snmp/library/container.h
-./testhandler.lo: ../../include/net-snmp/library/snmp_assert.h
-./testhandler.lo: ../../include/net-snmp/version.h
+./testhandler.lo: ../../include/net-snmp/pdu_api.h
+./testhandler.lo: ../../include/net-snmp/library/asn1.h
 ./testhandler.lo: ../../include/net-snmp/session_api.h
+./testhandler.lo: ../../include/net-snmp/library/callback.h
 ./testhandler.lo: ../../include/net-snmp/library/snmp_transport.h
 ./testhandler.lo: ../../include/net-snmp/library/snmp_service.h
 ./testhandler.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -151,11 +135,31 @@
 ./testhandler.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./testhandler.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./testhandler.lo: ../../include/net-snmp/library/ucd_compat.h
-./testhandler.lo: ../../include/net-snmp/pdu_api.h
-./testhandler.lo: ../../include/net-snmp/mib_api.h
 ./testhandler.lo: ../../include/net-snmp/library/mib.h
+./testhandler.lo: ../../include/net-snmp/mib_api.h
 ./testhandler.lo: ../../include/net-snmp/library/parse.h
-./testhandler.lo: ../../include/net-snmp/varbind_api.h
+./testhandler.lo: ../../include/net-snmp/library/oid_stash.h
+./testhandler.lo: ../../include/net-snmp/library/snmp_impl.h
+./testhandler.lo: ../../include/net-snmp/library/snmp.h
+./testhandler.lo: ../../include/net-snmp/library/snmp-tc.h
+./testhandler.lo: ../../include/net-snmp/library/getopt.h
+./testhandler.lo: ../../include/net-snmp/utilities.h
+./testhandler.lo: ../../include/net-snmp/library/system.h
+./testhandler.lo: ../../include/net-snmp/library/tools.h
+./testhandler.lo: ../../include/net-snmp/library/int64.h
+./testhandler.lo: ../../include/net-snmp/library/mt_support.h
+./testhandler.lo: ../../include/net-snmp/library/snmp_alarm.h
+./testhandler.lo: ../../include/net-snmp/library/data_list.h
+./testhandler.lo: ../../include/net-snmp/library/check_varbind.h
+./testhandler.lo: ../../include/net-snmp/library/container.h
+./testhandler.lo: ../../include/net-snmp/library/factory.h
+./testhandler.lo: ../../include/net-snmp/library/snmp_logging.h
+./testhandler.lo: ../../include/net-snmp/library/container_binary_array.h
+./testhandler.lo: ../../include/net-snmp/library/container_list_ssll.h
+./testhandler.lo: ../../include/net-snmp/library/container_iterator.h
+./testhandler.lo: ../../include/net-snmp/library/container.h
+./testhandler.lo: ../../include/net-snmp/library/snmp_assert.h
+./testhandler.lo: ../../include/net-snmp/version.h
 ./testhandler.lo: ../../include/net-snmp/config_api.h
 ./testhandler.lo: ../../include/net-snmp/library/read_config.h
 ./testhandler.lo: ../../include/net-snmp/library/default_store.h
@@ -217,32 +221,14 @@
 ./util_funcs.lo: ../../include/net-snmp/net-snmp-includes.h
 ./util_funcs.lo: ../../include/net-snmp/definitions.h
 ./util_funcs.lo: ../../include/net-snmp/types.h
+./util_funcs.lo: ../../include/net-snmp/library/types.h
 ./util_funcs.lo: ../../include/net-snmp/library/snmp_api.h
-./util_funcs.lo: ../../include/net-snmp/library/asn1.h
-./util_funcs.lo: ../../include/net-snmp/library/snmp_impl.h
-./util_funcs.lo: ../../include/net-snmp/library/snmp.h
-./util_funcs.lo: ../../include/net-snmp/library/snmp-tc.h
-./util_funcs.lo: ../../include/net-snmp/utilities.h
+./util_funcs.lo: ../../include/net-snmp/varbind_api.h
 ./util_funcs.lo: ../../include/net-snmp/library/snmp_client.h
-./util_funcs.lo: ../../include/net-snmp/library/system.h
-./util_funcs.lo: ../../include/net-snmp/library/tools.h
-./util_funcs.lo: ../../include/net-snmp/library/int64.h
-./util_funcs.lo: ../../include/net-snmp/library/mt_support.h
-./util_funcs.lo: ../../include/net-snmp/library/snmp_alarm.h
-./util_funcs.lo: ../../include/net-snmp/library/callback.h
-./util_funcs.lo: ../../include/net-snmp/library/data_list.h
-./util_funcs.lo: ../../include/net-snmp/library/oid_stash.h
-./util_funcs.lo: ../../include/net-snmp/library/check_varbind.h
-./util_funcs.lo: ../../include/net-snmp/library/container.h
-./util_funcs.lo: ../../include/net-snmp/library/factory.h
-./util_funcs.lo: ../../include/net-snmp/library/snmp_logging.h
-./util_funcs.lo: ../../include/net-snmp/library/container_binary_array.h
-./util_funcs.lo: ../../include/net-snmp/library/container_list_ssll.h
-./util_funcs.lo: ../../include/net-snmp/library/container_iterator.h
-./util_funcs.lo: ../../include/net-snmp/library/container.h
-./util_funcs.lo: ../../include/net-snmp/library/snmp_assert.h
-./util_funcs.lo: ../../include/net-snmp/version.h
+./util_funcs.lo: ../../include/net-snmp/pdu_api.h
+./util_funcs.lo: ../../include/net-snmp/library/asn1.h
 ./util_funcs.lo: ../../include/net-snmp/session_api.h
+./util_funcs.lo: ../../include/net-snmp/library/callback.h
 ./util_funcs.lo: ../../include/net-snmp/library/snmp_transport.h
 ./util_funcs.lo: ../../include/net-snmp/library/snmp_service.h
 ./util_funcs.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -253,11 +239,31 @@
 ./util_funcs.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./util_funcs.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./util_funcs.lo: ../../include/net-snmp/library/ucd_compat.h
-./util_funcs.lo: ../../include/net-snmp/pdu_api.h
-./util_funcs.lo: ../../include/net-snmp/mib_api.h
 ./util_funcs.lo: ../../include/net-snmp/library/mib.h
+./util_funcs.lo: ../../include/net-snmp/mib_api.h
 ./util_funcs.lo: ../../include/net-snmp/library/parse.h
-./util_funcs.lo: ../../include/net-snmp/varbind_api.h
+./util_funcs.lo: ../../include/net-snmp/library/oid_stash.h
+./util_funcs.lo: ../../include/net-snmp/library/snmp_impl.h
+./util_funcs.lo: ../../include/net-snmp/library/snmp.h
+./util_funcs.lo: ../../include/net-snmp/library/snmp-tc.h
+./util_funcs.lo: ../../include/net-snmp/library/getopt.h
+./util_funcs.lo: ../../include/net-snmp/utilities.h
+./util_funcs.lo: ../../include/net-snmp/library/system.h
+./util_funcs.lo: ../../include/net-snmp/library/tools.h
+./util_funcs.lo: ../../include/net-snmp/library/int64.h
+./util_funcs.lo: ../../include/net-snmp/library/mt_support.h
+./util_funcs.lo: ../../include/net-snmp/library/snmp_alarm.h
+./util_funcs.lo: ../../include/net-snmp/library/data_list.h
+./util_funcs.lo: ../../include/net-snmp/library/check_varbind.h
+./util_funcs.lo: ../../include/net-snmp/library/container.h
+./util_funcs.lo: ../../include/net-snmp/library/factory.h
+./util_funcs.lo: ../../include/net-snmp/library/snmp_logging.h
+./util_funcs.lo: ../../include/net-snmp/library/container_binary_array.h
+./util_funcs.lo: ../../include/net-snmp/library/container_list_ssll.h
+./util_funcs.lo: ../../include/net-snmp/library/container_iterator.h
+./util_funcs.lo: ../../include/net-snmp/library/container.h
+./util_funcs.lo: ../../include/net-snmp/library/snmp_assert.h
+./util_funcs.lo: ../../include/net-snmp/version.h
 ./util_funcs.lo: ../../include/net-snmp/config_api.h
 ./util_funcs.lo: ../../include/net-snmp/library/read_config.h
 ./util_funcs.lo: ../../include/net-snmp/library/default_store.h
@@ -311,7 +317,8 @@
 ./util_funcs.lo: ../../include/net-snmp/agent/table_container.h
 ./util_funcs.lo: ../../include/net-snmp/agent/table_array.h
 ./util_funcs.lo: ../../include/net-snmp/agent/mfd.h struct.h util_funcs.h
-./util_funcs.lo: utilities/execute.h
+./util_funcs.lo: util_funcs/header_generic.h util_funcs/header_simple_table.h
+./util_funcs.lo: util_funcs/MIB_STATS_CACHE_TIMEOUT.h utilities/execute.h
 ./util_funcs.lo: ucd-snmp/errormib.h mibdefs.h
 ./winExtDLL.lo: ../../include/net-snmp/net-snmp-config.h
 ./winExtDLL.lo: ../../include/net-snmp/system/linux.h
@@ -319,625 +326,6 @@
 ./winExtDLL.lo: ../../include/net-snmp/system/generic.h
 ./winExtDLL.lo: ../../include/net-snmp/machine/generic.h
 ./winExtDLL.lo: ../../include/net-snmp/agent/mib_module_config.h
-./Rmon/agutil.lo: ../../include/net-snmp/net-snmp-config.h
-./Rmon/agutil.lo: ../../include/net-snmp/system/linux.h
-./Rmon/agutil.lo: ../../include/net-snmp/system/sysv.h
-./Rmon/agutil.lo: ../../include/net-snmp/system/generic.h
-./Rmon/agutil.lo: ../../include/net-snmp/machine/generic.h
-./Rmon/agutil.lo: ../../include/net-snmp/net-snmp-includes.h
-./Rmon/agutil.lo: ../../include/net-snmp/definitions.h
-./Rmon/agutil.lo: ../../include/net-snmp/types.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_api.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/asn1.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_impl.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmp.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmp-tc.h
-./Rmon/agutil.lo: ../../include/net-snmp/utilities.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_client.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/system.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/tools.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/int64.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/mt_support.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_alarm.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/callback.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/data_list.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/oid_stash.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/check_varbind.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/container.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/factory.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_logging.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/container_binary_array.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/container_list_ssll.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/container_iterator.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/container.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_assert.h
-./Rmon/agutil.lo: ../../include/net-snmp/version.h
-./Rmon/agutil.lo: ../../include/net-snmp/session_api.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_transport.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_service.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmpUnixDomain.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmpUDPDomain.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmpTCPDomain.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmpIPXDomain.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/ucd_compat.h
-./Rmon/agutil.lo: ../../include/net-snmp/pdu_api.h
-./Rmon/agutil.lo: ../../include/net-snmp/mib_api.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/mib.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/parse.h
-./Rmon/agutil.lo: ../../include/net-snmp/varbind_api.h
-./Rmon/agutil.lo: ../../include/net-snmp/config_api.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/read_config.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/default_store.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_parse_args.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_enum.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/vacm.h
-./Rmon/agutil.lo: ../../include/net-snmp/output_api.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_debug.h
-./Rmon/agutil.lo: ../../include/net-snmp/snmpv3_api.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmpv3.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/transform_oids.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/keytools.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/scapi.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/lcd_time.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_secmod.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/snmpusm.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/mib_module_config.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/agent_module_config.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/snmp_agent.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/snmp_vars.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/agent_handler.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/var_struct.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/agent_registry.h
-./Rmon/agutil.lo: ../../include/net-snmp/library/fd_event_manager.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/ds_agent.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/agent_read_config.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/agent_trap.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/all_helpers.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/instance.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/baby_steps.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/scalar.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/scalar_group.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/watcher.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/multiplexer.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/null.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/debug_handler.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/cache_handler.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/old_api.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/read_only.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/row_merge.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/serialize.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/bulk_to_next.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/mode_end_call.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/table.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/table_data.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/table_dataset.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/table_tdata.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/table_iterator.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/table_container.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/table_array.h
-./Rmon/agutil.lo: ../../include/net-snmp/agent/mfd.h util_funcs.h struct.h
-./Rmon/agutil.lo: ./Rmon/agutil.h ./Rmon/agutil_api.h
-./Rmon/alarm.lo: ../../include/net-snmp/net-snmp-config.h
-./Rmon/alarm.lo: ../../include/net-snmp/system/linux.h
-./Rmon/alarm.lo: ../../include/net-snmp/system/sysv.h
-./Rmon/alarm.lo: ../../include/net-snmp/system/generic.h
-./Rmon/alarm.lo: ../../include/net-snmp/machine/generic.h
-./Rmon/alarm.lo: ../../include/net-snmp/net-snmp-includes.h
-./Rmon/alarm.lo: ../../include/net-snmp/definitions.h
-./Rmon/alarm.lo: ../../include/net-snmp/types.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_api.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/asn1.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_impl.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmp.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmp-tc.h
-./Rmon/alarm.lo: ../../include/net-snmp/utilities.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_client.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/system.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/tools.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/int64.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/mt_support.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_alarm.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/callback.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/data_list.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/oid_stash.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/check_varbind.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/container.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/factory.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_logging.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/container_binary_array.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/container_list_ssll.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/container_iterator.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/container.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_assert.h
-./Rmon/alarm.lo: ../../include/net-snmp/version.h
-./Rmon/alarm.lo: ../../include/net-snmp/session_api.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_transport.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_service.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmpUnixDomain.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmpUDPDomain.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmpTCPDomain.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmpIPXDomain.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/ucd_compat.h
-./Rmon/alarm.lo: ../../include/net-snmp/pdu_api.h
-./Rmon/alarm.lo: ../../include/net-snmp/mib_api.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/mib.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/parse.h
-./Rmon/alarm.lo: ../../include/net-snmp/varbind_api.h
-./Rmon/alarm.lo: ../../include/net-snmp/config_api.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/read_config.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/default_store.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_parse_args.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_enum.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/vacm.h
-./Rmon/alarm.lo: ../../include/net-snmp/output_api.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_debug.h
-./Rmon/alarm.lo: ../../include/net-snmp/snmpv3_api.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmpv3.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/transform_oids.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/keytools.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/scapi.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/lcd_time.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_secmod.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/snmpusm.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/mib_module_config.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/agent_module_config.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/snmp_agent.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/snmp_vars.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/agent_handler.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/var_struct.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/agent_registry.h
-./Rmon/alarm.lo: ../../include/net-snmp/library/fd_event_manager.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/ds_agent.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/agent_read_config.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/agent_trap.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/all_helpers.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/instance.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/baby_steps.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/scalar.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/scalar_group.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/watcher.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/multiplexer.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/null.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/debug_handler.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/cache_handler.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/old_api.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/read_only.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/row_merge.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/serialize.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/bulk_to_next.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/mode_end_call.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/table.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/table_data.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/table_dataset.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/table_tdata.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/table_iterator.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/table_container.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/table_array.h
-./Rmon/alarm.lo: ../../include/net-snmp/agent/mfd.h util_funcs.h struct.h
-./Rmon/alarm.lo: ./Rmon/alarm.h ./Rmon/agutil_api.h ./Rmon/row_api.h
-./Rmon/event.lo: ../../include/net-snmp/net-snmp-config.h
-./Rmon/event.lo: ../../include/net-snmp/system/linux.h
-./Rmon/event.lo: ../../include/net-snmp/system/sysv.h
-./Rmon/event.lo: ../../include/net-snmp/system/generic.h
-./Rmon/event.lo: ../../include/net-snmp/machine/generic.h
-./Rmon/event.lo: ../../include/net-snmp/net-snmp-includes.h
-./Rmon/event.lo: ../../include/net-snmp/definitions.h
-./Rmon/event.lo: ../../include/net-snmp/types.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmp_api.h
-./Rmon/event.lo: ../../include/net-snmp/library/asn1.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmp_impl.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmp.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmp-tc.h
-./Rmon/event.lo: ../../include/net-snmp/utilities.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmp_client.h
-./Rmon/event.lo: ../../include/net-snmp/library/system.h
-./Rmon/event.lo: ../../include/net-snmp/library/tools.h
-./Rmon/event.lo: ../../include/net-snmp/library/int64.h
-./Rmon/event.lo: ../../include/net-snmp/library/mt_support.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmp_alarm.h
-./Rmon/event.lo: ../../include/net-snmp/library/callback.h
-./Rmon/event.lo: ../../include/net-snmp/library/data_list.h
-./Rmon/event.lo: ../../include/net-snmp/library/oid_stash.h
-./Rmon/event.lo: ../../include/net-snmp/library/check_varbind.h
-./Rmon/event.lo: ../../include/net-snmp/library/container.h
-./Rmon/event.lo: ../../include/net-snmp/library/factory.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmp_logging.h
-./Rmon/event.lo: ../../include/net-snmp/library/container_binary_array.h
-./Rmon/event.lo: ../../include/net-snmp/library/container_list_ssll.h
-./Rmon/event.lo: ../../include/net-snmp/library/container_iterator.h
-./Rmon/event.lo: ../../include/net-snmp/library/container.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmp_assert.h
-./Rmon/event.lo: ../../include/net-snmp/version.h
-./Rmon/event.lo: ../../include/net-snmp/session_api.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmp_transport.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmp_service.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmpUnixDomain.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmpUDPDomain.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmpTCPDomain.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmpIPXDomain.h
-./Rmon/event.lo: ../../include/net-snmp/library/ucd_compat.h
-./Rmon/event.lo: ../../include/net-snmp/pdu_api.h
-./Rmon/event.lo: ../../include/net-snmp/mib_api.h
-./Rmon/event.lo: ../../include/net-snmp/library/mib.h
-./Rmon/event.lo: ../../include/net-snmp/library/parse.h
-./Rmon/event.lo: ../../include/net-snmp/varbind_api.h
-./Rmon/event.lo: ../../include/net-snmp/config_api.h
-./Rmon/event.lo: ../../include/net-snmp/library/read_config.h
-./Rmon/event.lo: ../../include/net-snmp/library/default_store.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmp_parse_args.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmp_enum.h
-./Rmon/event.lo: ../../include/net-snmp/library/vacm.h
-./Rmon/event.lo: ../../include/net-snmp/output_api.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmp_debug.h
-./Rmon/event.lo: ../../include/net-snmp/snmpv3_api.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmpv3.h
-./Rmon/event.lo: ../../include/net-snmp/library/transform_oids.h
-./Rmon/event.lo: ../../include/net-snmp/library/keytools.h
-./Rmon/event.lo: ../../include/net-snmp/library/scapi.h
-./Rmon/event.lo: ../../include/net-snmp/library/lcd_time.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmp_secmod.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
-./Rmon/event.lo: ../../include/net-snmp/library/snmpusm.h
-./Rmon/event.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
-./Rmon/event.lo: ../../include/net-snmp/agent/mib_module_config.h
-./Rmon/event.lo: ../../include/net-snmp/agent/agent_module_config.h
-./Rmon/event.lo: ../../include/net-snmp/agent/snmp_agent.h
-./Rmon/event.lo: ../../include/net-snmp/agent/snmp_vars.h
-./Rmon/event.lo: ../../include/net-snmp/agent/agent_handler.h
-./Rmon/event.lo: ../../include/net-snmp/agent/var_struct.h
-./Rmon/event.lo: ../../include/net-snmp/agent/agent_registry.h
-./Rmon/event.lo: ../../include/net-snmp/library/fd_event_manager.h
-./Rmon/event.lo: ../../include/net-snmp/agent/ds_agent.h
-./Rmon/event.lo: ../../include/net-snmp/agent/agent_read_config.h
-./Rmon/event.lo: ../../include/net-snmp/agent/agent_trap.h
-./Rmon/event.lo: ../../include/net-snmp/agent/all_helpers.h
-./Rmon/event.lo: ../../include/net-snmp/agent/instance.h
-./Rmon/event.lo: ../../include/net-snmp/agent/baby_steps.h
-./Rmon/event.lo: ../../include/net-snmp/agent/scalar.h
-./Rmon/event.lo: ../../include/net-snmp/agent/scalar_group.h
-./Rmon/event.lo: ../../include/net-snmp/agent/watcher.h
-./Rmon/event.lo: ../../include/net-snmp/agent/multiplexer.h
-./Rmon/event.lo: ../../include/net-snmp/agent/null.h
-./Rmon/event.lo: ../../include/net-snmp/agent/debug_handler.h
-./Rmon/event.lo: ../../include/net-snmp/agent/cache_handler.h
-./Rmon/event.lo: ../../include/net-snmp/agent/old_api.h
-./Rmon/event.lo: ../../include/net-snmp/agent/read_only.h
-./Rmon/event.lo: ../../include/net-snmp/agent/row_merge.h
-./Rmon/event.lo: ../../include/net-snmp/agent/serialize.h
-./Rmon/event.lo: ../../include/net-snmp/agent/bulk_to_next.h
-./Rmon/event.lo: ../../include/net-snmp/agent/mode_end_call.h
-./Rmon/event.lo: ../../include/net-snmp/agent/table.h
-./Rmon/event.lo: ../../include/net-snmp/agent/table_data.h
-./Rmon/event.lo: ../../include/net-snmp/agent/table_dataset.h
-./Rmon/event.lo: ../../include/net-snmp/agent/table_tdata.h
-./Rmon/event.lo: ../../include/net-snmp/agent/table_iterator.h
-./Rmon/event.lo: ../../include/net-snmp/agent/table_container.h
-./Rmon/event.lo: ../../include/net-snmp/agent/table_array.h
-./Rmon/event.lo: ../../include/net-snmp/agent/mfd.h util_funcs.h struct.h
-./Rmon/event.lo: ./Rmon/event.h ./Rmon/agutil_api.h ./Rmon/row_api.h
-./Rmon/history.lo: ../../include/net-snmp/net-snmp-config.h
-./Rmon/history.lo: ../../include/net-snmp/system/linux.h
-./Rmon/history.lo: ../../include/net-snmp/system/sysv.h
-./Rmon/history.lo: ../../include/net-snmp/system/generic.h
-./Rmon/history.lo: ../../include/net-snmp/machine/generic.h
-./Rmon/history.lo: ../../include/net-snmp/net-snmp-includes.h
-./Rmon/history.lo: ../../include/net-snmp/definitions.h
-./Rmon/history.lo: ../../include/net-snmp/types.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmp_api.h
-./Rmon/history.lo: ../../include/net-snmp/library/asn1.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmp_impl.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmp.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmp-tc.h
-./Rmon/history.lo: ../../include/net-snmp/utilities.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmp_client.h
-./Rmon/history.lo: ../../include/net-snmp/library/system.h
-./Rmon/history.lo: ../../include/net-snmp/library/tools.h
-./Rmon/history.lo: ../../include/net-snmp/library/int64.h
-./Rmon/history.lo: ../../include/net-snmp/library/mt_support.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmp_alarm.h
-./Rmon/history.lo: ../../include/net-snmp/library/callback.h
-./Rmon/history.lo: ../../include/net-snmp/library/data_list.h
-./Rmon/history.lo: ../../include/net-snmp/library/oid_stash.h
-./Rmon/history.lo: ../../include/net-snmp/library/check_varbind.h
-./Rmon/history.lo: ../../include/net-snmp/library/container.h
-./Rmon/history.lo: ../../include/net-snmp/library/factory.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmp_logging.h
-./Rmon/history.lo: ../../include/net-snmp/library/container_binary_array.h
-./Rmon/history.lo: ../../include/net-snmp/library/container_list_ssll.h
-./Rmon/history.lo: ../../include/net-snmp/library/container_iterator.h
-./Rmon/history.lo: ../../include/net-snmp/library/container.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmp_assert.h
-./Rmon/history.lo: ../../include/net-snmp/version.h
-./Rmon/history.lo: ../../include/net-snmp/session_api.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmp_transport.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmp_service.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmpUnixDomain.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmpUDPDomain.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmpTCPDomain.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmpIPXDomain.h
-./Rmon/history.lo: ../../include/net-snmp/library/ucd_compat.h
-./Rmon/history.lo: ../../include/net-snmp/pdu_api.h
-./Rmon/history.lo: ../../include/net-snmp/mib_api.h
-./Rmon/history.lo: ../../include/net-snmp/library/mib.h
-./Rmon/history.lo: ../../include/net-snmp/library/parse.h
-./Rmon/history.lo: ../../include/net-snmp/varbind_api.h
-./Rmon/history.lo: ../../include/net-snmp/config_api.h
-./Rmon/history.lo: ../../include/net-snmp/library/read_config.h
-./Rmon/history.lo: ../../include/net-snmp/library/default_store.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmp_parse_args.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmp_enum.h
-./Rmon/history.lo: ../../include/net-snmp/library/vacm.h
-./Rmon/history.lo: ../../include/net-snmp/output_api.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmp_debug.h
-./Rmon/history.lo: ../../include/net-snmp/snmpv3_api.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmpv3.h
-./Rmon/history.lo: ../../include/net-snmp/library/transform_oids.h
-./Rmon/history.lo: ../../include/net-snmp/library/keytools.h
-./Rmon/history.lo: ../../include/net-snmp/library/scapi.h
-./Rmon/history.lo: ../../include/net-snmp/library/lcd_time.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmp_secmod.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
-./Rmon/history.lo: ../../include/net-snmp/library/snmpusm.h
-./Rmon/history.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
-./Rmon/history.lo: ../../include/net-snmp/agent/mib_module_config.h
-./Rmon/history.lo: ../../include/net-snmp/agent/agent_module_config.h
-./Rmon/history.lo: ../../include/net-snmp/agent/snmp_agent.h
-./Rmon/history.lo: ../../include/net-snmp/agent/snmp_vars.h
-./Rmon/history.lo: ../../include/net-snmp/agent/agent_handler.h
-./Rmon/history.lo: ../../include/net-snmp/agent/var_struct.h
-./Rmon/history.lo: ../../include/net-snmp/agent/agent_registry.h
-./Rmon/history.lo: ../../include/net-snmp/library/fd_event_manager.h
-./Rmon/history.lo: ../../include/net-snmp/agent/ds_agent.h
-./Rmon/history.lo: ../../include/net-snmp/agent/agent_read_config.h
-./Rmon/history.lo: ../../include/net-snmp/agent/agent_trap.h
-./Rmon/history.lo: ../../include/net-snmp/agent/all_helpers.h
-./Rmon/history.lo: ../../include/net-snmp/agent/instance.h
-./Rmon/history.lo: ../../include/net-snmp/agent/baby_steps.h
-./Rmon/history.lo: ../../include/net-snmp/agent/scalar.h
-./Rmon/history.lo: ../../include/net-snmp/agent/scalar_group.h
-./Rmon/history.lo: ../../include/net-snmp/agent/watcher.h
-./Rmon/history.lo: ../../include/net-snmp/agent/multiplexer.h
-./Rmon/history.lo: ../../include/net-snmp/agent/null.h
-./Rmon/history.lo: ../../include/net-snmp/agent/debug_handler.h
-./Rmon/history.lo: ../../include/net-snmp/agent/cache_handler.h
-./Rmon/history.lo: ../../include/net-snmp/agent/old_api.h
-./Rmon/history.lo: ../../include/net-snmp/agent/read_only.h
-./Rmon/history.lo: ../../include/net-snmp/agent/row_merge.h
-./Rmon/history.lo: ../../include/net-snmp/agent/serialize.h
-./Rmon/history.lo: ../../include/net-snmp/agent/bulk_to_next.h
-./Rmon/history.lo: ../../include/net-snmp/agent/mode_end_call.h
-./Rmon/history.lo: ../../include/net-snmp/agent/table.h
-./Rmon/history.lo: ../../include/net-snmp/agent/table_data.h
-./Rmon/history.lo: ../../include/net-snmp/agent/table_dataset.h
-./Rmon/history.lo: ../../include/net-snmp/agent/table_tdata.h
-./Rmon/history.lo: ../../include/net-snmp/agent/table_iterator.h
-./Rmon/history.lo: ../../include/net-snmp/agent/table_container.h
-./Rmon/history.lo: ../../include/net-snmp/agent/table_array.h
-./Rmon/history.lo: ../../include/net-snmp/agent/mfd.h util_funcs.h struct.h
-./Rmon/history.lo: ./Rmon/history.h ./Rmon/agutil_api.h ./Rmon/row_api.h
-./Rmon/rows.lo: ../../include/net-snmp/net-snmp-config.h
-./Rmon/rows.lo: ../../include/net-snmp/system/linux.h
-./Rmon/rows.lo: ../../include/net-snmp/system/sysv.h
-./Rmon/rows.lo: ../../include/net-snmp/system/generic.h
-./Rmon/rows.lo: ../../include/net-snmp/machine/generic.h
-./Rmon/rows.lo: ../../include/net-snmp/net-snmp-includes.h
-./Rmon/rows.lo: ../../include/net-snmp/definitions.h
-./Rmon/rows.lo: ../../include/net-snmp/types.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmp_api.h
-./Rmon/rows.lo: ../../include/net-snmp/library/asn1.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmp_impl.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmp.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmp-tc.h
-./Rmon/rows.lo: ../../include/net-snmp/utilities.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmp_client.h
-./Rmon/rows.lo: ../../include/net-snmp/library/system.h
-./Rmon/rows.lo: ../../include/net-snmp/library/tools.h
-./Rmon/rows.lo: ../../include/net-snmp/library/int64.h
-./Rmon/rows.lo: ../../include/net-snmp/library/mt_support.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmp_alarm.h
-./Rmon/rows.lo: ../../include/net-snmp/library/callback.h
-./Rmon/rows.lo: ../../include/net-snmp/library/data_list.h
-./Rmon/rows.lo: ../../include/net-snmp/library/oid_stash.h
-./Rmon/rows.lo: ../../include/net-snmp/library/check_varbind.h
-./Rmon/rows.lo: ../../include/net-snmp/library/container.h
-./Rmon/rows.lo: ../../include/net-snmp/library/factory.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmp_logging.h
-./Rmon/rows.lo: ../../include/net-snmp/library/container_binary_array.h
-./Rmon/rows.lo: ../../include/net-snmp/library/container_list_ssll.h
-./Rmon/rows.lo: ../../include/net-snmp/library/container_iterator.h
-./Rmon/rows.lo: ../../include/net-snmp/library/container.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmp_assert.h
-./Rmon/rows.lo: ../../include/net-snmp/version.h
-./Rmon/rows.lo: ../../include/net-snmp/session_api.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmp_transport.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmp_service.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmpUnixDomain.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmpUDPDomain.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmpTCPDomain.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmpIPXDomain.h
-./Rmon/rows.lo: ../../include/net-snmp/library/ucd_compat.h
-./Rmon/rows.lo: ../../include/net-snmp/pdu_api.h
-./Rmon/rows.lo: ../../include/net-snmp/mib_api.h
-./Rmon/rows.lo: ../../include/net-snmp/library/mib.h
-./Rmon/rows.lo: ../../include/net-snmp/library/parse.h
-./Rmon/rows.lo: ../../include/net-snmp/varbind_api.h
-./Rmon/rows.lo: ../../include/net-snmp/config_api.h
-./Rmon/rows.lo: ../../include/net-snmp/library/read_config.h
-./Rmon/rows.lo: ../../include/net-snmp/library/default_store.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmp_parse_args.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmp_enum.h
-./Rmon/rows.lo: ../../include/net-snmp/library/vacm.h
-./Rmon/rows.lo: ../../include/net-snmp/output_api.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmp_debug.h
-./Rmon/rows.lo: ../../include/net-snmp/snmpv3_api.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmpv3.h
-./Rmon/rows.lo: ../../include/net-snmp/library/transform_oids.h
-./Rmon/rows.lo: ../../include/net-snmp/library/keytools.h
-./Rmon/rows.lo: ../../include/net-snmp/library/scapi.h
-./Rmon/rows.lo: ../../include/net-snmp/library/lcd_time.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmp_secmod.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
-./Rmon/rows.lo: ../../include/net-snmp/library/snmpusm.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/mib_module_config.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/agent_module_config.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/snmp_agent.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/snmp_vars.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/agent_handler.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/var_struct.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/agent_registry.h
-./Rmon/rows.lo: ../../include/net-snmp/library/fd_event_manager.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/ds_agent.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/agent_read_config.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/agent_trap.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/all_helpers.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/instance.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/baby_steps.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/scalar.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/scalar_group.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/watcher.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/multiplexer.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/null.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/debug_handler.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/cache_handler.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/old_api.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/read_only.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/row_merge.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/serialize.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/bulk_to_next.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/mode_end_call.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/table.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/table_data.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/table_dataset.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/table_tdata.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/table_iterator.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/table_container.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/table_array.h
-./Rmon/rows.lo: ../../include/net-snmp/agent/mfd.h util_funcs.h struct.h
-./Rmon/rows.lo: ./Rmon/agutil_api.h ./Rmon/rows.h ./Rmon/row_api.h
-./Rmon/statistics.lo: ../../include/net-snmp/net-snmp-config.h
-./Rmon/statistics.lo: ../../include/net-snmp/system/linux.h
-./Rmon/statistics.lo: ../../include/net-snmp/system/sysv.h
-./Rmon/statistics.lo: ../../include/net-snmp/system/generic.h
-./Rmon/statistics.lo: ../../include/net-snmp/machine/generic.h
-./Rmon/statistics.lo: ../../include/net-snmp/net-snmp-includes.h
-./Rmon/statistics.lo: ../../include/net-snmp/definitions.h
-./Rmon/statistics.lo: ../../include/net-snmp/types.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_api.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/asn1.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_impl.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmp.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmp-tc.h
-./Rmon/statistics.lo: ../../include/net-snmp/utilities.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_client.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/system.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/tools.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/int64.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/mt_support.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_alarm.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/callback.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/data_list.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/oid_stash.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/check_varbind.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/container.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/factory.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_logging.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/container_binary_array.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/container_list_ssll.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/container_iterator.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/container.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_assert.h
-./Rmon/statistics.lo: ../../include/net-snmp/version.h
-./Rmon/statistics.lo: ../../include/net-snmp/session_api.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_transport.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_service.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmpUnixDomain.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmpUDPDomain.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmpTCPDomain.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmpIPXDomain.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/ucd_compat.h
-./Rmon/statistics.lo: ../../include/net-snmp/pdu_api.h
-./Rmon/statistics.lo: ../../include/net-snmp/mib_api.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/mib.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/parse.h
-./Rmon/statistics.lo: ../../include/net-snmp/varbind_api.h
-./Rmon/statistics.lo: ../../include/net-snmp/config_api.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/read_config.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/default_store.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_parse_args.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_enum.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/vacm.h
-./Rmon/statistics.lo: ../../include/net-snmp/output_api.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_debug.h
-./Rmon/statistics.lo: ../../include/net-snmp/snmpv3_api.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmpv3.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/transform_oids.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/keytools.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/scapi.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/lcd_time.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_secmod.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/snmpusm.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/mib_module_config.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/agent_module_config.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/snmp_agent.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/snmp_vars.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/agent_handler.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/var_struct.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/agent_registry.h
-./Rmon/statistics.lo: ../../include/net-snmp/library/fd_event_manager.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/ds_agent.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/agent_read_config.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/agent_trap.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/all_helpers.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/instance.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/baby_steps.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/scalar.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/scalar_group.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/watcher.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/multiplexer.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/null.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/debug_handler.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/cache_handler.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/old_api.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/read_only.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/row_merge.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/serialize.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/bulk_to_next.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/mode_end_call.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/table.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/table_data.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/table_dataset.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/table_tdata.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/table_iterator.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/table_container.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/table_array.h
-./Rmon/statistics.lo: ../../include/net-snmp/agent/mfd.h util_funcs.h
-./Rmon/statistics.lo: struct.h ./Rmon/statistics.h ./Rmon/agutil_api.h
-./Rmon/statistics.lo: ./Rmon/row_api.h
 ./agent/extend.lo: ../../include/net-snmp/net-snmp-config.h
 ./agent/extend.lo: ../../include/net-snmp/system/linux.h
 ./agent/extend.lo: ../../include/net-snmp/system/sysv.h
@@ -946,32 +334,14 @@
 ./agent/extend.lo: ../../include/net-snmp/net-snmp-includes.h
 ./agent/extend.lo: ../../include/net-snmp/definitions.h
 ./agent/extend.lo: ../../include/net-snmp/types.h
+./agent/extend.lo: ../../include/net-snmp/library/types.h
 ./agent/extend.lo: ../../include/net-snmp/library/snmp_api.h
-./agent/extend.lo: ../../include/net-snmp/library/asn1.h
-./agent/extend.lo: ../../include/net-snmp/library/snmp_impl.h
-./agent/extend.lo: ../../include/net-snmp/library/snmp.h
-./agent/extend.lo: ../../include/net-snmp/library/snmp-tc.h
-./agent/extend.lo: ../../include/net-snmp/utilities.h
+./agent/extend.lo: ../../include/net-snmp/varbind_api.h
 ./agent/extend.lo: ../../include/net-snmp/library/snmp_client.h
-./agent/extend.lo: ../../include/net-snmp/library/system.h
-./agent/extend.lo: ../../include/net-snmp/library/tools.h
-./agent/extend.lo: ../../include/net-snmp/library/int64.h
-./agent/extend.lo: ../../include/net-snmp/library/mt_support.h
-./agent/extend.lo: ../../include/net-snmp/library/snmp_alarm.h
-./agent/extend.lo: ../../include/net-snmp/library/callback.h
-./agent/extend.lo: ../../include/net-snmp/library/data_list.h
-./agent/extend.lo: ../../include/net-snmp/library/oid_stash.h
-./agent/extend.lo: ../../include/net-snmp/library/check_varbind.h
-./agent/extend.lo: ../../include/net-snmp/library/container.h
-./agent/extend.lo: ../../include/net-snmp/library/factory.h
-./agent/extend.lo: ../../include/net-snmp/library/snmp_logging.h
-./agent/extend.lo: ../../include/net-snmp/library/container_binary_array.h
-./agent/extend.lo: ../../include/net-snmp/library/container_list_ssll.h
-./agent/extend.lo: ../../include/net-snmp/library/container_iterator.h
-./agent/extend.lo: ../../include/net-snmp/library/container.h
-./agent/extend.lo: ../../include/net-snmp/library/snmp_assert.h
-./agent/extend.lo: ../../include/net-snmp/version.h
+./agent/extend.lo: ../../include/net-snmp/pdu_api.h
+./agent/extend.lo: ../../include/net-snmp/library/asn1.h
 ./agent/extend.lo: ../../include/net-snmp/session_api.h
+./agent/extend.lo: ../../include/net-snmp/library/callback.h
 ./agent/extend.lo: ../../include/net-snmp/library/snmp_transport.h
 ./agent/extend.lo: ../../include/net-snmp/library/snmp_service.h
 ./agent/extend.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -982,11 +352,31 @@
 ./agent/extend.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./agent/extend.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./agent/extend.lo: ../../include/net-snmp/library/ucd_compat.h
-./agent/extend.lo: ../../include/net-snmp/pdu_api.h
-./agent/extend.lo: ../../include/net-snmp/mib_api.h
 ./agent/extend.lo: ../../include/net-snmp/library/mib.h
+./agent/extend.lo: ../../include/net-snmp/mib_api.h
 ./agent/extend.lo: ../../include/net-snmp/library/parse.h
-./agent/extend.lo: ../../include/net-snmp/varbind_api.h
+./agent/extend.lo: ../../include/net-snmp/library/oid_stash.h
+./agent/extend.lo: ../../include/net-snmp/library/snmp_impl.h
+./agent/extend.lo: ../../include/net-snmp/library/snmp.h
+./agent/extend.lo: ../../include/net-snmp/library/snmp-tc.h
+./agent/extend.lo: ../../include/net-snmp/library/getopt.h
+./agent/extend.lo: ../../include/net-snmp/utilities.h
+./agent/extend.lo: ../../include/net-snmp/library/system.h
+./agent/extend.lo: ../../include/net-snmp/library/tools.h
+./agent/extend.lo: ../../include/net-snmp/library/int64.h
+./agent/extend.lo: ../../include/net-snmp/library/mt_support.h
+./agent/extend.lo: ../../include/net-snmp/library/snmp_alarm.h
+./agent/extend.lo: ../../include/net-snmp/library/data_list.h
+./agent/extend.lo: ../../include/net-snmp/library/check_varbind.h
+./agent/extend.lo: ../../include/net-snmp/library/container.h
+./agent/extend.lo: ../../include/net-snmp/library/factory.h
+./agent/extend.lo: ../../include/net-snmp/library/snmp_logging.h
+./agent/extend.lo: ../../include/net-snmp/library/container_binary_array.h
+./agent/extend.lo: ../../include/net-snmp/library/container_list_ssll.h
+./agent/extend.lo: ../../include/net-snmp/library/container_iterator.h
+./agent/extend.lo: ../../include/net-snmp/library/container.h
+./agent/extend.lo: ../../include/net-snmp/library/snmp_assert.h
+./agent/extend.lo: ../../include/net-snmp/version.h
 ./agent/extend.lo: ../../include/net-snmp/config_api.h
 ./agent/extend.lo: ../../include/net-snmp/library/read_config.h
 ./agent/extend.lo: ../../include/net-snmp/library/default_store.h
@@ -1041,8 +431,8 @@
 ./agent/extend.lo: ../../include/net-snmp/agent/table_array.h
 ./agent/extend.lo: ../../include/net-snmp/agent/mfd.h
 ./agent/extend.lo: ../../include/net-snmp/agent/agent_callbacks.h
-./agent/extend.lo: agent/extend.h utilities/execute.h struct.h util_funcs.h
-./agent/extend.lo: mibdefs.h
+./agent/extend.lo: agent/extend.h utilities/execute.h struct.h
+./agent/extend.lo: util_funcs/header_simple_table.h mibdefs.h
 ./agent/nsCache.lo: ../../include/net-snmp/net-snmp-config.h
 ./agent/nsCache.lo: ../../include/net-snmp/system/linux.h
 ./agent/nsCache.lo: ../../include/net-snmp/system/sysv.h
@@ -1051,32 +441,14 @@
 ./agent/nsCache.lo: ../../include/net-snmp/net-snmp-includes.h
 ./agent/nsCache.lo: ../../include/net-snmp/definitions.h
 ./agent/nsCache.lo: ../../include/net-snmp/types.h
+./agent/nsCache.lo: ../../include/net-snmp/library/types.h
 ./agent/nsCache.lo: ../../include/net-snmp/library/snmp_api.h
-./agent/nsCache.lo: ../../include/net-snmp/library/asn1.h
-./agent/nsCache.lo: ../../include/net-snmp/library/snmp_impl.h
-./agent/nsCache.lo: ../../include/net-snmp/library/snmp.h
-./agent/nsCache.lo: ../../include/net-snmp/library/snmp-tc.h
-./agent/nsCache.lo: ../../include/net-snmp/utilities.h
+./agent/nsCache.lo: ../../include/net-snmp/varbind_api.h
 ./agent/nsCache.lo: ../../include/net-snmp/library/snmp_client.h
-./agent/nsCache.lo: ../../include/net-snmp/library/system.h
-./agent/nsCache.lo: ../../include/net-snmp/library/tools.h
-./agent/nsCache.lo: ../../include/net-snmp/library/int64.h
-./agent/nsCache.lo: ../../include/net-snmp/library/mt_support.h
-./agent/nsCache.lo: ../../include/net-snmp/library/snmp_alarm.h
-./agent/nsCache.lo: ../../include/net-snmp/library/callback.h
-./agent/nsCache.lo: ../../include/net-snmp/library/data_list.h
-./agent/nsCache.lo: ../../include/net-snmp/library/oid_stash.h
-./agent/nsCache.lo: ../../include/net-snmp/library/check_varbind.h
-./agent/nsCache.lo: ../../include/net-snmp/library/container.h
-./agent/nsCache.lo: ../../include/net-snmp/library/factory.h
-./agent/nsCache.lo: ../../include/net-snmp/library/snmp_logging.h
-./agent/nsCache.lo: ../../include/net-snmp/library/container_binary_array.h
-./agent/nsCache.lo: ../../include/net-snmp/library/container_list_ssll.h
-./agent/nsCache.lo: ../../include/net-snmp/library/container_iterator.h
-./agent/nsCache.lo: ../../include/net-snmp/library/container.h
-./agent/nsCache.lo: ../../include/net-snmp/library/snmp_assert.h
-./agent/nsCache.lo: ../../include/net-snmp/version.h
+./agent/nsCache.lo: ../../include/net-snmp/pdu_api.h
+./agent/nsCache.lo: ../../include/net-snmp/library/asn1.h
 ./agent/nsCache.lo: ../../include/net-snmp/session_api.h
+./agent/nsCache.lo: ../../include/net-snmp/library/callback.h
 ./agent/nsCache.lo: ../../include/net-snmp/library/snmp_transport.h
 ./agent/nsCache.lo: ../../include/net-snmp/library/snmp_service.h
 ./agent/nsCache.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -1087,11 +459,31 @@
 ./agent/nsCache.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./agent/nsCache.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./agent/nsCache.lo: ../../include/net-snmp/library/ucd_compat.h
-./agent/nsCache.lo: ../../include/net-snmp/pdu_api.h
-./agent/nsCache.lo: ../../include/net-snmp/mib_api.h
 ./agent/nsCache.lo: ../../include/net-snmp/library/mib.h
+./agent/nsCache.lo: ../../include/net-snmp/mib_api.h
 ./agent/nsCache.lo: ../../include/net-snmp/library/parse.h
-./agent/nsCache.lo: ../../include/net-snmp/varbind_api.h
+./agent/nsCache.lo: ../../include/net-snmp/library/oid_stash.h
+./agent/nsCache.lo: ../../include/net-snmp/library/snmp_impl.h
+./agent/nsCache.lo: ../../include/net-snmp/library/snmp.h
+./agent/nsCache.lo: ../../include/net-snmp/library/snmp-tc.h
+./agent/nsCache.lo: ../../include/net-snmp/library/getopt.h
+./agent/nsCache.lo: ../../include/net-snmp/utilities.h
+./agent/nsCache.lo: ../../include/net-snmp/library/system.h
+./agent/nsCache.lo: ../../include/net-snmp/library/tools.h
+./agent/nsCache.lo: ../../include/net-snmp/library/int64.h
+./agent/nsCache.lo: ../../include/net-snmp/library/mt_support.h
+./agent/nsCache.lo: ../../include/net-snmp/library/snmp_alarm.h
+./agent/nsCache.lo: ../../include/net-snmp/library/data_list.h
+./agent/nsCache.lo: ../../include/net-snmp/library/check_varbind.h
+./agent/nsCache.lo: ../../include/net-snmp/library/container.h
+./agent/nsCache.lo: ../../include/net-snmp/library/factory.h
+./agent/nsCache.lo: ../../include/net-snmp/library/snmp_logging.h
+./agent/nsCache.lo: ../../include/net-snmp/library/container_binary_array.h
+./agent/nsCache.lo: ../../include/net-snmp/library/container_list_ssll.h
+./agent/nsCache.lo: ../../include/net-snmp/library/container_iterator.h
+./agent/nsCache.lo: ../../include/net-snmp/library/container.h
+./agent/nsCache.lo: ../../include/net-snmp/library/snmp_assert.h
+./agent/nsCache.lo: ../../include/net-snmp/version.h
 ./agent/nsCache.lo: ../../include/net-snmp/config_api.h
 ./agent/nsCache.lo: ../../include/net-snmp/library/read_config.h
 ./agent/nsCache.lo: ../../include/net-snmp/library/default_store.h
@@ -1145,7 +537,6 @@
 ./agent/nsCache.lo: ../../include/net-snmp/agent/table_container.h
 ./agent/nsCache.lo: ../../include/net-snmp/agent/table_array.h
 ./agent/nsCache.lo: ../../include/net-snmp/agent/mfd.h agent/nsCache.h
-./agent/nsCache.lo: util_funcs.h struct.h
 ./agent/nsDebug.lo: ../../include/net-snmp/net-snmp-config.h
 ./agent/nsDebug.lo: ../../include/net-snmp/system/linux.h
 ./agent/nsDebug.lo: ../../include/net-snmp/system/sysv.h
@@ -1154,32 +545,14 @@
 ./agent/nsDebug.lo: ../../include/net-snmp/net-snmp-includes.h
 ./agent/nsDebug.lo: ../../include/net-snmp/definitions.h
 ./agent/nsDebug.lo: ../../include/net-snmp/types.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/types.h
 ./agent/nsDebug.lo: ../../include/net-snmp/library/snmp_api.h
-./agent/nsDebug.lo: ../../include/net-snmp/library/asn1.h
-./agent/nsDebug.lo: ../../include/net-snmp/library/snmp_impl.h
-./agent/nsDebug.lo: ../../include/net-snmp/library/snmp.h
-./agent/nsDebug.lo: ../../include/net-snmp/library/snmp-tc.h
-./agent/nsDebug.lo: ../../include/net-snmp/utilities.h
+./agent/nsDebug.lo: ../../include/net-snmp/varbind_api.h
 ./agent/nsDebug.lo: ../../include/net-snmp/library/snmp_client.h
-./agent/nsDebug.lo: ../../include/net-snmp/library/system.h
-./agent/nsDebug.lo: ../../include/net-snmp/library/tools.h
-./agent/nsDebug.lo: ../../include/net-snmp/library/int64.h
-./agent/nsDebug.lo: ../../include/net-snmp/library/mt_support.h
-./agent/nsDebug.lo: ../../include/net-snmp/library/snmp_alarm.h
-./agent/nsDebug.lo: ../../include/net-snmp/library/callback.h
-./agent/nsDebug.lo: ../../include/net-snmp/library/data_list.h
-./agent/nsDebug.lo: ../../include/net-snmp/library/oid_stash.h
-./agent/nsDebug.lo: ../../include/net-snmp/library/check_varbind.h
-./agent/nsDebug.lo: ../../include/net-snmp/library/container.h
-./agent/nsDebug.lo: ../../include/net-snmp/library/factory.h
-./agent/nsDebug.lo: ../../include/net-snmp/library/snmp_logging.h
-./agent/nsDebug.lo: ../../include/net-snmp/library/container_binary_array.h
-./agent/nsDebug.lo: ../../include/net-snmp/library/container_list_ssll.h
-./agent/nsDebug.lo: ../../include/net-snmp/library/container_iterator.h
-./agent/nsDebug.lo: ../../include/net-snmp/library/container.h
-./agent/nsDebug.lo: ../../include/net-snmp/library/snmp_assert.h
-./agent/nsDebug.lo: ../../include/net-snmp/version.h
+./agent/nsDebug.lo: ../../include/net-snmp/pdu_api.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/asn1.h
 ./agent/nsDebug.lo: ../../include/net-snmp/session_api.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/callback.h
 ./agent/nsDebug.lo: ../../include/net-snmp/library/snmp_transport.h
 ./agent/nsDebug.lo: ../../include/net-snmp/library/snmp_service.h
 ./agent/nsDebug.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -1190,11 +563,31 @@
 ./agent/nsDebug.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./agent/nsDebug.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./agent/nsDebug.lo: ../../include/net-snmp/library/ucd_compat.h
-./agent/nsDebug.lo: ../../include/net-snmp/pdu_api.h
-./agent/nsDebug.lo: ../../include/net-snmp/mib_api.h
 ./agent/nsDebug.lo: ../../include/net-snmp/library/mib.h
+./agent/nsDebug.lo: ../../include/net-snmp/mib_api.h
 ./agent/nsDebug.lo: ../../include/net-snmp/library/parse.h
-./agent/nsDebug.lo: ../../include/net-snmp/varbind_api.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/oid_stash.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/snmp_impl.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/snmp.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/snmp-tc.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/getopt.h
+./agent/nsDebug.lo: ../../include/net-snmp/utilities.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/system.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/tools.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/int64.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/mt_support.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/snmp_alarm.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/data_list.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/check_varbind.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/container.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/factory.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/snmp_logging.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/container_binary_array.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/container_list_ssll.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/container_iterator.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/container.h
+./agent/nsDebug.lo: ../../include/net-snmp/library/snmp_assert.h
+./agent/nsDebug.lo: ../../include/net-snmp/version.h
 ./agent/nsDebug.lo: ../../include/net-snmp/config_api.h
 ./agent/nsDebug.lo: ../../include/net-snmp/library/read_config.h
 ./agent/nsDebug.lo: ../../include/net-snmp/library/default_store.h
@@ -1248,7 +641,6 @@
 ./agent/nsDebug.lo: ../../include/net-snmp/agent/table_container.h
 ./agent/nsDebug.lo: ../../include/net-snmp/agent/table_array.h
 ./agent/nsDebug.lo: ../../include/net-snmp/agent/mfd.h agent/nsDebug.h
-./agent/nsDebug.lo: util_funcs.h struct.h
 ./agent/nsLogging.lo: ../../include/net-snmp/net-snmp-config.h
 ./agent/nsLogging.lo: ../../include/net-snmp/system/linux.h
 ./agent/nsLogging.lo: ../../include/net-snmp/system/sysv.h
@@ -1257,32 +649,14 @@
 ./agent/nsLogging.lo: ../../include/net-snmp/net-snmp-includes.h
 ./agent/nsLogging.lo: ../../include/net-snmp/definitions.h
 ./agent/nsLogging.lo: ../../include/net-snmp/types.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/types.h
 ./agent/nsLogging.lo: ../../include/net-snmp/library/snmp_api.h
-./agent/nsLogging.lo: ../../include/net-snmp/library/asn1.h
-./agent/nsLogging.lo: ../../include/net-snmp/library/snmp_impl.h
-./agent/nsLogging.lo: ../../include/net-snmp/library/snmp.h
-./agent/nsLogging.lo: ../../include/net-snmp/library/snmp-tc.h
-./agent/nsLogging.lo: ../../include/net-snmp/utilities.h
+./agent/nsLogging.lo: ../../include/net-snmp/varbind_api.h
 ./agent/nsLogging.lo: ../../include/net-snmp/library/snmp_client.h
-./agent/nsLogging.lo: ../../include/net-snmp/library/system.h
-./agent/nsLogging.lo: ../../include/net-snmp/library/tools.h
-./agent/nsLogging.lo: ../../include/net-snmp/library/int64.h
-./agent/nsLogging.lo: ../../include/net-snmp/library/mt_support.h
-./agent/nsLogging.lo: ../../include/net-snmp/library/snmp_alarm.h
-./agent/nsLogging.lo: ../../include/net-snmp/library/callback.h
-./agent/nsLogging.lo: ../../include/net-snmp/library/data_list.h
-./agent/nsLogging.lo: ../../include/net-snmp/library/oid_stash.h
-./agent/nsLogging.lo: ../../include/net-snmp/library/check_varbind.h
-./agent/nsLogging.lo: ../../include/net-snmp/library/container.h
-./agent/nsLogging.lo: ../../include/net-snmp/library/factory.h
-./agent/nsLogging.lo: ../../include/net-snmp/library/snmp_logging.h
-./agent/nsLogging.lo: ../../include/net-snmp/library/container_binary_array.h
-./agent/nsLogging.lo: ../../include/net-snmp/library/container_list_ssll.h
-./agent/nsLogging.lo: ../../include/net-snmp/library/container_iterator.h
-./agent/nsLogging.lo: ../../include/net-snmp/library/container.h
-./agent/nsLogging.lo: ../../include/net-snmp/library/snmp_assert.h
-./agent/nsLogging.lo: ../../include/net-snmp/version.h
+./agent/nsLogging.lo: ../../include/net-snmp/pdu_api.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/asn1.h
 ./agent/nsLogging.lo: ../../include/net-snmp/session_api.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/callback.h
 ./agent/nsLogging.lo: ../../include/net-snmp/library/snmp_transport.h
 ./agent/nsLogging.lo: ../../include/net-snmp/library/snmp_service.h
 ./agent/nsLogging.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -1293,11 +667,31 @@
 ./agent/nsLogging.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./agent/nsLogging.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./agent/nsLogging.lo: ../../include/net-snmp/library/ucd_compat.h
-./agent/nsLogging.lo: ../../include/net-snmp/pdu_api.h
-./agent/nsLogging.lo: ../../include/net-snmp/mib_api.h
 ./agent/nsLogging.lo: ../../include/net-snmp/library/mib.h
+./agent/nsLogging.lo: ../../include/net-snmp/mib_api.h
 ./agent/nsLogging.lo: ../../include/net-snmp/library/parse.h
-./agent/nsLogging.lo: ../../include/net-snmp/varbind_api.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/oid_stash.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/snmp_impl.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/snmp.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/snmp-tc.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/getopt.h
+./agent/nsLogging.lo: ../../include/net-snmp/utilities.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/system.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/tools.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/int64.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/mt_support.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/snmp_alarm.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/data_list.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/check_varbind.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/container.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/factory.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/snmp_logging.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/container_binary_array.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/container_list_ssll.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/container_iterator.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/container.h
+./agent/nsLogging.lo: ../../include/net-snmp/library/snmp_assert.h
+./agent/nsLogging.lo: ../../include/net-snmp/version.h
 ./agent/nsLogging.lo: ../../include/net-snmp/config_api.h
 ./agent/nsLogging.lo: ../../include/net-snmp/library/read_config.h
 ./agent/nsLogging.lo: ../../include/net-snmp/library/default_store.h
@@ -1351,7 +745,6 @@
 ./agent/nsLogging.lo: ../../include/net-snmp/agent/table_container.h
 ./agent/nsLogging.lo: ../../include/net-snmp/agent/table_array.h
 ./agent/nsLogging.lo: ../../include/net-snmp/agent/mfd.h agent/nsLogging.h
-./agent/nsLogging.lo: util_funcs.h struct.h
 ./agent/nsModuleTable.lo: ../../include/net-snmp/net-snmp-config.h
 ./agent/nsModuleTable.lo: ../../include/net-snmp/system/linux.h
 ./agent/nsModuleTable.lo: ../../include/net-snmp/system/sysv.h
@@ -1360,32 +753,14 @@
 ./agent/nsModuleTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./agent/nsModuleTable.lo: ../../include/net-snmp/definitions.h
 ./agent/nsModuleTable.lo: ../../include/net-snmp/types.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/types.h
 ./agent/nsModuleTable.lo: ../../include/net-snmp/library/snmp_api.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/library/asn1.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/library/snmp.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/utilities.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/varbind_api.h
 ./agent/nsModuleTable.lo: ../../include/net-snmp/library/snmp_client.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/library/system.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/library/tools.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/library/int64.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/library/mt_support.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/library/callback.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/library/data_list.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/library/oid_stash.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/library/check_varbind.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/library/container.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/library/factory.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/library/container_iterator.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/library/container.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/version.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/pdu_api.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/asn1.h
 ./agent/nsModuleTable.lo: ../../include/net-snmp/session_api.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/callback.h
 ./agent/nsModuleTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./agent/nsModuleTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./agent/nsModuleTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -1396,11 +771,31 @@
 ./agent/nsModuleTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./agent/nsModuleTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./agent/nsModuleTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/pdu_api.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/mib_api.h
 ./agent/nsModuleTable.lo: ../../include/net-snmp/library/mib.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/mib_api.h
 ./agent/nsModuleTable.lo: ../../include/net-snmp/library/parse.h
-./agent/nsModuleTable.lo: ../../include/net-snmp/varbind_api.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/oid_stash.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/snmp.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/getopt.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/utilities.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/system.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/tools.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/int64.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/mt_support.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/data_list.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/check_varbind.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/container.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/factory.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/container_iterator.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/container.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./agent/nsModuleTable.lo: ../../include/net-snmp/version.h
 ./agent/nsModuleTable.lo: ../../include/net-snmp/config_api.h
 ./agent/nsModuleTable.lo: ../../include/net-snmp/library/read_config.h
 ./agent/nsModuleTable.lo: ../../include/net-snmp/library/default_store.h
@@ -1463,32 +858,14 @@
 ./agent/nsTransactionTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./agent/nsTransactionTable.lo: ../../include/net-snmp/definitions.h
 ./agent/nsTransactionTable.lo: ../../include/net-snmp/types.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/types.h
 ./agent/nsTransactionTable.lo: ../../include/net-snmp/library/snmp_api.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/library/asn1.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/library/snmp.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/utilities.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/varbind_api.h
 ./agent/nsTransactionTable.lo: ../../include/net-snmp/library/snmp_client.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/library/system.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/library/tools.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/library/int64.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/library/mt_support.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/library/callback.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/library/data_list.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/library/oid_stash.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/library/check_varbind.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/library/container.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/library/factory.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/library/container_iterator.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/library/container.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/version.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/pdu_api.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/asn1.h
 ./agent/nsTransactionTable.lo: ../../include/net-snmp/session_api.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/callback.h
 ./agent/nsTransactionTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./agent/nsTransactionTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./agent/nsTransactionTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -1499,11 +876,31 @@
 ./agent/nsTransactionTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./agent/nsTransactionTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./agent/nsTransactionTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/pdu_api.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/mib_api.h
 ./agent/nsTransactionTable.lo: ../../include/net-snmp/library/mib.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/mib_api.h
 ./agent/nsTransactionTable.lo: ../../include/net-snmp/library/parse.h
-./agent/nsTransactionTable.lo: ../../include/net-snmp/varbind_api.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/oid_stash.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/snmp.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/getopt.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/utilities.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/system.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/tools.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/int64.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/mt_support.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/data_list.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/check_varbind.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/container.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/factory.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/container_iterator.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/container.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./agent/nsTransactionTable.lo: ../../include/net-snmp/version.h
 ./agent/nsTransactionTable.lo: ../../include/net-snmp/config_api.h
 ./agent/nsTransactionTable.lo: ../../include/net-snmp/library/read_config.h
 ./agent/nsTransactionTable.lo: ../../include/net-snmp/library/default_store.h
@@ -1566,32 +963,14 @@
 ./agent/nsVacmAccessTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./agent/nsVacmAccessTable.lo: ../../include/net-snmp/definitions.h
 ./agent/nsVacmAccessTable.lo: ../../include/net-snmp/types.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/types.h
 ./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/snmp_api.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/asn1.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/snmp.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/utilities.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/varbind_api.h
 ./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/snmp_client.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/system.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/tools.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/int64.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/mt_support.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/callback.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/data_list.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/oid_stash.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/check_varbind.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/container.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/factory.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/container_iterator.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/container.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/version.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/pdu_api.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/asn1.h
 ./agent/nsVacmAccessTable.lo: ../../include/net-snmp/session_api.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/callback.h
 ./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -1602,11 +981,31 @@
 ./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/pdu_api.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/mib_api.h
 ./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/mib.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/mib_api.h
 ./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/parse.h
-./agent/nsVacmAccessTable.lo: ../../include/net-snmp/varbind_api.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/oid_stash.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/snmp.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/getopt.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/utilities.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/system.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/tools.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/int64.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/mt_support.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/data_list.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/check_varbind.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/container.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/factory.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/container_iterator.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/container.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./agent/nsVacmAccessTable.lo: ../../include/net-snmp/version.h
 ./agent/nsVacmAccessTable.lo: ../../include/net-snmp/config_api.h
 ./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/read_config.h
 ./agent/nsVacmAccessTable.lo: ../../include/net-snmp/library/default_store.h
@@ -1669,32 +1068,14 @@
 ./agentx/agentx_config.lo: ../../include/net-snmp/net-snmp-includes.h
 ./agentx/agentx_config.lo: ../../include/net-snmp/definitions.h
 ./agentx/agentx_config.lo: ../../include/net-snmp/types.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/types.h
 ./agentx/agentx_config.lo: ../../include/net-snmp/library/snmp_api.h
-./agentx/agentx_config.lo: ../../include/net-snmp/library/asn1.h
-./agentx/agentx_config.lo: ../../include/net-snmp/library/snmp_impl.h
-./agentx/agentx_config.lo: ../../include/net-snmp/library/snmp.h
-./agentx/agentx_config.lo: ../../include/net-snmp/library/snmp-tc.h
-./agentx/agentx_config.lo: ../../include/net-snmp/utilities.h
+./agentx/agentx_config.lo: ../../include/net-snmp/varbind_api.h
 ./agentx/agentx_config.lo: ../../include/net-snmp/library/snmp_client.h
-./agentx/agentx_config.lo: ../../include/net-snmp/library/system.h
-./agentx/agentx_config.lo: ../../include/net-snmp/library/tools.h
-./agentx/agentx_config.lo: ../../include/net-snmp/library/int64.h
-./agentx/agentx_config.lo: ../../include/net-snmp/library/mt_support.h
-./agentx/agentx_config.lo: ../../include/net-snmp/library/snmp_alarm.h
-./agentx/agentx_config.lo: ../../include/net-snmp/library/callback.h
-./agentx/agentx_config.lo: ../../include/net-snmp/library/data_list.h
-./agentx/agentx_config.lo: ../../include/net-snmp/library/oid_stash.h
-./agentx/agentx_config.lo: ../../include/net-snmp/library/check_varbind.h
-./agentx/agentx_config.lo: ../../include/net-snmp/library/container.h
-./agentx/agentx_config.lo: ../../include/net-snmp/library/factory.h
-./agentx/agentx_config.lo: ../../include/net-snmp/library/snmp_logging.h
-./agentx/agentx_config.lo: ../../include/net-snmp/library/container_binary_array.h
-./agentx/agentx_config.lo: ../../include/net-snmp/library/container_list_ssll.h
-./agentx/agentx_config.lo: ../../include/net-snmp/library/container_iterator.h
-./agentx/agentx_config.lo: ../../include/net-snmp/library/container.h
-./agentx/agentx_config.lo: ../../include/net-snmp/library/snmp_assert.h
-./agentx/agentx_config.lo: ../../include/net-snmp/version.h
+./agentx/agentx_config.lo: ../../include/net-snmp/pdu_api.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/asn1.h
 ./agentx/agentx_config.lo: ../../include/net-snmp/session_api.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/callback.h
 ./agentx/agentx_config.lo: ../../include/net-snmp/library/snmp_transport.h
 ./agentx/agentx_config.lo: ../../include/net-snmp/library/snmp_service.h
 ./agentx/agentx_config.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -1705,11 +1086,31 @@
 ./agentx/agentx_config.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./agentx/agentx_config.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./agentx/agentx_config.lo: ../../include/net-snmp/library/ucd_compat.h
-./agentx/agentx_config.lo: ../../include/net-snmp/pdu_api.h
-./agentx/agentx_config.lo: ../../include/net-snmp/mib_api.h
 ./agentx/agentx_config.lo: ../../include/net-snmp/library/mib.h
+./agentx/agentx_config.lo: ../../include/net-snmp/mib_api.h
 ./agentx/agentx_config.lo: ../../include/net-snmp/library/parse.h
-./agentx/agentx_config.lo: ../../include/net-snmp/varbind_api.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/oid_stash.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/snmp_impl.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/snmp.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/snmp-tc.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/getopt.h
+./agentx/agentx_config.lo: ../../include/net-snmp/utilities.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/system.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/tools.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/int64.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/mt_support.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/snmp_alarm.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/data_list.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/check_varbind.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/container.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/factory.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/snmp_logging.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/container_binary_array.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/container_list_ssll.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/container_iterator.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/container.h
+./agentx/agentx_config.lo: ../../include/net-snmp/library/snmp_assert.h
+./agentx/agentx_config.lo: ../../include/net-snmp/version.h
 ./agentx/agentx_config.lo: ../../include/net-snmp/config_api.h
 ./agentx/agentx_config.lo: ../../include/net-snmp/library/read_config.h
 ./agentx/agentx_config.lo: ../../include/net-snmp/library/default_store.h
@@ -1773,32 +1174,14 @@
 ./agentx/client.lo: ../../include/net-snmp/net-snmp-includes.h
 ./agentx/client.lo: ../../include/net-snmp/definitions.h
 ./agentx/client.lo: ../../include/net-snmp/types.h
+./agentx/client.lo: ../../include/net-snmp/library/types.h
 ./agentx/client.lo: ../../include/net-snmp/library/snmp_api.h
-./agentx/client.lo: ../../include/net-snmp/library/asn1.h
-./agentx/client.lo: ../../include/net-snmp/library/snmp_impl.h
-./agentx/client.lo: ../../include/net-snmp/library/snmp.h
-./agentx/client.lo: ../../include/net-snmp/library/snmp-tc.h
-./agentx/client.lo: ../../include/net-snmp/utilities.h
+./agentx/client.lo: ../../include/net-snmp/varbind_api.h
 ./agentx/client.lo: ../../include/net-snmp/library/snmp_client.h
-./agentx/client.lo: ../../include/net-snmp/library/system.h
-./agentx/client.lo: ../../include/net-snmp/library/tools.h
-./agentx/client.lo: ../../include/net-snmp/library/int64.h
-./agentx/client.lo: ../../include/net-snmp/library/mt_support.h
-./agentx/client.lo: ../../include/net-snmp/library/snmp_alarm.h
-./agentx/client.lo: ../../include/net-snmp/library/callback.h
-./agentx/client.lo: ../../include/net-snmp/library/data_list.h
-./agentx/client.lo: ../../include/net-snmp/library/oid_stash.h
-./agentx/client.lo: ../../include/net-snmp/library/check_varbind.h
-./agentx/client.lo: ../../include/net-snmp/library/container.h
-./agentx/client.lo: ../../include/net-snmp/library/factory.h
-./agentx/client.lo: ../../include/net-snmp/library/snmp_logging.h
-./agentx/client.lo: ../../include/net-snmp/library/container_binary_array.h
-./agentx/client.lo: ../../include/net-snmp/library/container_list_ssll.h
-./agentx/client.lo: ../../include/net-snmp/library/container_iterator.h
-./agentx/client.lo: ../../include/net-snmp/library/container.h
-./agentx/client.lo: ../../include/net-snmp/library/snmp_assert.h
-./agentx/client.lo: ../../include/net-snmp/version.h
+./agentx/client.lo: ../../include/net-snmp/pdu_api.h
+./agentx/client.lo: ../../include/net-snmp/library/asn1.h
 ./agentx/client.lo: ../../include/net-snmp/session_api.h
+./agentx/client.lo: ../../include/net-snmp/library/callback.h
 ./agentx/client.lo: ../../include/net-snmp/library/snmp_transport.h
 ./agentx/client.lo: ../../include/net-snmp/library/snmp_service.h
 ./agentx/client.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -1809,11 +1192,31 @@
 ./agentx/client.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./agentx/client.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./agentx/client.lo: ../../include/net-snmp/library/ucd_compat.h
-./agentx/client.lo: ../../include/net-snmp/pdu_api.h
-./agentx/client.lo: ../../include/net-snmp/mib_api.h
 ./agentx/client.lo: ../../include/net-snmp/library/mib.h
+./agentx/client.lo: ../../include/net-snmp/mib_api.h
 ./agentx/client.lo: ../../include/net-snmp/library/parse.h
-./agentx/client.lo: ../../include/net-snmp/varbind_api.h
+./agentx/client.lo: ../../include/net-snmp/library/oid_stash.h
+./agentx/client.lo: ../../include/net-snmp/library/snmp_impl.h
+./agentx/client.lo: ../../include/net-snmp/library/snmp.h
+./agentx/client.lo: ../../include/net-snmp/library/snmp-tc.h
+./agentx/client.lo: ../../include/net-snmp/library/getopt.h
+./agentx/client.lo: ../../include/net-snmp/utilities.h
+./agentx/client.lo: ../../include/net-snmp/library/system.h
+./agentx/client.lo: ../../include/net-snmp/library/tools.h
+./agentx/client.lo: ../../include/net-snmp/library/int64.h
+./agentx/client.lo: ../../include/net-snmp/library/mt_support.h
+./agentx/client.lo: ../../include/net-snmp/library/snmp_alarm.h
+./agentx/client.lo: ../../include/net-snmp/library/data_list.h
+./agentx/client.lo: ../../include/net-snmp/library/check_varbind.h
+./agentx/client.lo: ../../include/net-snmp/library/container.h
+./agentx/client.lo: ../../include/net-snmp/library/factory.h
+./agentx/client.lo: ../../include/net-snmp/library/snmp_logging.h
+./agentx/client.lo: ../../include/net-snmp/library/container_binary_array.h
+./agentx/client.lo: ../../include/net-snmp/library/container_list_ssll.h
+./agentx/client.lo: ../../include/net-snmp/library/container_iterator.h
+./agentx/client.lo: ../../include/net-snmp/library/container.h
+./agentx/client.lo: ../../include/net-snmp/library/snmp_assert.h
+./agentx/client.lo: ../../include/net-snmp/version.h
 ./agentx/client.lo: ../../include/net-snmp/config_api.h
 ./agentx/client.lo: ../../include/net-snmp/library/read_config.h
 ./agentx/client.lo: ../../include/net-snmp/library/default_store.h
@@ -1869,109 +1272,6 @@
 ./agentx/client.lo: ../../include/net-snmp/agent/mfd.h
 ./agentx/client.lo: ../../include/net-snmp/agent/agent_index.h
 ./agentx/client.lo: agentx/protocol.h agentx/client.h agentx/subagent.h
-./agentx/master.lo: ../../include/net-snmp/net-snmp-config.h
-./agentx/master.lo: ../../include/net-snmp/system/linux.h
-./agentx/master.lo: ../../include/net-snmp/system/sysv.h
-./agentx/master.lo: ../../include/net-snmp/system/generic.h
-./agentx/master.lo: ../../include/net-snmp/machine/generic.h
-./agentx/master.lo: ../../include/net-snmp/net-snmp-includes.h
-./agentx/master.lo: ../../include/net-snmp/definitions.h
-./agentx/master.lo: ../../include/net-snmp/types.h
-./agentx/master.lo: ../../include/net-snmp/library/snmp_api.h
-./agentx/master.lo: ../../include/net-snmp/library/asn1.h
-./agentx/master.lo: ../../include/net-snmp/library/snmp_impl.h
-./agentx/master.lo: ../../include/net-snmp/library/snmp.h
-./agentx/master.lo: ../../include/net-snmp/library/snmp-tc.h
-./agentx/master.lo: ../../include/net-snmp/utilities.h
-./agentx/master.lo: ../../include/net-snmp/library/snmp_client.h
-./agentx/master.lo: ../../include/net-snmp/library/system.h
-./agentx/master.lo: ../../include/net-snmp/library/tools.h
-./agentx/master.lo: ../../include/net-snmp/library/int64.h
-./agentx/master.lo: ../../include/net-snmp/library/mt_support.h
-./agentx/master.lo: ../../include/net-snmp/library/snmp_alarm.h
-./agentx/master.lo: ../../include/net-snmp/library/callback.h
-./agentx/master.lo: ../../include/net-snmp/library/data_list.h
-./agentx/master.lo: ../../include/net-snmp/library/oid_stash.h
-./agentx/master.lo: ../../include/net-snmp/library/check_varbind.h
-./agentx/master.lo: ../../include/net-snmp/library/container.h
-./agentx/master.lo: ../../include/net-snmp/library/factory.h
-./agentx/master.lo: ../../include/net-snmp/library/snmp_logging.h
-./agentx/master.lo: ../../include/net-snmp/library/container_binary_array.h
-./agentx/master.lo: ../../include/net-snmp/library/container_list_ssll.h
-./agentx/master.lo: ../../include/net-snmp/library/container_iterator.h
-./agentx/master.lo: ../../include/net-snmp/library/container.h
-./agentx/master.lo: ../../include/net-snmp/library/snmp_assert.h
-./agentx/master.lo: ../../include/net-snmp/version.h
-./agentx/master.lo: ../../include/net-snmp/session_api.h
-./agentx/master.lo: ../../include/net-snmp/library/snmp_transport.h
-./agentx/master.lo: ../../include/net-snmp/library/snmp_service.h
-./agentx/master.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
-./agentx/master.lo: ../../include/net-snmp/library/snmpUnixDomain.h
-./agentx/master.lo: ../../include/net-snmp/library/snmpUDPDomain.h
-./agentx/master.lo: ../../include/net-snmp/library/snmpTCPDomain.h
-./agentx/master.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
-./agentx/master.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
-./agentx/master.lo: ../../include/net-snmp/library/snmpIPXDomain.h
-./agentx/master.lo: ../../include/net-snmp/library/ucd_compat.h
-./agentx/master.lo: ../../include/net-snmp/pdu_api.h
-./agentx/master.lo: ../../include/net-snmp/mib_api.h
-./agentx/master.lo: ../../include/net-snmp/library/mib.h
-./agentx/master.lo: ../../include/net-snmp/library/parse.h
-./agentx/master.lo: ../../include/net-snmp/varbind_api.h
-./agentx/master.lo: ../../include/net-snmp/config_api.h
-./agentx/master.lo: ../../include/net-snmp/library/read_config.h
-./agentx/master.lo: ../../include/net-snmp/library/default_store.h
-./agentx/master.lo: ../../include/net-snmp/library/snmp_parse_args.h
-./agentx/master.lo: ../../include/net-snmp/library/snmp_enum.h
-./agentx/master.lo: ../../include/net-snmp/library/vacm.h
-./agentx/master.lo: ../../include/net-snmp/output_api.h
-./agentx/master.lo: ../../include/net-snmp/library/snmp_debug.h
-./agentx/master.lo: ../../include/net-snmp/snmpv3_api.h
-./agentx/master.lo: ../../include/net-snmp/library/snmpv3.h
-./agentx/master.lo: ../../include/net-snmp/library/transform_oids.h
-./agentx/master.lo: ../../include/net-snmp/library/keytools.h
-./agentx/master.lo: ../../include/net-snmp/library/scapi.h
-./agentx/master.lo: ../../include/net-snmp/library/lcd_time.h
-./agentx/master.lo: ../../include/net-snmp/library/snmp_secmod.h
-./agentx/master.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
-./agentx/master.lo: ../../include/net-snmp/library/snmpusm.h
-./agentx/master.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
-./agentx/master.lo: ../../include/net-snmp/agent/mib_module_config.h
-./agentx/master.lo: ../../include/net-snmp/agent/agent_module_config.h
-./agentx/master.lo: ../../include/net-snmp/agent/snmp_agent.h
-./agentx/master.lo: ../../include/net-snmp/agent/snmp_vars.h
-./agentx/master.lo: ../../include/net-snmp/agent/agent_handler.h
-./agentx/master.lo: ../../include/net-snmp/agent/var_struct.h
-./agentx/master.lo: ../../include/net-snmp/agent/agent_registry.h
-./agentx/master.lo: ../../include/net-snmp/library/fd_event_manager.h
-./agentx/master.lo: ../../include/net-snmp/agent/ds_agent.h
-./agentx/master.lo: ../../include/net-snmp/agent/agent_read_config.h
-./agentx/master.lo: ../../include/net-snmp/agent/agent_trap.h
-./agentx/master.lo: ../../include/net-snmp/agent/all_helpers.h
-./agentx/master.lo: ../../include/net-snmp/agent/instance.h
-./agentx/master.lo: ../../include/net-snmp/agent/baby_steps.h
-./agentx/master.lo: ../../include/net-snmp/agent/scalar.h
-./agentx/master.lo: ../../include/net-snmp/agent/scalar_group.h
-./agentx/master.lo: ../../include/net-snmp/agent/watcher.h
-./agentx/master.lo: ../../include/net-snmp/agent/multiplexer.h
-./agentx/master.lo: ../../include/net-snmp/agent/null.h
-./agentx/master.lo: ../../include/net-snmp/agent/debug_handler.h
-./agentx/master.lo: ../../include/net-snmp/agent/cache_handler.h
-./agentx/master.lo: ../../include/net-snmp/agent/old_api.h
-./agentx/master.lo: ../../include/net-snmp/agent/read_only.h
-./agentx/master.lo: ../../include/net-snmp/agent/row_merge.h
-./agentx/master.lo: ../../include/net-snmp/agent/serialize.h
-./agentx/master.lo: ../../include/net-snmp/agent/bulk_to_next.h
-./agentx/master.lo: ../../include/net-snmp/agent/mode_end_call.h
-./agentx/master.lo: ../../include/net-snmp/agent/table.h
-./agentx/master.lo: ../../include/net-snmp/agent/table_data.h
-./agentx/master.lo: ../../include/net-snmp/agent/table_dataset.h
-./agentx/master.lo: ../../include/net-snmp/agent/table_tdata.h
-./agentx/master.lo: ../../include/net-snmp/agent/table_iterator.h
-./agentx/master.lo: ../../include/net-snmp/agent/table_container.h
-./agentx/master.lo: ../../include/net-snmp/agent/table_array.h
-./agentx/master.lo: ../../include/net-snmp/agent/mfd.h ../../agent/snmpd.h
-./agentx/master.lo: agentx/protocol.h agentx/master_admin.h
 ./agentx/master_admin.lo: ../../include/net-snmp/net-snmp-config.h
 ./agentx/master_admin.lo: ../../include/net-snmp/system/linux.h
 ./agentx/master_admin.lo: ../../include/net-snmp/system/sysv.h
@@ -1980,32 +1280,14 @@
 ./agentx/master_admin.lo: ../../include/net-snmp/net-snmp-includes.h
 ./agentx/master_admin.lo: ../../include/net-snmp/definitions.h
 ./agentx/master_admin.lo: ../../include/net-snmp/types.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/types.h
 ./agentx/master_admin.lo: ../../include/net-snmp/library/snmp_api.h
-./agentx/master_admin.lo: ../../include/net-snmp/library/asn1.h
-./agentx/master_admin.lo: ../../include/net-snmp/library/snmp_impl.h
-./agentx/master_admin.lo: ../../include/net-snmp/library/snmp.h
-./agentx/master_admin.lo: ../../include/net-snmp/library/snmp-tc.h
-./agentx/master_admin.lo: ../../include/net-snmp/utilities.h
+./agentx/master_admin.lo: ../../include/net-snmp/varbind_api.h
 ./agentx/master_admin.lo: ../../include/net-snmp/library/snmp_client.h
-./agentx/master_admin.lo: ../../include/net-snmp/library/system.h
-./agentx/master_admin.lo: ../../include/net-snmp/library/tools.h
-./agentx/master_admin.lo: ../../include/net-snmp/library/int64.h
-./agentx/master_admin.lo: ../../include/net-snmp/library/mt_support.h
-./agentx/master_admin.lo: ../../include/net-snmp/library/snmp_alarm.h
-./agentx/master_admin.lo: ../../include/net-snmp/library/callback.h
-./agentx/master_admin.lo: ../../include/net-snmp/library/data_list.h
-./agentx/master_admin.lo: ../../include/net-snmp/library/oid_stash.h
-./agentx/master_admin.lo: ../../include/net-snmp/library/check_varbind.h
-./agentx/master_admin.lo: ../../include/net-snmp/library/container.h
-./agentx/master_admin.lo: ../../include/net-snmp/library/factory.h
-./agentx/master_admin.lo: ../../include/net-snmp/library/snmp_logging.h
-./agentx/master_admin.lo: ../../include/net-snmp/library/container_binary_array.h
-./agentx/master_admin.lo: ../../include/net-snmp/library/container_list_ssll.h
-./agentx/master_admin.lo: ../../include/net-snmp/library/container_iterator.h
-./agentx/master_admin.lo: ../../include/net-snmp/library/container.h
-./agentx/master_admin.lo: ../../include/net-snmp/library/snmp_assert.h
-./agentx/master_admin.lo: ../../include/net-snmp/version.h
+./agentx/master_admin.lo: ../../include/net-snmp/pdu_api.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/asn1.h
 ./agentx/master_admin.lo: ../../include/net-snmp/session_api.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/callback.h
 ./agentx/master_admin.lo: ../../include/net-snmp/library/snmp_transport.h
 ./agentx/master_admin.lo: ../../include/net-snmp/library/snmp_service.h
 ./agentx/master_admin.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -2016,11 +1298,31 @@
 ./agentx/master_admin.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./agentx/master_admin.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./agentx/master_admin.lo: ../../include/net-snmp/library/ucd_compat.h
-./agentx/master_admin.lo: ../../include/net-snmp/pdu_api.h
-./agentx/master_admin.lo: ../../include/net-snmp/mib_api.h
 ./agentx/master_admin.lo: ../../include/net-snmp/library/mib.h
+./agentx/master_admin.lo: ../../include/net-snmp/mib_api.h
 ./agentx/master_admin.lo: ../../include/net-snmp/library/parse.h
-./agentx/master_admin.lo: ../../include/net-snmp/varbind_api.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/oid_stash.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/snmp_impl.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/snmp.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/snmp-tc.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/getopt.h
+./agentx/master_admin.lo: ../../include/net-snmp/utilities.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/system.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/tools.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/int64.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/mt_support.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/snmp_alarm.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/data_list.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/check_varbind.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/container.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/factory.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/snmp_logging.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/container_binary_array.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/container_list_ssll.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/container_iterator.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/container.h
+./agentx/master_admin.lo: ../../include/net-snmp/library/snmp_assert.h
+./agentx/master_admin.lo: ../../include/net-snmp/version.h
 ./agentx/master_admin.lo: ../../include/net-snmp/config_api.h
 ./agentx/master_admin.lo: ../../include/net-snmp/library/read_config.h
 ./agentx/master_admin.lo: ../../include/net-snmp/library/default_store.h
@@ -2077,7 +1379,113 @@
 ./agentx/master_admin.lo: agentx/protocol.h agentx/client.h
 ./agentx/master_admin.lo: ../../include/net-snmp/agent/agent_index.h
 ./agentx/master_admin.lo: ../../include/net-snmp/agent/agent_callbacks.h
-./agentx/master_admin.lo: mibII/sysORTable.h ./agentx/master.h
+./agentx/master_admin.lo: ../../include/net-snmp/agent/agent_sysORTable.h
+./agentx/master_admin.lo: ./agentx/master.h
+./agentx/master.lo: ../../include/net-snmp/net-snmp-config.h
+./agentx/master.lo: ../../include/net-snmp/system/linux.h
+./agentx/master.lo: ../../include/net-snmp/system/sysv.h
+./agentx/master.lo: ../../include/net-snmp/system/generic.h
+./agentx/master.lo: ../../include/net-snmp/machine/generic.h
+./agentx/master.lo: ../../include/net-snmp/net-snmp-includes.h
+./agentx/master.lo: ../../include/net-snmp/definitions.h
+./agentx/master.lo: ../../include/net-snmp/types.h
+./agentx/master.lo: ../../include/net-snmp/library/types.h
+./agentx/master.lo: ../../include/net-snmp/library/snmp_api.h
+./agentx/master.lo: ../../include/net-snmp/varbind_api.h
+./agentx/master.lo: ../../include/net-snmp/library/snmp_client.h
+./agentx/master.lo: ../../include/net-snmp/pdu_api.h
+./agentx/master.lo: ../../include/net-snmp/library/asn1.h
+./agentx/master.lo: ../../include/net-snmp/session_api.h
+./agentx/master.lo: ../../include/net-snmp/library/callback.h
+./agentx/master.lo: ../../include/net-snmp/library/snmp_transport.h
+./agentx/master.lo: ../../include/net-snmp/library/snmp_service.h
+./agentx/master.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./agentx/master.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./agentx/master.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./agentx/master.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./agentx/master.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./agentx/master.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./agentx/master.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./agentx/master.lo: ../../include/net-snmp/library/ucd_compat.h
+./agentx/master.lo: ../../include/net-snmp/library/mib.h
+./agentx/master.lo: ../../include/net-snmp/mib_api.h
+./agentx/master.lo: ../../include/net-snmp/library/parse.h
+./agentx/master.lo: ../../include/net-snmp/library/oid_stash.h
+./agentx/master.lo: ../../include/net-snmp/library/snmp_impl.h
+./agentx/master.lo: ../../include/net-snmp/library/snmp.h
+./agentx/master.lo: ../../include/net-snmp/library/snmp-tc.h
+./agentx/master.lo: ../../include/net-snmp/library/getopt.h
+./agentx/master.lo: ../../include/net-snmp/utilities.h
+./agentx/master.lo: ../../include/net-snmp/library/system.h
+./agentx/master.lo: ../../include/net-snmp/library/tools.h
+./agentx/master.lo: ../../include/net-snmp/library/int64.h
+./agentx/master.lo: ../../include/net-snmp/library/mt_support.h
+./agentx/master.lo: ../../include/net-snmp/library/snmp_alarm.h
+./agentx/master.lo: ../../include/net-snmp/library/data_list.h
+./agentx/master.lo: ../../include/net-snmp/library/check_varbind.h
+./agentx/master.lo: ../../include/net-snmp/library/container.h
+./agentx/master.lo: ../../include/net-snmp/library/factory.h
+./agentx/master.lo: ../../include/net-snmp/library/snmp_logging.h
+./agentx/master.lo: ../../include/net-snmp/library/container_binary_array.h
+./agentx/master.lo: ../../include/net-snmp/library/container_list_ssll.h
+./agentx/master.lo: ../../include/net-snmp/library/container_iterator.h
+./agentx/master.lo: ../../include/net-snmp/library/container.h
+./agentx/master.lo: ../../include/net-snmp/library/snmp_assert.h
+./agentx/master.lo: ../../include/net-snmp/version.h
+./agentx/master.lo: ../../include/net-snmp/config_api.h
+./agentx/master.lo: ../../include/net-snmp/library/read_config.h
+./agentx/master.lo: ../../include/net-snmp/library/default_store.h
+./agentx/master.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./agentx/master.lo: ../../include/net-snmp/library/snmp_enum.h
+./agentx/master.lo: ../../include/net-snmp/library/vacm.h
+./agentx/master.lo: ../../include/net-snmp/output_api.h
+./agentx/master.lo: ../../include/net-snmp/library/snmp_debug.h
+./agentx/master.lo: ../../include/net-snmp/snmpv3_api.h
+./agentx/master.lo: ../../include/net-snmp/library/snmpv3.h
+./agentx/master.lo: ../../include/net-snmp/library/transform_oids.h
+./agentx/master.lo: ../../include/net-snmp/library/keytools.h
+./agentx/master.lo: ../../include/net-snmp/library/scapi.h
+./agentx/master.lo: ../../include/net-snmp/library/lcd_time.h
+./agentx/master.lo: ../../include/net-snmp/library/snmp_secmod.h
+./agentx/master.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./agentx/master.lo: ../../include/net-snmp/library/snmpusm.h
+./agentx/master.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./agentx/master.lo: ../../include/net-snmp/agent/mib_module_config.h
+./agentx/master.lo: ../../include/net-snmp/agent/agent_module_config.h
+./agentx/master.lo: ../../include/net-snmp/agent/snmp_agent.h
+./agentx/master.lo: ../../include/net-snmp/agent/snmp_vars.h
+./agentx/master.lo: ../../include/net-snmp/agent/agent_handler.h
+./agentx/master.lo: ../../include/net-snmp/agent/var_struct.h
+./agentx/master.lo: ../../include/net-snmp/agent/agent_registry.h
+./agentx/master.lo: ../../include/net-snmp/library/fd_event_manager.h
+./agentx/master.lo: ../../include/net-snmp/agent/ds_agent.h
+./agentx/master.lo: ../../include/net-snmp/agent/agent_read_config.h
+./agentx/master.lo: ../../include/net-snmp/agent/agent_trap.h
+./agentx/master.lo: ../../include/net-snmp/agent/all_helpers.h
+./agentx/master.lo: ../../include/net-snmp/agent/instance.h
+./agentx/master.lo: ../../include/net-snmp/agent/baby_steps.h
+./agentx/master.lo: ../../include/net-snmp/agent/scalar.h
+./agentx/master.lo: ../../include/net-snmp/agent/scalar_group.h
+./agentx/master.lo: ../../include/net-snmp/agent/watcher.h
+./agentx/master.lo: ../../include/net-snmp/agent/multiplexer.h
+./agentx/master.lo: ../../include/net-snmp/agent/null.h
+./agentx/master.lo: ../../include/net-snmp/agent/debug_handler.h
+./agentx/master.lo: ../../include/net-snmp/agent/cache_handler.h
+./agentx/master.lo: ../../include/net-snmp/agent/old_api.h
+./agentx/master.lo: ../../include/net-snmp/agent/read_only.h
+./agentx/master.lo: ../../include/net-snmp/agent/row_merge.h
+./agentx/master.lo: ../../include/net-snmp/agent/serialize.h
+./agentx/master.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./agentx/master.lo: ../../include/net-snmp/agent/mode_end_call.h
+./agentx/master.lo: ../../include/net-snmp/agent/table.h
+./agentx/master.lo: ../../include/net-snmp/agent/table_data.h
+./agentx/master.lo: ../../include/net-snmp/agent/table_dataset.h
+./agentx/master.lo: ../../include/net-snmp/agent/table_tdata.h
+./agentx/master.lo: ../../include/net-snmp/agent/table_iterator.h
+./agentx/master.lo: ../../include/net-snmp/agent/table_container.h
+./agentx/master.lo: ../../include/net-snmp/agent/table_array.h
+./agentx/master.lo: ../../include/net-snmp/agent/mfd.h ../../agent/snmpd.h
+./agentx/master.lo: agentx/protocol.h agentx/master_admin.h
 ./agentx/protocol.lo: ../../include/net-snmp/net-snmp-config.h
 ./agentx/protocol.lo: ../../include/net-snmp/system/linux.h
 ./agentx/protocol.lo: ../../include/net-snmp/system/sysv.h
@@ -2086,32 +1494,14 @@
 ./agentx/protocol.lo: ../../include/net-snmp/net-snmp-includes.h
 ./agentx/protocol.lo: ../../include/net-snmp/definitions.h
 ./agentx/protocol.lo: ../../include/net-snmp/types.h
+./agentx/protocol.lo: ../../include/net-snmp/library/types.h
 ./agentx/protocol.lo: ../../include/net-snmp/library/snmp_api.h
-./agentx/protocol.lo: ../../include/net-snmp/library/asn1.h
-./agentx/protocol.lo: ../../include/net-snmp/library/snmp_impl.h
-./agentx/protocol.lo: ../../include/net-snmp/library/snmp.h
-./agentx/protocol.lo: ../../include/net-snmp/library/snmp-tc.h
-./agentx/protocol.lo: ../../include/net-snmp/utilities.h
+./agentx/protocol.lo: ../../include/net-snmp/varbind_api.h
 ./agentx/protocol.lo: ../../include/net-snmp/library/snmp_client.h
-./agentx/protocol.lo: ../../include/net-snmp/library/system.h
-./agentx/protocol.lo: ../../include/net-snmp/library/tools.h
-./agentx/protocol.lo: ../../include/net-snmp/library/int64.h
-./agentx/protocol.lo: ../../include/net-snmp/library/mt_support.h
-./agentx/protocol.lo: ../../include/net-snmp/library/snmp_alarm.h
-./agentx/protocol.lo: ../../include/net-snmp/library/callback.h
-./agentx/protocol.lo: ../../include/net-snmp/library/data_list.h
-./agentx/protocol.lo: ../../include/net-snmp/library/oid_stash.h
-./agentx/protocol.lo: ../../include/net-snmp/library/check_varbind.h
-./agentx/protocol.lo: ../../include/net-snmp/library/container.h
-./agentx/protocol.lo: ../../include/net-snmp/library/factory.h
-./agentx/protocol.lo: ../../include/net-snmp/library/snmp_logging.h
-./agentx/protocol.lo: ../../include/net-snmp/library/container_binary_array.h
-./agentx/protocol.lo: ../../include/net-snmp/library/container_list_ssll.h
-./agentx/protocol.lo: ../../include/net-snmp/library/container_iterator.h
-./agentx/protocol.lo: ../../include/net-snmp/library/container.h
-./agentx/protocol.lo: ../../include/net-snmp/library/snmp_assert.h
-./agentx/protocol.lo: ../../include/net-snmp/version.h
+./agentx/protocol.lo: ../../include/net-snmp/pdu_api.h
+./agentx/protocol.lo: ../../include/net-snmp/library/asn1.h
 ./agentx/protocol.lo: ../../include/net-snmp/session_api.h
+./agentx/protocol.lo: ../../include/net-snmp/library/callback.h
 ./agentx/protocol.lo: ../../include/net-snmp/library/snmp_transport.h
 ./agentx/protocol.lo: ../../include/net-snmp/library/snmp_service.h
 ./agentx/protocol.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -2122,11 +1512,31 @@
 ./agentx/protocol.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./agentx/protocol.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./agentx/protocol.lo: ../../include/net-snmp/library/ucd_compat.h
-./agentx/protocol.lo: ../../include/net-snmp/pdu_api.h
-./agentx/protocol.lo: ../../include/net-snmp/mib_api.h
 ./agentx/protocol.lo: ../../include/net-snmp/library/mib.h
+./agentx/protocol.lo: ../../include/net-snmp/mib_api.h
 ./agentx/protocol.lo: ../../include/net-snmp/library/parse.h
-./agentx/protocol.lo: ../../include/net-snmp/varbind_api.h
+./agentx/protocol.lo: ../../include/net-snmp/library/oid_stash.h
+./agentx/protocol.lo: ../../include/net-snmp/library/snmp_impl.h
+./agentx/protocol.lo: ../../include/net-snmp/library/snmp.h
+./agentx/protocol.lo: ../../include/net-snmp/library/snmp-tc.h
+./agentx/protocol.lo: ../../include/net-snmp/library/getopt.h
+./agentx/protocol.lo: ../../include/net-snmp/utilities.h
+./agentx/protocol.lo: ../../include/net-snmp/library/system.h
+./agentx/protocol.lo: ../../include/net-snmp/library/tools.h
+./agentx/protocol.lo: ../../include/net-snmp/library/int64.h
+./agentx/protocol.lo: ../../include/net-snmp/library/mt_support.h
+./agentx/protocol.lo: ../../include/net-snmp/library/snmp_alarm.h
+./agentx/protocol.lo: ../../include/net-snmp/library/data_list.h
+./agentx/protocol.lo: ../../include/net-snmp/library/check_varbind.h
+./agentx/protocol.lo: ../../include/net-snmp/library/container.h
+./agentx/protocol.lo: ../../include/net-snmp/library/factory.h
+./agentx/protocol.lo: ../../include/net-snmp/library/snmp_logging.h
+./agentx/protocol.lo: ../../include/net-snmp/library/container_binary_array.h
+./agentx/protocol.lo: ../../include/net-snmp/library/container_list_ssll.h
+./agentx/protocol.lo: ../../include/net-snmp/library/container_iterator.h
+./agentx/protocol.lo: ../../include/net-snmp/library/container.h
+./agentx/protocol.lo: ../../include/net-snmp/library/snmp_assert.h
+./agentx/protocol.lo: ../../include/net-snmp/version.h
 ./agentx/protocol.lo: ../../include/net-snmp/config_api.h
 ./agentx/protocol.lo: ../../include/net-snmp/library/read_config.h
 ./agentx/protocol.lo: ../../include/net-snmp/library/default_store.h
@@ -2153,32 +1563,14 @@
 ./agentx/subagent.lo: ../../include/net-snmp/net-snmp-includes.h
 ./agentx/subagent.lo: ../../include/net-snmp/definitions.h
 ./agentx/subagent.lo: ../../include/net-snmp/types.h
+./agentx/subagent.lo: ../../include/net-snmp/library/types.h
 ./agentx/subagent.lo: ../../include/net-snmp/library/snmp_api.h
-./agentx/subagent.lo: ../../include/net-snmp/library/asn1.h
-./agentx/subagent.lo: ../../include/net-snmp/library/snmp_impl.h
-./agentx/subagent.lo: ../../include/net-snmp/library/snmp.h
-./agentx/subagent.lo: ../../include/net-snmp/library/snmp-tc.h
-./agentx/subagent.lo: ../../include/net-snmp/utilities.h
+./agentx/subagent.lo: ../../include/net-snmp/varbind_api.h
 ./agentx/subagent.lo: ../../include/net-snmp/library/snmp_client.h
-./agentx/subagent.lo: ../../include/net-snmp/library/system.h
-./agentx/subagent.lo: ../../include/net-snmp/library/tools.h
-./agentx/subagent.lo: ../../include/net-snmp/library/int64.h
-./agentx/subagent.lo: ../../include/net-snmp/library/mt_support.h
-./agentx/subagent.lo: ../../include/net-snmp/library/snmp_alarm.h
-./agentx/subagent.lo: ../../include/net-snmp/library/callback.h
-./agentx/subagent.lo: ../../include/net-snmp/library/data_list.h
-./agentx/subagent.lo: ../../include/net-snmp/library/oid_stash.h
-./agentx/subagent.lo: ../../include/net-snmp/library/check_varbind.h
-./agentx/subagent.lo: ../../include/net-snmp/library/container.h
-./agentx/subagent.lo: ../../include/net-snmp/library/factory.h
-./agentx/subagent.lo: ../../include/net-snmp/library/snmp_logging.h
-./agentx/subagent.lo: ../../include/net-snmp/library/container_binary_array.h
-./agentx/subagent.lo: ../../include/net-snmp/library/container_list_ssll.h
-./agentx/subagent.lo: ../../include/net-snmp/library/container_iterator.h
-./agentx/subagent.lo: ../../include/net-snmp/library/container.h
-./agentx/subagent.lo: ../../include/net-snmp/library/snmp_assert.h
-./agentx/subagent.lo: ../../include/net-snmp/version.h
+./agentx/subagent.lo: ../../include/net-snmp/pdu_api.h
+./agentx/subagent.lo: ../../include/net-snmp/library/asn1.h
 ./agentx/subagent.lo: ../../include/net-snmp/session_api.h
+./agentx/subagent.lo: ../../include/net-snmp/library/callback.h
 ./agentx/subagent.lo: ../../include/net-snmp/library/snmp_transport.h
 ./agentx/subagent.lo: ../../include/net-snmp/library/snmp_service.h
 ./agentx/subagent.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -2189,11 +1581,31 @@
 ./agentx/subagent.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./agentx/subagent.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./agentx/subagent.lo: ../../include/net-snmp/library/ucd_compat.h
-./agentx/subagent.lo: ../../include/net-snmp/pdu_api.h
-./agentx/subagent.lo: ../../include/net-snmp/mib_api.h
 ./agentx/subagent.lo: ../../include/net-snmp/library/mib.h
+./agentx/subagent.lo: ../../include/net-snmp/mib_api.h
 ./agentx/subagent.lo: ../../include/net-snmp/library/parse.h
-./agentx/subagent.lo: ../../include/net-snmp/varbind_api.h
+./agentx/subagent.lo: ../../include/net-snmp/library/oid_stash.h
+./agentx/subagent.lo: ../../include/net-snmp/library/snmp_impl.h
+./agentx/subagent.lo: ../../include/net-snmp/library/snmp.h
+./agentx/subagent.lo: ../../include/net-snmp/library/snmp-tc.h
+./agentx/subagent.lo: ../../include/net-snmp/library/getopt.h
+./agentx/subagent.lo: ../../include/net-snmp/utilities.h
+./agentx/subagent.lo: ../../include/net-snmp/library/system.h
+./agentx/subagent.lo: ../../include/net-snmp/library/tools.h
+./agentx/subagent.lo: ../../include/net-snmp/library/int64.h
+./agentx/subagent.lo: ../../include/net-snmp/library/mt_support.h
+./agentx/subagent.lo: ../../include/net-snmp/library/snmp_alarm.h
+./agentx/subagent.lo: ../../include/net-snmp/library/data_list.h
+./agentx/subagent.lo: ../../include/net-snmp/library/check_varbind.h
+./agentx/subagent.lo: ../../include/net-snmp/library/container.h
+./agentx/subagent.lo: ../../include/net-snmp/library/factory.h
+./agentx/subagent.lo: ../../include/net-snmp/library/snmp_logging.h
+./agentx/subagent.lo: ../../include/net-snmp/library/container_binary_array.h
+./agentx/subagent.lo: ../../include/net-snmp/library/container_list_ssll.h
+./agentx/subagent.lo: ../../include/net-snmp/library/container_iterator.h
+./agentx/subagent.lo: ../../include/net-snmp/library/container.h
+./agentx/subagent.lo: ../../include/net-snmp/library/snmp_assert.h
+./agentx/subagent.lo: ../../include/net-snmp/version.h
 ./agentx/subagent.lo: ../../include/net-snmp/config_api.h
 ./agentx/subagent.lo: ../../include/net-snmp/library/read_config.h
 ./agentx/subagent.lo: ../../include/net-snmp/library/default_store.h
@@ -2250,7 +1662,9 @@
 ./agentx/subagent.lo: agentx/protocol.h agentx/client.h
 ./agentx/subagent.lo: agentx/agentx_config.h
 ./agentx/subagent.lo: ../../include/net-snmp/agent/agent_callbacks.h
-./agentx/subagent.lo: mibII/sysORTable.h ./agentx/subagent.h
+./agentx/subagent.lo: ../../include/net-snmp/agent/sysORTable.h
+./agentx/subagent.lo: ../../include/net-snmp/agent/agent_sysORTable.h
+./agentx/subagent.lo: ./agentx/subagent.h
 ./disman/mteEventNotificationTable.lo: ../../include/net-snmp/net-snmp-config.h
 ./disman/mteEventNotificationTable.lo: ../../include/net-snmp/system/linux.h
 ./disman/mteEventNotificationTable.lo: ../../include/net-snmp/system/sysv.h
@@ -2259,32 +1673,14 @@
 ./disman/mteEventNotificationTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./disman/mteEventNotificationTable.lo: ../../include/net-snmp/definitions.h
 ./disman/mteEventNotificationTable.lo: ../../include/net-snmp/types.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/types.h
 ./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/snmp_api.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/asn1.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/snmp.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/utilities.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/varbind_api.h
 ./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/snmp_client.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/system.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/tools.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/int64.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/mt_support.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/callback.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/data_list.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/oid_stash.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/check_varbind.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/container.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/factory.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/container_iterator.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/container.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/version.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/pdu_api.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/asn1.h
 ./disman/mteEventNotificationTable.lo: ../../include/net-snmp/session_api.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/callback.h
 ./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -2295,11 +1691,31 @@
 ./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/pdu_api.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/mib_api.h
 ./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/mib.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/mib_api.h
 ./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/parse.h
-./disman/mteEventNotificationTable.lo: ../../include/net-snmp/varbind_api.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/oid_stash.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/snmp.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/getopt.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/utilities.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/system.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/tools.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/int64.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/mt_support.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/data_list.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/check_varbind.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/container.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/factory.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/container_iterator.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/container.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./disman/mteEventNotificationTable.lo: ../../include/net-snmp/version.h
 ./disman/mteEventNotificationTable.lo: ../../include/net-snmp/config_api.h
 ./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/read_config.h
 ./disman/mteEventNotificationTable.lo: ../../include/net-snmp/library/default_store.h
@@ -2362,32 +1778,14 @@
 ./disman/mteEventTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./disman/mteEventTable.lo: ../../include/net-snmp/definitions.h
 ./disman/mteEventTable.lo: ../../include/net-snmp/types.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/types.h
 ./disman/mteEventTable.lo: ../../include/net-snmp/library/snmp_api.h
-./disman/mteEventTable.lo: ../../include/net-snmp/library/asn1.h
-./disman/mteEventTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./disman/mteEventTable.lo: ../../include/net-snmp/library/snmp.h
-./disman/mteEventTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./disman/mteEventTable.lo: ../../include/net-snmp/utilities.h
+./disman/mteEventTable.lo: ../../include/net-snmp/varbind_api.h
 ./disman/mteEventTable.lo: ../../include/net-snmp/library/snmp_client.h
-./disman/mteEventTable.lo: ../../include/net-snmp/library/system.h
-./disman/mteEventTable.lo: ../../include/net-snmp/library/tools.h
-./disman/mteEventTable.lo: ../../include/net-snmp/library/int64.h
-./disman/mteEventTable.lo: ../../include/net-snmp/library/mt_support.h
-./disman/mteEventTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./disman/mteEventTable.lo: ../../include/net-snmp/library/callback.h
-./disman/mteEventTable.lo: ../../include/net-snmp/library/data_list.h
-./disman/mteEventTable.lo: ../../include/net-snmp/library/oid_stash.h
-./disman/mteEventTable.lo: ../../include/net-snmp/library/check_varbind.h
-./disman/mteEventTable.lo: ../../include/net-snmp/library/container.h
-./disman/mteEventTable.lo: ../../include/net-snmp/library/factory.h
-./disman/mteEventTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./disman/mteEventTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./disman/mteEventTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./disman/mteEventTable.lo: ../../include/net-snmp/library/container_iterator.h
-./disman/mteEventTable.lo: ../../include/net-snmp/library/container.h
-./disman/mteEventTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./disman/mteEventTable.lo: ../../include/net-snmp/version.h
+./disman/mteEventTable.lo: ../../include/net-snmp/pdu_api.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/asn1.h
 ./disman/mteEventTable.lo: ../../include/net-snmp/session_api.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/callback.h
 ./disman/mteEventTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./disman/mteEventTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./disman/mteEventTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -2398,11 +1796,31 @@
 ./disman/mteEventTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./disman/mteEventTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./disman/mteEventTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./disman/mteEventTable.lo: ../../include/net-snmp/pdu_api.h
-./disman/mteEventTable.lo: ../../include/net-snmp/mib_api.h
 ./disman/mteEventTable.lo: ../../include/net-snmp/library/mib.h
+./disman/mteEventTable.lo: ../../include/net-snmp/mib_api.h
 ./disman/mteEventTable.lo: ../../include/net-snmp/library/parse.h
-./disman/mteEventTable.lo: ../../include/net-snmp/varbind_api.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/oid_stash.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/snmp.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/getopt.h
+./disman/mteEventTable.lo: ../../include/net-snmp/utilities.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/system.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/tools.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/int64.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/mt_support.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/data_list.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/check_varbind.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/container.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/factory.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/container_iterator.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/container.h
+./disman/mteEventTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./disman/mteEventTable.lo: ../../include/net-snmp/version.h
 ./disman/mteEventTable.lo: ../../include/net-snmp/config_api.h
 ./disman/mteEventTable.lo: ../../include/net-snmp/library/read_config.h
 ./disman/mteEventTable.lo: ../../include/net-snmp/library/default_store.h
@@ -2468,32 +1886,14 @@
 ./disman/mteObjectsTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./disman/mteObjectsTable.lo: ../../include/net-snmp/definitions.h
 ./disman/mteObjectsTable.lo: ../../include/net-snmp/types.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/types.h
 ./disman/mteObjectsTable.lo: ../../include/net-snmp/library/snmp_api.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/library/asn1.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/library/snmp.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/utilities.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/varbind_api.h
 ./disman/mteObjectsTable.lo: ../../include/net-snmp/library/snmp_client.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/library/system.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/library/tools.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/library/int64.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/library/mt_support.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/library/callback.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/library/data_list.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/library/oid_stash.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/library/check_varbind.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/library/container.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/library/factory.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/library/container_iterator.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/library/container.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/version.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/pdu_api.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/asn1.h
 ./disman/mteObjectsTable.lo: ../../include/net-snmp/session_api.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/callback.h
 ./disman/mteObjectsTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./disman/mteObjectsTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./disman/mteObjectsTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -2504,11 +1904,31 @@
 ./disman/mteObjectsTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./disman/mteObjectsTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./disman/mteObjectsTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/pdu_api.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/mib_api.h
 ./disman/mteObjectsTable.lo: ../../include/net-snmp/library/mib.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/mib_api.h
 ./disman/mteObjectsTable.lo: ../../include/net-snmp/library/parse.h
-./disman/mteObjectsTable.lo: ../../include/net-snmp/varbind_api.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/oid_stash.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/snmp.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/getopt.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/utilities.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/system.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/tools.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/int64.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/mt_support.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/data_list.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/check_varbind.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/container.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/factory.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/container_iterator.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/container.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./disman/mteObjectsTable.lo: ../../include/net-snmp/version.h
 ./disman/mteObjectsTable.lo: ../../include/net-snmp/config_api.h
 ./disman/mteObjectsTable.lo: ../../include/net-snmp/library/read_config.h
 ./disman/mteObjectsTable.lo: ../../include/net-snmp/library/default_store.h
@@ -2572,32 +1992,14 @@
 ./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/definitions.h
 ./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/types.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/types.h
 ./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/snmp_api.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/asn1.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/snmp.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/utilities.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/varbind_api.h
 ./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/snmp_client.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/system.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/tools.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/int64.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/mt_support.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/callback.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/data_list.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/oid_stash.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/check_varbind.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/container.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/factory.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/container_iterator.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/container.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/version.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/pdu_api.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/asn1.h
 ./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/session_api.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/callback.h
 ./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -2608,11 +2010,31 @@
 ./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/pdu_api.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/mib_api.h
 ./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/mib.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/mib_api.h
 ./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/parse.h
-./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/varbind_api.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/oid_stash.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/snmp.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/getopt.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/utilities.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/system.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/tools.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/int64.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/mt_support.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/data_list.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/check_varbind.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/container.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/factory.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/container_iterator.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/container.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/version.h
 ./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/config_api.h
 ./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/read_config.h
 ./disman/mteTriggerBooleanTable.lo: ../../include/net-snmp/library/default_store.h
@@ -2677,32 +2099,14 @@
 ./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/definitions.h
 ./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/types.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/types.h
 ./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/snmp_api.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/asn1.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/snmp.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/utilities.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/varbind_api.h
 ./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/snmp_client.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/system.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/tools.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/int64.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/mt_support.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/callback.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/data_list.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/oid_stash.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/check_varbind.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/container.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/factory.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/container_iterator.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/container.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/version.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/pdu_api.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/asn1.h
 ./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/session_api.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/callback.h
 ./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -2713,11 +2117,31 @@
 ./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/pdu_api.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/mib_api.h
 ./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/mib.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/mib_api.h
 ./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/parse.h
-./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/varbind_api.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/oid_stash.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/snmp.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/getopt.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/utilities.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/system.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/tools.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/int64.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/mt_support.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/data_list.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/check_varbind.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/container.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/factory.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/container_iterator.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/container.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/version.h
 ./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/config_api.h
 ./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/read_config.h
 ./disman/mteTriggerDeltaTable.lo: ../../include/net-snmp/library/default_store.h
@@ -2782,32 +2206,14 @@
 ./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/definitions.h
 ./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/types.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/types.h
 ./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/snmp_api.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/asn1.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/snmp.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/utilities.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/varbind_api.h
 ./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/snmp_client.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/system.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/tools.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/int64.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/mt_support.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/callback.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/data_list.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/oid_stash.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/check_varbind.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/container.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/factory.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/container_iterator.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/container.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/version.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/pdu_api.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/asn1.h
 ./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/session_api.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/callback.h
 ./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -2818,11 +2224,31 @@
 ./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/pdu_api.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/mib_api.h
 ./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/mib.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/mib_api.h
 ./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/parse.h
-./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/varbind_api.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/oid_stash.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/snmp.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/getopt.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/utilities.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/system.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/tools.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/int64.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/mt_support.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/data_list.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/check_varbind.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/container.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/factory.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/container_iterator.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/container.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/version.h
 ./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/config_api.h
 ./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/read_config.h
 ./disman/mteTriggerExistenceTable.lo: ../../include/net-snmp/library/default_store.h
@@ -2887,32 +2313,14 @@
 ./disman/mteTriggerTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./disman/mteTriggerTable.lo: ../../include/net-snmp/definitions.h
 ./disman/mteTriggerTable.lo: ../../include/net-snmp/types.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/types.h
 ./disman/mteTriggerTable.lo: ../../include/net-snmp/library/snmp_api.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/library/asn1.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/library/snmp.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/utilities.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/varbind_api.h
 ./disman/mteTriggerTable.lo: ../../include/net-snmp/library/snmp_client.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/library/system.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/library/tools.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/library/int64.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/library/mt_support.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/library/callback.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/library/data_list.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/library/oid_stash.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/library/check_varbind.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/library/container.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/library/factory.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/library/container_iterator.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/library/container.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/version.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/pdu_api.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/asn1.h
 ./disman/mteTriggerTable.lo: ../../include/net-snmp/session_api.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/callback.h
 ./disman/mteTriggerTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./disman/mteTriggerTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./disman/mteTriggerTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -2923,11 +2331,31 @@
 ./disman/mteTriggerTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./disman/mteTriggerTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./disman/mteTriggerTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/pdu_api.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/mib_api.h
 ./disman/mteTriggerTable.lo: ../../include/net-snmp/library/mib.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/mib_api.h
 ./disman/mteTriggerTable.lo: ../../include/net-snmp/library/parse.h
-./disman/mteTriggerTable.lo: ../../include/net-snmp/varbind_api.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/oid_stash.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/snmp.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/getopt.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/utilities.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/system.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/tools.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/int64.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/mt_support.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/data_list.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/check_varbind.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/container.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/factory.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/container_iterator.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/container.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./disman/mteTriggerTable.lo: ../../include/net-snmp/version.h
 ./disman/mteTriggerTable.lo: ../../include/net-snmp/config_api.h
 ./disman/mteTriggerTable.lo: ../../include/net-snmp/library/read_config.h
 ./disman/mteTriggerTable.lo: ../../include/net-snmp/library/default_store.h
@@ -2996,32 +2424,14 @@
 ./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/definitions.h
 ./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/types.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/types.h
 ./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/snmp_api.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/asn1.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/snmp.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/utilities.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/varbind_api.h
 ./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/snmp_client.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/system.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/tools.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/int64.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/mt_support.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/callback.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/data_list.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/oid_stash.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/check_varbind.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/container.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/factory.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/container_iterator.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/container.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/version.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/pdu_api.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/asn1.h
 ./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/session_api.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/callback.h
 ./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -3032,11 +2442,31 @@
 ./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/pdu_api.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/mib_api.h
 ./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/mib.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/mib_api.h
 ./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/parse.h
-./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/varbind_api.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/oid_stash.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/snmp.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/getopt.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/utilities.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/system.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/tools.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/int64.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/mt_support.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/data_list.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/check_varbind.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/container.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/factory.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/container_iterator.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/container.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/version.h
 ./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/config_api.h
 ./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/read_config.h
 ./disman/mteTriggerThresholdTable.lo: ../../include/net-snmp/library/default_store.h
@@ -3101,32 +2531,14 @@
 ./examples/data_set.lo: ../../include/net-snmp/net-snmp-includes.h
 ./examples/data_set.lo: ../../include/net-snmp/definitions.h
 ./examples/data_set.lo: ../../include/net-snmp/types.h
+./examples/data_set.lo: ../../include/net-snmp/library/types.h
 ./examples/data_set.lo: ../../include/net-snmp/library/snmp_api.h
-./examples/data_set.lo: ../../include/net-snmp/library/asn1.h
-./examples/data_set.lo: ../../include/net-snmp/library/snmp_impl.h
-./examples/data_set.lo: ../../include/net-snmp/library/snmp.h
-./examples/data_set.lo: ../../include/net-snmp/library/snmp-tc.h
-./examples/data_set.lo: ../../include/net-snmp/utilities.h
+./examples/data_set.lo: ../../include/net-snmp/varbind_api.h
 ./examples/data_set.lo: ../../include/net-snmp/library/snmp_client.h
-./examples/data_set.lo: ../../include/net-snmp/library/system.h
-./examples/data_set.lo: ../../include/net-snmp/library/tools.h
-./examples/data_set.lo: ../../include/net-snmp/library/int64.h
-./examples/data_set.lo: ../../include/net-snmp/library/mt_support.h
-./examples/data_set.lo: ../../include/net-snmp/library/snmp_alarm.h
-./examples/data_set.lo: ../../include/net-snmp/library/callback.h
-./examples/data_set.lo: ../../include/net-snmp/library/data_list.h
-./examples/data_set.lo: ../../include/net-snmp/library/oid_stash.h
-./examples/data_set.lo: ../../include/net-snmp/library/check_varbind.h
-./examples/data_set.lo: ../../include/net-snmp/library/container.h
-./examples/data_set.lo: ../../include/net-snmp/library/factory.h
-./examples/data_set.lo: ../../include/net-snmp/library/snmp_logging.h
-./examples/data_set.lo: ../../include/net-snmp/library/container_binary_array.h
-./examples/data_set.lo: ../../include/net-snmp/library/container_list_ssll.h
-./examples/data_set.lo: ../../include/net-snmp/library/container_iterator.h
-./examples/data_set.lo: ../../include/net-snmp/library/container.h
-./examples/data_set.lo: ../../include/net-snmp/library/snmp_assert.h
-./examples/data_set.lo: ../../include/net-snmp/version.h
+./examples/data_set.lo: ../../include/net-snmp/pdu_api.h
+./examples/data_set.lo: ../../include/net-snmp/library/asn1.h
 ./examples/data_set.lo: ../../include/net-snmp/session_api.h
+./examples/data_set.lo: ../../include/net-snmp/library/callback.h
 ./examples/data_set.lo: ../../include/net-snmp/library/snmp_transport.h
 ./examples/data_set.lo: ../../include/net-snmp/library/snmp_service.h
 ./examples/data_set.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -3137,11 +2549,31 @@
 ./examples/data_set.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./examples/data_set.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./examples/data_set.lo: ../../include/net-snmp/library/ucd_compat.h
-./examples/data_set.lo: ../../include/net-snmp/pdu_api.h
-./examples/data_set.lo: ../../include/net-snmp/mib_api.h
 ./examples/data_set.lo: ../../include/net-snmp/library/mib.h
+./examples/data_set.lo: ../../include/net-snmp/mib_api.h
 ./examples/data_set.lo: ../../include/net-snmp/library/parse.h
-./examples/data_set.lo: ../../include/net-snmp/varbind_api.h
+./examples/data_set.lo: ../../include/net-snmp/library/oid_stash.h
+./examples/data_set.lo: ../../include/net-snmp/library/snmp_impl.h
+./examples/data_set.lo: ../../include/net-snmp/library/snmp.h
+./examples/data_set.lo: ../../include/net-snmp/library/snmp-tc.h
+./examples/data_set.lo: ../../include/net-snmp/library/getopt.h
+./examples/data_set.lo: ../../include/net-snmp/utilities.h
+./examples/data_set.lo: ../../include/net-snmp/library/system.h
+./examples/data_set.lo: ../../include/net-snmp/library/tools.h
+./examples/data_set.lo: ../../include/net-snmp/library/int64.h
+./examples/data_set.lo: ../../include/net-snmp/library/mt_support.h
+./examples/data_set.lo: ../../include/net-snmp/library/snmp_alarm.h
+./examples/data_set.lo: ../../include/net-snmp/library/data_list.h
+./examples/data_set.lo: ../../include/net-snmp/library/check_varbind.h
+./examples/data_set.lo: ../../include/net-snmp/library/container.h
+./examples/data_set.lo: ../../include/net-snmp/library/factory.h
+./examples/data_set.lo: ../../include/net-snmp/library/snmp_logging.h
+./examples/data_set.lo: ../../include/net-snmp/library/container_binary_array.h
+./examples/data_set.lo: ../../include/net-snmp/library/container_list_ssll.h
+./examples/data_set.lo: ../../include/net-snmp/library/container_iterator.h
+./examples/data_set.lo: ../../include/net-snmp/library/container.h
+./examples/data_set.lo: ../../include/net-snmp/library/snmp_assert.h
+./examples/data_set.lo: ../../include/net-snmp/version.h
 ./examples/data_set.lo: ../../include/net-snmp/config_api.h
 ./examples/data_set.lo: ../../include/net-snmp/library/read_config.h
 ./examples/data_set.lo: ../../include/net-snmp/library/default_store.h
@@ -3203,32 +2635,14 @@
 ./examples/delayed_instance.lo: ../../include/net-snmp/net-snmp-includes.h
 ./examples/delayed_instance.lo: ../../include/net-snmp/definitions.h
 ./examples/delayed_instance.lo: ../../include/net-snmp/types.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/types.h
 ./examples/delayed_instance.lo: ../../include/net-snmp/library/snmp_api.h
-./examples/delayed_instance.lo: ../../include/net-snmp/library/asn1.h
-./examples/delayed_instance.lo: ../../include/net-snmp/library/snmp_impl.h
-./examples/delayed_instance.lo: ../../include/net-snmp/library/snmp.h
-./examples/delayed_instance.lo: ../../include/net-snmp/library/snmp-tc.h
-./examples/delayed_instance.lo: ../../include/net-snmp/utilities.h
+./examples/delayed_instance.lo: ../../include/net-snmp/varbind_api.h
 ./examples/delayed_instance.lo: ../../include/net-snmp/library/snmp_client.h
-./examples/delayed_instance.lo: ../../include/net-snmp/library/system.h
-./examples/delayed_instance.lo: ../../include/net-snmp/library/tools.h
-./examples/delayed_instance.lo: ../../include/net-snmp/library/int64.h
-./examples/delayed_instance.lo: ../../include/net-snmp/library/mt_support.h
-./examples/delayed_instance.lo: ../../include/net-snmp/library/snmp_alarm.h
-./examples/delayed_instance.lo: ../../include/net-snmp/library/callback.h
-./examples/delayed_instance.lo: ../../include/net-snmp/library/data_list.h
-./examples/delayed_instance.lo: ../../include/net-snmp/library/oid_stash.h
-./examples/delayed_instance.lo: ../../include/net-snmp/library/check_varbind.h
-./examples/delayed_instance.lo: ../../include/net-snmp/library/container.h
-./examples/delayed_instance.lo: ../../include/net-snmp/library/factory.h
-./examples/delayed_instance.lo: ../../include/net-snmp/library/snmp_logging.h
-./examples/delayed_instance.lo: ../../include/net-snmp/library/container_binary_array.h
-./examples/delayed_instance.lo: ../../include/net-snmp/library/container_list_ssll.h
-./examples/delayed_instance.lo: ../../include/net-snmp/library/container_iterator.h
-./examples/delayed_instance.lo: ../../include/net-snmp/library/container.h
-./examples/delayed_instance.lo: ../../include/net-snmp/library/snmp_assert.h
-./examples/delayed_instance.lo: ../../include/net-snmp/version.h
+./examples/delayed_instance.lo: ../../include/net-snmp/pdu_api.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/asn1.h
 ./examples/delayed_instance.lo: ../../include/net-snmp/session_api.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/callback.h
 ./examples/delayed_instance.lo: ../../include/net-snmp/library/snmp_transport.h
 ./examples/delayed_instance.lo: ../../include/net-snmp/library/snmp_service.h
 ./examples/delayed_instance.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -3239,11 +2653,31 @@
 ./examples/delayed_instance.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./examples/delayed_instance.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./examples/delayed_instance.lo: ../../include/net-snmp/library/ucd_compat.h
-./examples/delayed_instance.lo: ../../include/net-snmp/pdu_api.h
-./examples/delayed_instance.lo: ../../include/net-snmp/mib_api.h
 ./examples/delayed_instance.lo: ../../include/net-snmp/library/mib.h
+./examples/delayed_instance.lo: ../../include/net-snmp/mib_api.h
 ./examples/delayed_instance.lo: ../../include/net-snmp/library/parse.h
-./examples/delayed_instance.lo: ../../include/net-snmp/varbind_api.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/oid_stash.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/snmp_impl.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/snmp.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/snmp-tc.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/getopt.h
+./examples/delayed_instance.lo: ../../include/net-snmp/utilities.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/system.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/tools.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/int64.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/mt_support.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/snmp_alarm.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/data_list.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/check_varbind.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/container.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/factory.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/snmp_logging.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/container_binary_array.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/container_list_ssll.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/container_iterator.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/container.h
+./examples/delayed_instance.lo: ../../include/net-snmp/library/snmp_assert.h
+./examples/delayed_instance.lo: ../../include/net-snmp/version.h
 ./examples/delayed_instance.lo: ../../include/net-snmp/config_api.h
 ./examples/delayed_instance.lo: ../../include/net-snmp/library/read_config.h
 ./examples/delayed_instance.lo: ../../include/net-snmp/library/default_store.h
@@ -3306,32 +2740,14 @@
 ./examples/example.lo: ../../include/net-snmp/net-snmp-includes.h
 ./examples/example.lo: ../../include/net-snmp/definitions.h
 ./examples/example.lo: ../../include/net-snmp/types.h
+./examples/example.lo: ../../include/net-snmp/library/types.h
 ./examples/example.lo: ../../include/net-snmp/library/snmp_api.h
-./examples/example.lo: ../../include/net-snmp/library/asn1.h
-./examples/example.lo: ../../include/net-snmp/library/snmp_impl.h
-./examples/example.lo: ../../include/net-snmp/library/snmp.h
-./examples/example.lo: ../../include/net-snmp/library/snmp-tc.h
-./examples/example.lo: ../../include/net-snmp/utilities.h
+./examples/example.lo: ../../include/net-snmp/varbind_api.h
 ./examples/example.lo: ../../include/net-snmp/library/snmp_client.h
-./examples/example.lo: ../../include/net-snmp/library/system.h
-./examples/example.lo: ../../include/net-snmp/library/tools.h
-./examples/example.lo: ../../include/net-snmp/library/int64.h
-./examples/example.lo: ../../include/net-snmp/library/mt_support.h
-./examples/example.lo: ../../include/net-snmp/library/snmp_alarm.h
-./examples/example.lo: ../../include/net-snmp/library/callback.h
-./examples/example.lo: ../../include/net-snmp/library/data_list.h
-./examples/example.lo: ../../include/net-snmp/library/oid_stash.h
-./examples/example.lo: ../../include/net-snmp/library/check_varbind.h
-./examples/example.lo: ../../include/net-snmp/library/container.h
-./examples/example.lo: ../../include/net-snmp/library/factory.h
-./examples/example.lo: ../../include/net-snmp/library/snmp_logging.h
-./examples/example.lo: ../../include/net-snmp/library/container_binary_array.h
-./examples/example.lo: ../../include/net-snmp/library/container_list_ssll.h
-./examples/example.lo: ../../include/net-snmp/library/container_iterator.h
-./examples/example.lo: ../../include/net-snmp/library/container.h
-./examples/example.lo: ../../include/net-snmp/library/snmp_assert.h
-./examples/example.lo: ../../include/net-snmp/version.h
+./examples/example.lo: ../../include/net-snmp/pdu_api.h
+./examples/example.lo: ../../include/net-snmp/library/asn1.h
 ./examples/example.lo: ../../include/net-snmp/session_api.h
+./examples/example.lo: ../../include/net-snmp/library/callback.h
 ./examples/example.lo: ../../include/net-snmp/library/snmp_transport.h
 ./examples/example.lo: ../../include/net-snmp/library/snmp_service.h
 ./examples/example.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -3342,11 +2758,31 @@
 ./examples/example.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./examples/example.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./examples/example.lo: ../../include/net-snmp/library/ucd_compat.h
-./examples/example.lo: ../../include/net-snmp/pdu_api.h
-./examples/example.lo: ../../include/net-snmp/mib_api.h
 ./examples/example.lo: ../../include/net-snmp/library/mib.h
+./examples/example.lo: ../../include/net-snmp/mib_api.h
 ./examples/example.lo: ../../include/net-snmp/library/parse.h
-./examples/example.lo: ../../include/net-snmp/varbind_api.h
+./examples/example.lo: ../../include/net-snmp/library/oid_stash.h
+./examples/example.lo: ../../include/net-snmp/library/snmp_impl.h
+./examples/example.lo: ../../include/net-snmp/library/snmp.h
+./examples/example.lo: ../../include/net-snmp/library/snmp-tc.h
+./examples/example.lo: ../../include/net-snmp/library/getopt.h
+./examples/example.lo: ../../include/net-snmp/utilities.h
+./examples/example.lo: ../../include/net-snmp/library/system.h
+./examples/example.lo: ../../include/net-snmp/library/tools.h
+./examples/example.lo: ../../include/net-snmp/library/int64.h
+./examples/example.lo: ../../include/net-snmp/library/mt_support.h
+./examples/example.lo: ../../include/net-snmp/library/snmp_alarm.h
+./examples/example.lo: ../../include/net-snmp/library/data_list.h
+./examples/example.lo: ../../include/net-snmp/library/check_varbind.h
+./examples/example.lo: ../../include/net-snmp/library/container.h
+./examples/example.lo: ../../include/net-snmp/library/factory.h
+./examples/example.lo: ../../include/net-snmp/library/snmp_logging.h
+./examples/example.lo: ../../include/net-snmp/library/container_binary_array.h
+./examples/example.lo: ../../include/net-snmp/library/container_list_ssll.h
+./examples/example.lo: ../../include/net-snmp/library/container_iterator.h
+./examples/example.lo: ../../include/net-snmp/library/container.h
+./examples/example.lo: ../../include/net-snmp/library/snmp_assert.h
+./examples/example.lo: ../../include/net-snmp/version.h
 ./examples/example.lo: ../../include/net-snmp/config_api.h
 ./examples/example.lo: ../../include/net-snmp/library/read_config.h
 ./examples/example.lo: ../../include/net-snmp/library/default_store.h
@@ -3399,8 +2835,114 @@
 ./examples/example.lo: ../../include/net-snmp/agent/table_iterator.h
 ./examples/example.lo: ../../include/net-snmp/agent/table_container.h
 ./examples/example.lo: ../../include/net-snmp/agent/table_array.h
-./examples/example.lo: ../../include/net-snmp/agent/mfd.h util_funcs.h
-./examples/example.lo: struct.h ./examples/example.h
+./examples/example.lo: ../../include/net-snmp/agent/mfd.h
+./examples/example.lo: util_funcs/header_generic.h ./examples/example.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/net-snmp-config.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/system/linux.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/system/sysv.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/system/generic.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/machine/generic.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/net-snmp-includes.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/definitions.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/types.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/types.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_api.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/varbind_api.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_client.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/pdu_api.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/asn1.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/session_api.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/callback.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_transport.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_service.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/ucd_compat.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/mib.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/mib_api.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/parse.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/oid_stash.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_impl.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp-tc.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/getopt.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/utilities.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/system.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/tools.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/int64.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/mt_support.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_alarm.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/data_list.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/check_varbind.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/container.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/factory.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_logging.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/container_binary_array.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/container_list_ssll.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/container_iterator.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/container.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_assert.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/version.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/config_api.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/read_config.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/default_store.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_enum.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/vacm.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/output_api.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_debug.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/snmpv3_api.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmpv3.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/transform_oids.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/keytools.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/scapi.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/lcd_time.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_secmod.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmpusm.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/mib_module_config.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/agent_module_config.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/snmp_agent.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/snmp_vars.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/agent_handler.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/var_struct.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/agent_registry.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/fd_event_manager.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/ds_agent.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/agent_read_config.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/agent_trap.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/all_helpers.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/instance.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/baby_steps.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/scalar.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/scalar_group.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/watcher.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/multiplexer.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/null.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/debug_handler.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/cache_handler.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/old_api.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/read_only.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/row_merge.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/serialize.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/mode_end_call.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/table.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/table_data.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/table_dataset.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/table_tdata.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/table_iterator.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/table_container.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/table_array.h
+./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/mfd.h
+./examples/netSnmpHostsTable_access.lo: ./examples/netSnmpHostsTable_access.h
+./examples/netSnmpHostsTable_access.lo: ./examples/netSnmpHostsTable_enums.h
 ./examples/netSnmpHostsTable.lo: ../../include/net-snmp/net-snmp-config.h
 ./examples/netSnmpHostsTable.lo: ../../include/net-snmp/system/linux.h
 ./examples/netSnmpHostsTable.lo: ../../include/net-snmp/system/sysv.h
@@ -3409,32 +2951,14 @@
 ./examples/netSnmpHostsTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./examples/netSnmpHostsTable.lo: ../../include/net-snmp/definitions.h
 ./examples/netSnmpHostsTable.lo: ../../include/net-snmp/types.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/types.h
 ./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/snmp_api.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/asn1.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/snmp.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/utilities.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/varbind_api.h
 ./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/snmp_client.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/system.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/tools.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/int64.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/mt_support.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/callback.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/data_list.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/oid_stash.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/check_varbind.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/container.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/factory.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/container_iterator.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/container.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/version.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/pdu_api.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/asn1.h
 ./examples/netSnmpHostsTable.lo: ../../include/net-snmp/session_api.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/callback.h
 ./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -3445,11 +2969,31 @@
 ./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/pdu_api.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/mib_api.h
 ./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/mib.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/mib_api.h
 ./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/parse.h
-./examples/netSnmpHostsTable.lo: ../../include/net-snmp/varbind_api.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/oid_stash.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/snmp.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/getopt.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/utilities.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/system.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/tools.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/int64.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/mt_support.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/data_list.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/check_varbind.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/container.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/factory.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/container_iterator.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/container.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./examples/netSnmpHostsTable.lo: ../../include/net-snmp/version.h
 ./examples/netSnmpHostsTable.lo: ../../include/net-snmp/config_api.h
 ./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/read_config.h
 ./examples/netSnmpHostsTable.lo: ../../include/net-snmp/library/default_store.h
@@ -3508,110 +3052,6 @@
 ./examples/netSnmpHostsTable.lo: ./examples/netSnmpHostsTable_enums.h
 ./examples/netSnmpHostsTable.lo: ./examples/netSnmpHostsTable_checkfns.h
 ./examples/netSnmpHostsTable.lo: ./examples/netSnmpHostsTable_access.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/net-snmp-config.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/system/linux.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/system/sysv.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/system/generic.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/machine/generic.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/net-snmp-includes.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/definitions.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/types.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_api.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/asn1.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_impl.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp-tc.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/utilities.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_client.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/system.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/tools.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/int64.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/mt_support.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_alarm.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/callback.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/data_list.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/oid_stash.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/check_varbind.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/container.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/factory.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_logging.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/container_binary_array.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/container_list_ssll.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/container_iterator.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/container.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_assert.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/version.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/session_api.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_transport.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_service.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmpUnixDomain.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmpUDPDomain.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmpTCPDomain.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmpIPXDomain.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/ucd_compat.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/pdu_api.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/mib_api.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/mib.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/parse.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/varbind_api.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/config_api.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/read_config.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/default_store.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_parse_args.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_enum.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/vacm.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/output_api.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_debug.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/snmpv3_api.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmpv3.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/transform_oids.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/keytools.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/scapi.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/lcd_time.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmp_secmod.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/snmpusm.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/mib_module_config.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/agent_module_config.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/snmp_agent.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/snmp_vars.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/agent_handler.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/var_struct.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/agent_registry.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/library/fd_event_manager.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/ds_agent.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/agent_read_config.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/agent_trap.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/all_helpers.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/instance.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/baby_steps.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/scalar.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/scalar_group.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/watcher.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/multiplexer.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/null.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/debug_handler.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/cache_handler.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/old_api.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/read_only.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/row_merge.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/serialize.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/bulk_to_next.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/mode_end_call.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/table.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/table_data.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/table_dataset.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/table_tdata.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/table_iterator.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/table_container.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/table_array.h
-./examples/netSnmpHostsTable_access.lo: ../../include/net-snmp/agent/mfd.h
-./examples/netSnmpHostsTable_access.lo: ./examples/netSnmpHostsTable_access.h
-./examples/netSnmpHostsTable_access.lo: ./examples/netSnmpHostsTable_enums.h
 ./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/net-snmp-config.h
 ./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/system/linux.h
 ./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/system/sysv.h
@@ -3620,32 +3060,14 @@
 ./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/net-snmp-includes.h
 ./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/definitions.h
 ./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/types.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/types.h
 ./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/snmp_api.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/asn1.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/snmp_impl.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/snmp.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/snmp-tc.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/utilities.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/varbind_api.h
 ./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/snmp_client.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/system.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/tools.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/int64.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/mt_support.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/snmp_alarm.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/callback.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/data_list.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/oid_stash.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/check_varbind.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/container.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/factory.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/snmp_logging.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/container_binary_array.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/container_list_ssll.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/container_iterator.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/container.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/snmp_assert.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/version.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/pdu_api.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/asn1.h
 ./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/session_api.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/callback.h
 ./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/snmp_transport.h
 ./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/snmp_service.h
 ./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -3656,11 +3078,31 @@
 ./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/ucd_compat.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/pdu_api.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/mib_api.h
 ./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/mib.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/mib_api.h
 ./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/parse.h
-./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/varbind_api.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/oid_stash.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/snmp_impl.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/snmp.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/snmp-tc.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/getopt.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/utilities.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/system.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/tools.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/int64.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/mt_support.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/snmp_alarm.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/data_list.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/check_varbind.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/container.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/factory.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/snmp_logging.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/container_binary_array.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/container_list_ssll.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/container_iterator.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/container.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/snmp_assert.h
+./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/version.h
 ./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/config_api.h
 ./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/read_config.h
 ./examples/netSnmpHostsTable_checkfns.lo: ../../include/net-snmp/library/default_store.h
@@ -3689,32 +3131,14 @@
 ./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/net-snmp-includes.h
 ./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/definitions.h
 ./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/types.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/types.h
 ./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/snmp_api.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/asn1.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/snmp_impl.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/snmp.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/snmp-tc.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/utilities.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/varbind_api.h
 ./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/snmp_client.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/system.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/tools.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/int64.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/mt_support.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/snmp_alarm.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/callback.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/data_list.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/oid_stash.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/check_varbind.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/container.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/factory.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/snmp_logging.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/container_binary_array.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/container_list_ssll.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/container_iterator.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/container.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/snmp_assert.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/version.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/pdu_api.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/asn1.h
 ./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/session_api.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/callback.h
 ./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/snmp_transport.h
 ./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/snmp_service.h
 ./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -3725,11 +3149,31 @@
 ./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/ucd_compat.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/pdu_api.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/mib_api.h
 ./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/mib.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/mib_api.h
 ./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/parse.h
-./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/varbind_api.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/oid_stash.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/snmp_impl.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/snmp.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/snmp-tc.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/getopt.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/utilities.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/system.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/tools.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/int64.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/mt_support.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/snmp_alarm.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/data_list.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/check_varbind.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/container.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/factory.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/snmp_logging.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/container_binary_array.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/container_list_ssll.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/container_iterator.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/container.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/snmp_assert.h
+./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/version.h
 ./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/config_api.h
 ./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/read_config.h
 ./examples/netSnmpHostsTable_checkfns_local.lo: ../../include/net-snmp/library/default_store.h
@@ -3757,32 +3201,14 @@
 ./examples/notification.lo: ../../include/net-snmp/net-snmp-includes.h
 ./examples/notification.lo: ../../include/net-snmp/definitions.h
 ./examples/notification.lo: ../../include/net-snmp/types.h
+./examples/notification.lo: ../../include/net-snmp/library/types.h
 ./examples/notification.lo: ../../include/net-snmp/library/snmp_api.h
-./examples/notification.lo: ../../include/net-snmp/library/asn1.h
-./examples/notification.lo: ../../include/net-snmp/library/snmp_impl.h
-./examples/notification.lo: ../../include/net-snmp/library/snmp.h
-./examples/notification.lo: ../../include/net-snmp/library/snmp-tc.h
-./examples/notification.lo: ../../include/net-snmp/utilities.h
+./examples/notification.lo: ../../include/net-snmp/varbind_api.h
 ./examples/notification.lo: ../../include/net-snmp/library/snmp_client.h
-./examples/notification.lo: ../../include/net-snmp/library/system.h
-./examples/notification.lo: ../../include/net-snmp/library/tools.h
-./examples/notification.lo: ../../include/net-snmp/library/int64.h
-./examples/notification.lo: ../../include/net-snmp/library/mt_support.h
-./examples/notification.lo: ../../include/net-snmp/library/snmp_alarm.h
-./examples/notification.lo: ../../include/net-snmp/library/callback.h
-./examples/notification.lo: ../../include/net-snmp/library/data_list.h
-./examples/notification.lo: ../../include/net-snmp/library/oid_stash.h
-./examples/notification.lo: ../../include/net-snmp/library/check_varbind.h
-./examples/notification.lo: ../../include/net-snmp/library/container.h
-./examples/notification.lo: ../../include/net-snmp/library/factory.h
-./examples/notification.lo: ../../include/net-snmp/library/snmp_logging.h
-./examples/notification.lo: ../../include/net-snmp/library/container_binary_array.h
-./examples/notification.lo: ../../include/net-snmp/library/container_list_ssll.h
-./examples/notification.lo: ../../include/net-snmp/library/container_iterator.h
-./examples/notification.lo: ../../include/net-snmp/library/container.h
-./examples/notification.lo: ../../include/net-snmp/library/snmp_assert.h
-./examples/notification.lo: ../../include/net-snmp/version.h
+./examples/notification.lo: ../../include/net-snmp/pdu_api.h
+./examples/notification.lo: ../../include/net-snmp/library/asn1.h
 ./examples/notification.lo: ../../include/net-snmp/session_api.h
+./examples/notification.lo: ../../include/net-snmp/library/callback.h
 ./examples/notification.lo: ../../include/net-snmp/library/snmp_transport.h
 ./examples/notification.lo: ../../include/net-snmp/library/snmp_service.h
 ./examples/notification.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -3793,11 +3219,31 @@
 ./examples/notification.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./examples/notification.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./examples/notification.lo: ../../include/net-snmp/library/ucd_compat.h
-./examples/notification.lo: ../../include/net-snmp/pdu_api.h
-./examples/notification.lo: ../../include/net-snmp/mib_api.h
 ./examples/notification.lo: ../../include/net-snmp/library/mib.h
+./examples/notification.lo: ../../include/net-snmp/mib_api.h
 ./examples/notification.lo: ../../include/net-snmp/library/parse.h
-./examples/notification.lo: ../../include/net-snmp/varbind_api.h
+./examples/notification.lo: ../../include/net-snmp/library/oid_stash.h
+./examples/notification.lo: ../../include/net-snmp/library/snmp_impl.h
+./examples/notification.lo: ../../include/net-snmp/library/snmp.h
+./examples/notification.lo: ../../include/net-snmp/library/snmp-tc.h
+./examples/notification.lo: ../../include/net-snmp/library/getopt.h
+./examples/notification.lo: ../../include/net-snmp/utilities.h
+./examples/notification.lo: ../../include/net-snmp/library/system.h
+./examples/notification.lo: ../../include/net-snmp/library/tools.h
+./examples/notification.lo: ../../include/net-snmp/library/int64.h
+./examples/notification.lo: ../../include/net-snmp/library/mt_support.h
+./examples/notification.lo: ../../include/net-snmp/library/snmp_alarm.h
+./examples/notification.lo: ../../include/net-snmp/library/data_list.h
+./examples/notification.lo: ../../include/net-snmp/library/check_varbind.h
+./examples/notification.lo: ../../include/net-snmp/library/container.h
+./examples/notification.lo: ../../include/net-snmp/library/factory.h
+./examples/notification.lo: ../../include/net-snmp/library/snmp_logging.h
+./examples/notification.lo: ../../include/net-snmp/library/container_binary_array.h
+./examples/notification.lo: ../../include/net-snmp/library/container_list_ssll.h
+./examples/notification.lo: ../../include/net-snmp/library/container_iterator.h
+./examples/notification.lo: ../../include/net-snmp/library/container.h
+./examples/notification.lo: ../../include/net-snmp/library/snmp_assert.h
+./examples/notification.lo: ../../include/net-snmp/version.h
 ./examples/notification.lo: ../../include/net-snmp/config_api.h
 ./examples/notification.lo: ../../include/net-snmp/library/read_config.h
 ./examples/notification.lo: ../../include/net-snmp/library/default_store.h
@@ -3859,32 +3305,14 @@
 ./examples/scalar_int.lo: ../../include/net-snmp/net-snmp-includes.h
 ./examples/scalar_int.lo: ../../include/net-snmp/definitions.h
 ./examples/scalar_int.lo: ../../include/net-snmp/types.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/types.h
 ./examples/scalar_int.lo: ../../include/net-snmp/library/snmp_api.h
-./examples/scalar_int.lo: ../../include/net-snmp/library/asn1.h
-./examples/scalar_int.lo: ../../include/net-snmp/library/snmp_impl.h
-./examples/scalar_int.lo: ../../include/net-snmp/library/snmp.h
-./examples/scalar_int.lo: ../../include/net-snmp/library/snmp-tc.h
-./examples/scalar_int.lo: ../../include/net-snmp/utilities.h
+./examples/scalar_int.lo: ../../include/net-snmp/varbind_api.h
 ./examples/scalar_int.lo: ../../include/net-snmp/library/snmp_client.h
-./examples/scalar_int.lo: ../../include/net-snmp/library/system.h
-./examples/scalar_int.lo: ../../include/net-snmp/library/tools.h
-./examples/scalar_int.lo: ../../include/net-snmp/library/int64.h
-./examples/scalar_int.lo: ../../include/net-snmp/library/mt_support.h
-./examples/scalar_int.lo: ../../include/net-snmp/library/snmp_alarm.h
-./examples/scalar_int.lo: ../../include/net-snmp/library/callback.h
-./examples/scalar_int.lo: ../../include/net-snmp/library/data_list.h
-./examples/scalar_int.lo: ../../include/net-snmp/library/oid_stash.h
-./examples/scalar_int.lo: ../../include/net-snmp/library/check_varbind.h
-./examples/scalar_int.lo: ../../include/net-snmp/library/container.h
-./examples/scalar_int.lo: ../../include/net-snmp/library/factory.h
-./examples/scalar_int.lo: ../../include/net-snmp/library/snmp_logging.h
-./examples/scalar_int.lo: ../../include/net-snmp/library/container_binary_array.h
-./examples/scalar_int.lo: ../../include/net-snmp/library/container_list_ssll.h
-./examples/scalar_int.lo: ../../include/net-snmp/library/container_iterator.h
-./examples/scalar_int.lo: ../../include/net-snmp/library/container.h
-./examples/scalar_int.lo: ../../include/net-snmp/library/snmp_assert.h
-./examples/scalar_int.lo: ../../include/net-snmp/version.h
+./examples/scalar_int.lo: ../../include/net-snmp/pdu_api.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/asn1.h
 ./examples/scalar_int.lo: ../../include/net-snmp/session_api.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/callback.h
 ./examples/scalar_int.lo: ../../include/net-snmp/library/snmp_transport.h
 ./examples/scalar_int.lo: ../../include/net-snmp/library/snmp_service.h
 ./examples/scalar_int.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -3895,11 +3323,31 @@
 ./examples/scalar_int.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./examples/scalar_int.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./examples/scalar_int.lo: ../../include/net-snmp/library/ucd_compat.h
-./examples/scalar_int.lo: ../../include/net-snmp/pdu_api.h
-./examples/scalar_int.lo: ../../include/net-snmp/mib_api.h
 ./examples/scalar_int.lo: ../../include/net-snmp/library/mib.h
+./examples/scalar_int.lo: ../../include/net-snmp/mib_api.h
 ./examples/scalar_int.lo: ../../include/net-snmp/library/parse.h
-./examples/scalar_int.lo: ../../include/net-snmp/varbind_api.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/oid_stash.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/snmp_impl.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/snmp.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/snmp-tc.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/getopt.h
+./examples/scalar_int.lo: ../../include/net-snmp/utilities.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/system.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/tools.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/int64.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/mt_support.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/snmp_alarm.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/data_list.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/check_varbind.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/container.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/factory.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/snmp_logging.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/container_binary_array.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/container_list_ssll.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/container_iterator.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/container.h
+./examples/scalar_int.lo: ../../include/net-snmp/library/snmp_assert.h
+./examples/scalar_int.lo: ../../include/net-snmp/version.h
 ./examples/scalar_int.lo: ../../include/net-snmp/config_api.h
 ./examples/scalar_int.lo: ../../include/net-snmp/library/read_config.h
 ./examples/scalar_int.lo: ../../include/net-snmp/library/default_store.h
@@ -3961,32 +3409,14 @@
 ./examples/ucdDemoPublic.lo: ../../include/net-snmp/net-snmp-includes.h
 ./examples/ucdDemoPublic.lo: ../../include/net-snmp/definitions.h
 ./examples/ucdDemoPublic.lo: ../../include/net-snmp/types.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/types.h
 ./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/snmp_api.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/asn1.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/snmp_impl.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/snmp.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/snmp-tc.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/utilities.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/varbind_api.h
 ./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/snmp_client.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/system.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/tools.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/int64.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/mt_support.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/snmp_alarm.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/callback.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/data_list.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/oid_stash.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/check_varbind.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/container.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/factory.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/snmp_logging.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/container_binary_array.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/container_list_ssll.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/container_iterator.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/container.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/snmp_assert.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/version.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/pdu_api.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/asn1.h
 ./examples/ucdDemoPublic.lo: ../../include/net-snmp/session_api.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/callback.h
 ./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/snmp_transport.h
 ./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/snmp_service.h
 ./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -3997,11 +3427,31 @@
 ./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/ucd_compat.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/pdu_api.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/mib_api.h
 ./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/mib.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/mib_api.h
 ./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/parse.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/varbind_api.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/oid_stash.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/snmp_impl.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/snmp.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/snmp-tc.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/getopt.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/utilities.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/system.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/tools.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/int64.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/mt_support.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/snmp_alarm.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/data_list.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/check_varbind.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/container.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/factory.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/snmp_logging.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/container_binary_array.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/container_list_ssll.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/container_iterator.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/container.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/snmp_assert.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/version.h
 ./examples/ucdDemoPublic.lo: ../../include/net-snmp/config_api.h
 ./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/read_config.h
 ./examples/ucdDemoPublic.lo: ../../include/net-snmp/library/default_store.h
@@ -4054,8 +3504,9 @@
 ./examples/ucdDemoPublic.lo: ../../include/net-snmp/agent/table_iterator.h
 ./examples/ucdDemoPublic.lo: ../../include/net-snmp/agent/table_container.h
 ./examples/ucdDemoPublic.lo: ../../include/net-snmp/agent/table_array.h
-./examples/ucdDemoPublic.lo: ../../include/net-snmp/agent/mfd.h util_funcs.h
-./examples/ucdDemoPublic.lo: struct.h ./examples/ucdDemoPublic.h
+./examples/ucdDemoPublic.lo: ../../include/net-snmp/agent/mfd.h
+./examples/ucdDemoPublic.lo: util_funcs/header_generic.h
+./examples/ucdDemoPublic.lo: ./examples/ucdDemoPublic.h
 ./examples/watched.lo: ../../include/net-snmp/net-snmp-config.h
 ./examples/watched.lo: ../../include/net-snmp/system/linux.h
 ./examples/watched.lo: ../../include/net-snmp/system/sysv.h
@@ -4064,32 +3515,14 @@
 ./examples/watched.lo: ../../include/net-snmp/net-snmp-includes.h
 ./examples/watched.lo: ../../include/net-snmp/definitions.h
 ./examples/watched.lo: ../../include/net-snmp/types.h
+./examples/watched.lo: ../../include/net-snmp/library/types.h
 ./examples/watched.lo: ../../include/net-snmp/library/snmp_api.h
-./examples/watched.lo: ../../include/net-snmp/library/asn1.h
-./examples/watched.lo: ../../include/net-snmp/library/snmp_impl.h
-./examples/watched.lo: ../../include/net-snmp/library/snmp.h
-./examples/watched.lo: ../../include/net-snmp/library/snmp-tc.h
-./examples/watched.lo: ../../include/net-snmp/utilities.h
+./examples/watched.lo: ../../include/net-snmp/varbind_api.h
 ./examples/watched.lo: ../../include/net-snmp/library/snmp_client.h
-./examples/watched.lo: ../../include/net-snmp/library/system.h
-./examples/watched.lo: ../../include/net-snmp/library/tools.h
-./examples/watched.lo: ../../include/net-snmp/library/int64.h
-./examples/watched.lo: ../../include/net-snmp/library/mt_support.h
-./examples/watched.lo: ../../include/net-snmp/library/snmp_alarm.h
-./examples/watched.lo: ../../include/net-snmp/library/callback.h
-./examples/watched.lo: ../../include/net-snmp/library/data_list.h
-./examples/watched.lo: ../../include/net-snmp/library/oid_stash.h
-./examples/watched.lo: ../../include/net-snmp/library/check_varbind.h
-./examples/watched.lo: ../../include/net-snmp/library/container.h
-./examples/watched.lo: ../../include/net-snmp/library/factory.h
-./examples/watched.lo: ../../include/net-snmp/library/snmp_logging.h
-./examples/watched.lo: ../../include/net-snmp/library/container_binary_array.h
-./examples/watched.lo: ../../include/net-snmp/library/container_list_ssll.h
-./examples/watched.lo: ../../include/net-snmp/library/container_iterator.h
-./examples/watched.lo: ../../include/net-snmp/library/container.h
-./examples/watched.lo: ../../include/net-snmp/library/snmp_assert.h
-./examples/watched.lo: ../../include/net-snmp/version.h
+./examples/watched.lo: ../../include/net-snmp/pdu_api.h
+./examples/watched.lo: ../../include/net-snmp/library/asn1.h
 ./examples/watched.lo: ../../include/net-snmp/session_api.h
+./examples/watched.lo: ../../include/net-snmp/library/callback.h
 ./examples/watched.lo: ../../include/net-snmp/library/snmp_transport.h
 ./examples/watched.lo: ../../include/net-snmp/library/snmp_service.h
 ./examples/watched.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -4100,11 +3533,31 @@
 ./examples/watched.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./examples/watched.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./examples/watched.lo: ../../include/net-snmp/library/ucd_compat.h
-./examples/watched.lo: ../../include/net-snmp/pdu_api.h
-./examples/watched.lo: ../../include/net-snmp/mib_api.h
 ./examples/watched.lo: ../../include/net-snmp/library/mib.h
+./examples/watched.lo: ../../include/net-snmp/mib_api.h
 ./examples/watched.lo: ../../include/net-snmp/library/parse.h
-./examples/watched.lo: ../../include/net-snmp/varbind_api.h
+./examples/watched.lo: ../../include/net-snmp/library/oid_stash.h
+./examples/watched.lo: ../../include/net-snmp/library/snmp_impl.h
+./examples/watched.lo: ../../include/net-snmp/library/snmp.h
+./examples/watched.lo: ../../include/net-snmp/library/snmp-tc.h
+./examples/watched.lo: ../../include/net-snmp/library/getopt.h
+./examples/watched.lo: ../../include/net-snmp/utilities.h
+./examples/watched.lo: ../../include/net-snmp/library/system.h
+./examples/watched.lo: ../../include/net-snmp/library/tools.h
+./examples/watched.lo: ../../include/net-snmp/library/int64.h
+./examples/watched.lo: ../../include/net-snmp/library/mt_support.h
+./examples/watched.lo: ../../include/net-snmp/library/snmp_alarm.h
+./examples/watched.lo: ../../include/net-snmp/library/data_list.h
+./examples/watched.lo: ../../include/net-snmp/library/check_varbind.h
+./examples/watched.lo: ../../include/net-snmp/library/container.h
+./examples/watched.lo: ../../include/net-snmp/library/factory.h
+./examples/watched.lo: ../../include/net-snmp/library/snmp_logging.h
+./examples/watched.lo: ../../include/net-snmp/library/container_binary_array.h
+./examples/watched.lo: ../../include/net-snmp/library/container_list_ssll.h
+./examples/watched.lo: ../../include/net-snmp/library/container_iterator.h
+./examples/watched.lo: ../../include/net-snmp/library/container.h
+./examples/watched.lo: ../../include/net-snmp/library/snmp_assert.h
+./examples/watched.lo: ../../include/net-snmp/version.h
 ./examples/watched.lo: ../../include/net-snmp/config_api.h
 ./examples/watched.lo: ../../include/net-snmp/library/read_config.h
 ./examples/watched.lo: ../../include/net-snmp/library/default_store.h
@@ -4167,32 +3620,14 @@
 ./host/hr_device.lo: ../../include/net-snmp/net-snmp-includes.h
 ./host/hr_device.lo: ../../include/net-snmp/definitions.h
 ./host/hr_device.lo: ../../include/net-snmp/types.h
+./host/hr_device.lo: ../../include/net-snmp/library/types.h
 ./host/hr_device.lo: ../../include/net-snmp/library/snmp_api.h
-./host/hr_device.lo: ../../include/net-snmp/library/asn1.h
-./host/hr_device.lo: ../../include/net-snmp/library/snmp_impl.h
-./host/hr_device.lo: ../../include/net-snmp/library/snmp.h
-./host/hr_device.lo: ../../include/net-snmp/library/snmp-tc.h
-./host/hr_device.lo: ../../include/net-snmp/utilities.h
+./host/hr_device.lo: ../../include/net-snmp/varbind_api.h
 ./host/hr_device.lo: ../../include/net-snmp/library/snmp_client.h
-./host/hr_device.lo: ../../include/net-snmp/library/system.h
-./host/hr_device.lo: ../../include/net-snmp/library/tools.h
-./host/hr_device.lo: ../../include/net-snmp/library/int64.h
-./host/hr_device.lo: ../../include/net-snmp/library/mt_support.h
-./host/hr_device.lo: ../../include/net-snmp/library/snmp_alarm.h
-./host/hr_device.lo: ../../include/net-snmp/library/callback.h
-./host/hr_device.lo: ../../include/net-snmp/library/data_list.h
-./host/hr_device.lo: ../../include/net-snmp/library/oid_stash.h
-./host/hr_device.lo: ../../include/net-snmp/library/check_varbind.h
-./host/hr_device.lo: ../../include/net-snmp/library/container.h
-./host/hr_device.lo: ../../include/net-snmp/library/factory.h
-./host/hr_device.lo: ../../include/net-snmp/library/snmp_logging.h
-./host/hr_device.lo: ../../include/net-snmp/library/container_binary_array.h
-./host/hr_device.lo: ../../include/net-snmp/library/container_list_ssll.h
-./host/hr_device.lo: ../../include/net-snmp/library/container_iterator.h
-./host/hr_device.lo: ../../include/net-snmp/library/container.h
-./host/hr_device.lo: ../../include/net-snmp/library/snmp_assert.h
-./host/hr_device.lo: ../../include/net-snmp/version.h
+./host/hr_device.lo: ../../include/net-snmp/pdu_api.h
+./host/hr_device.lo: ../../include/net-snmp/library/asn1.h
 ./host/hr_device.lo: ../../include/net-snmp/session_api.h
+./host/hr_device.lo: ../../include/net-snmp/library/callback.h
 ./host/hr_device.lo: ../../include/net-snmp/library/snmp_transport.h
 ./host/hr_device.lo: ../../include/net-snmp/library/snmp_service.h
 ./host/hr_device.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -4203,11 +3638,31 @@
 ./host/hr_device.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./host/hr_device.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./host/hr_device.lo: ../../include/net-snmp/library/ucd_compat.h
-./host/hr_device.lo: ../../include/net-snmp/pdu_api.h
-./host/hr_device.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_device.lo: ../../include/net-snmp/library/mib.h
+./host/hr_device.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_device.lo: ../../include/net-snmp/library/parse.h
-./host/hr_device.lo: ../../include/net-snmp/varbind_api.h
+./host/hr_device.lo: ../../include/net-snmp/library/oid_stash.h
+./host/hr_device.lo: ../../include/net-snmp/library/snmp_impl.h
+./host/hr_device.lo: ../../include/net-snmp/library/snmp.h
+./host/hr_device.lo: ../../include/net-snmp/library/snmp-tc.h
+./host/hr_device.lo: ../../include/net-snmp/library/getopt.h
+./host/hr_device.lo: ../../include/net-snmp/utilities.h
+./host/hr_device.lo: ../../include/net-snmp/library/system.h
+./host/hr_device.lo: ../../include/net-snmp/library/tools.h
+./host/hr_device.lo: ../../include/net-snmp/library/int64.h
+./host/hr_device.lo: ../../include/net-snmp/library/mt_support.h
+./host/hr_device.lo: ../../include/net-snmp/library/snmp_alarm.h
+./host/hr_device.lo: ../../include/net-snmp/library/data_list.h
+./host/hr_device.lo: ../../include/net-snmp/library/check_varbind.h
+./host/hr_device.lo: ../../include/net-snmp/library/container.h
+./host/hr_device.lo: ../../include/net-snmp/library/factory.h
+./host/hr_device.lo: ../../include/net-snmp/library/snmp_logging.h
+./host/hr_device.lo: ../../include/net-snmp/library/container_binary_array.h
+./host/hr_device.lo: ../../include/net-snmp/library/container_list_ssll.h
+./host/hr_device.lo: ../../include/net-snmp/library/container_iterator.h
+./host/hr_device.lo: ../../include/net-snmp/library/container.h
+./host/hr_device.lo: ../../include/net-snmp/library/snmp_assert.h
+./host/hr_device.lo: ../../include/net-snmp/version.h
 ./host/hr_device.lo: ../../include/net-snmp/config_api.h
 ./host/hr_device.lo: ../../include/net-snmp/library/read_config.h
 ./host/hr_device.lo: ../../include/net-snmp/library/default_store.h
@@ -4240,32 +3695,14 @@
 ./host/hr_disk.lo: ../../include/net-snmp/net-snmp-includes.h
 ./host/hr_disk.lo: ../../include/net-snmp/definitions.h
 ./host/hr_disk.lo: ../../include/net-snmp/types.h
+./host/hr_disk.lo: ../../include/net-snmp/library/types.h
 ./host/hr_disk.lo: ../../include/net-snmp/library/snmp_api.h
-./host/hr_disk.lo: ../../include/net-snmp/library/asn1.h
-./host/hr_disk.lo: ../../include/net-snmp/library/snmp_impl.h
-./host/hr_disk.lo: ../../include/net-snmp/library/snmp.h
-./host/hr_disk.lo: ../../include/net-snmp/library/snmp-tc.h
-./host/hr_disk.lo: ../../include/net-snmp/utilities.h
+./host/hr_disk.lo: ../../include/net-snmp/varbind_api.h
 ./host/hr_disk.lo: ../../include/net-snmp/library/snmp_client.h
-./host/hr_disk.lo: ../../include/net-snmp/library/system.h
-./host/hr_disk.lo: ../../include/net-snmp/library/tools.h
-./host/hr_disk.lo: ../../include/net-snmp/library/int64.h
-./host/hr_disk.lo: ../../include/net-snmp/library/mt_support.h
-./host/hr_disk.lo: ../../include/net-snmp/library/snmp_alarm.h
-./host/hr_disk.lo: ../../include/net-snmp/library/callback.h
-./host/hr_disk.lo: ../../include/net-snmp/library/data_list.h
-./host/hr_disk.lo: ../../include/net-snmp/library/oid_stash.h
-./host/hr_disk.lo: ../../include/net-snmp/library/check_varbind.h
-./host/hr_disk.lo: ../../include/net-snmp/library/container.h
-./host/hr_disk.lo: ../../include/net-snmp/library/factory.h
-./host/hr_disk.lo: ../../include/net-snmp/library/snmp_logging.h
-./host/hr_disk.lo: ../../include/net-snmp/library/container_binary_array.h
-./host/hr_disk.lo: ../../include/net-snmp/library/container_list_ssll.h
-./host/hr_disk.lo: ../../include/net-snmp/library/container_iterator.h
-./host/hr_disk.lo: ../../include/net-snmp/library/container.h
-./host/hr_disk.lo: ../../include/net-snmp/library/snmp_assert.h
-./host/hr_disk.lo: ../../include/net-snmp/version.h
+./host/hr_disk.lo: ../../include/net-snmp/pdu_api.h
+./host/hr_disk.lo: ../../include/net-snmp/library/asn1.h
 ./host/hr_disk.lo: ../../include/net-snmp/session_api.h
+./host/hr_disk.lo: ../../include/net-snmp/library/callback.h
 ./host/hr_disk.lo: ../../include/net-snmp/library/snmp_transport.h
 ./host/hr_disk.lo: ../../include/net-snmp/library/snmp_service.h
 ./host/hr_disk.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -4276,11 +3713,31 @@
 ./host/hr_disk.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./host/hr_disk.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./host/hr_disk.lo: ../../include/net-snmp/library/ucd_compat.h
-./host/hr_disk.lo: ../../include/net-snmp/pdu_api.h
-./host/hr_disk.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_disk.lo: ../../include/net-snmp/library/mib.h
+./host/hr_disk.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_disk.lo: ../../include/net-snmp/library/parse.h
-./host/hr_disk.lo: ../../include/net-snmp/varbind_api.h
+./host/hr_disk.lo: ../../include/net-snmp/library/oid_stash.h
+./host/hr_disk.lo: ../../include/net-snmp/library/snmp_impl.h
+./host/hr_disk.lo: ../../include/net-snmp/library/snmp.h
+./host/hr_disk.lo: ../../include/net-snmp/library/snmp-tc.h
+./host/hr_disk.lo: ../../include/net-snmp/library/getopt.h
+./host/hr_disk.lo: ../../include/net-snmp/utilities.h
+./host/hr_disk.lo: ../../include/net-snmp/library/system.h
+./host/hr_disk.lo: ../../include/net-snmp/library/tools.h
+./host/hr_disk.lo: ../../include/net-snmp/library/int64.h
+./host/hr_disk.lo: ../../include/net-snmp/library/mt_support.h
+./host/hr_disk.lo: ../../include/net-snmp/library/snmp_alarm.h
+./host/hr_disk.lo: ../../include/net-snmp/library/data_list.h
+./host/hr_disk.lo: ../../include/net-snmp/library/check_varbind.h
+./host/hr_disk.lo: ../../include/net-snmp/library/container.h
+./host/hr_disk.lo: ../../include/net-snmp/library/factory.h
+./host/hr_disk.lo: ../../include/net-snmp/library/snmp_logging.h
+./host/hr_disk.lo: ../../include/net-snmp/library/container_binary_array.h
+./host/hr_disk.lo: ../../include/net-snmp/library/container_list_ssll.h
+./host/hr_disk.lo: ../../include/net-snmp/library/container_iterator.h
+./host/hr_disk.lo: ../../include/net-snmp/library/container.h
+./host/hr_disk.lo: ../../include/net-snmp/library/snmp_assert.h
+./host/hr_disk.lo: ../../include/net-snmp/version.h
 ./host/hr_disk.lo: ../../include/net-snmp/config_api.h
 ./host/hr_disk.lo: ../../include/net-snmp/library/read_config.h
 ./host/hr_disk.lo: ../../include/net-snmp/library/default_store.h
@@ -4314,32 +3771,14 @@
 ./host/hr_filesys.lo: ../../include/net-snmp/net-snmp-includes.h
 ./host/hr_filesys.lo: ../../include/net-snmp/definitions.h
 ./host/hr_filesys.lo: ../../include/net-snmp/types.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/types.h
 ./host/hr_filesys.lo: ../../include/net-snmp/library/snmp_api.h
-./host/hr_filesys.lo: ../../include/net-snmp/library/asn1.h
-./host/hr_filesys.lo: ../../include/net-snmp/library/snmp_impl.h
-./host/hr_filesys.lo: ../../include/net-snmp/library/snmp.h
-./host/hr_filesys.lo: ../../include/net-snmp/library/snmp-tc.h
-./host/hr_filesys.lo: ../../include/net-snmp/utilities.h
+./host/hr_filesys.lo: ../../include/net-snmp/varbind_api.h
 ./host/hr_filesys.lo: ../../include/net-snmp/library/snmp_client.h
-./host/hr_filesys.lo: ../../include/net-snmp/library/system.h
-./host/hr_filesys.lo: ../../include/net-snmp/library/tools.h
-./host/hr_filesys.lo: ../../include/net-snmp/library/int64.h
-./host/hr_filesys.lo: ../../include/net-snmp/library/mt_support.h
-./host/hr_filesys.lo: ../../include/net-snmp/library/snmp_alarm.h
-./host/hr_filesys.lo: ../../include/net-snmp/library/callback.h
-./host/hr_filesys.lo: ../../include/net-snmp/library/data_list.h
-./host/hr_filesys.lo: ../../include/net-snmp/library/oid_stash.h
-./host/hr_filesys.lo: ../../include/net-snmp/library/check_varbind.h
-./host/hr_filesys.lo: ../../include/net-snmp/library/container.h
-./host/hr_filesys.lo: ../../include/net-snmp/library/factory.h
-./host/hr_filesys.lo: ../../include/net-snmp/library/snmp_logging.h
-./host/hr_filesys.lo: ../../include/net-snmp/library/container_binary_array.h
-./host/hr_filesys.lo: ../../include/net-snmp/library/container_list_ssll.h
-./host/hr_filesys.lo: ../../include/net-snmp/library/container_iterator.h
-./host/hr_filesys.lo: ../../include/net-snmp/library/container.h
-./host/hr_filesys.lo: ../../include/net-snmp/library/snmp_assert.h
-./host/hr_filesys.lo: ../../include/net-snmp/version.h
+./host/hr_filesys.lo: ../../include/net-snmp/pdu_api.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/asn1.h
 ./host/hr_filesys.lo: ../../include/net-snmp/session_api.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/callback.h
 ./host/hr_filesys.lo: ../../include/net-snmp/library/snmp_transport.h
 ./host/hr_filesys.lo: ../../include/net-snmp/library/snmp_service.h
 ./host/hr_filesys.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -4350,11 +3789,31 @@
 ./host/hr_filesys.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./host/hr_filesys.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./host/hr_filesys.lo: ../../include/net-snmp/library/ucd_compat.h
-./host/hr_filesys.lo: ../../include/net-snmp/pdu_api.h
-./host/hr_filesys.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_filesys.lo: ../../include/net-snmp/library/mib.h
+./host/hr_filesys.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_filesys.lo: ../../include/net-snmp/library/parse.h
-./host/hr_filesys.lo: ../../include/net-snmp/varbind_api.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/oid_stash.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/snmp_impl.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/snmp.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/snmp-tc.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/getopt.h
+./host/hr_filesys.lo: ../../include/net-snmp/utilities.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/system.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/tools.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/int64.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/mt_support.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/snmp_alarm.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/data_list.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/check_varbind.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/container.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/factory.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/snmp_logging.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/container_binary_array.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/container_list_ssll.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/container_iterator.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/container.h
+./host/hr_filesys.lo: ../../include/net-snmp/library/snmp_assert.h
+./host/hr_filesys.lo: ../../include/net-snmp/version.h
 ./host/hr_filesys.lo: ../../include/net-snmp/config_api.h
 ./host/hr_filesys.lo: ../../include/net-snmp/library/read_config.h
 ./host/hr_filesys.lo: ../../include/net-snmp/library/default_store.h
@@ -4410,7 +3869,223 @@
 ./host/hr_filesys.lo: ../../include/net-snmp/agent/mfd.h
 ./host/hr_filesys.lo: ../../include/net-snmp/agent/hardware/memory.h
 ./host/hr_filesys.lo: host_res.h ./host/hr_filesys.h
-./host/hr_filesys.lo: ./host/hr_storage.h
+./host/hr_filesys.lo: ./host/hr_storage.h ./host/hr_disk.h
+./host/hrh_filesys.lo: ../../include/net-snmp/net-snmp-config.h
+./host/hrh_filesys.lo: ../../include/net-snmp/system/linux.h
+./host/hrh_filesys.lo: ../../include/net-snmp/system/sysv.h
+./host/hrh_filesys.lo: ../../include/net-snmp/system/generic.h
+./host/hrh_filesys.lo: ../../include/net-snmp/machine/generic.h
+./host/hrh_filesys.lo: ../../include/net-snmp/net-snmp-includes.h
+./host/hrh_filesys.lo: ../../include/net-snmp/definitions.h
+./host/hrh_filesys.lo: ../../include/net-snmp/types.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/types.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmp_api.h
+./host/hrh_filesys.lo: ../../include/net-snmp/varbind_api.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmp_client.h
+./host/hrh_filesys.lo: ../../include/net-snmp/pdu_api.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/asn1.h
+./host/hrh_filesys.lo: ../../include/net-snmp/session_api.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/callback.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmp_transport.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmp_service.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/ucd_compat.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/mib.h
+./host/hrh_filesys.lo: ../../include/net-snmp/mib_api.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/parse.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/oid_stash.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmp_impl.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmp.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmp-tc.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/getopt.h
+./host/hrh_filesys.lo: ../../include/net-snmp/utilities.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/system.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/tools.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/int64.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/mt_support.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmp_alarm.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/data_list.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/check_varbind.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/container.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/factory.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmp_logging.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/container_binary_array.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/container_list_ssll.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/container_iterator.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/container.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmp_assert.h
+./host/hrh_filesys.lo: ../../include/net-snmp/version.h
+./host/hrh_filesys.lo: ../../include/net-snmp/config_api.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/read_config.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/default_store.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmp_enum.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/vacm.h
+./host/hrh_filesys.lo: ../../include/net-snmp/output_api.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmp_debug.h
+./host/hrh_filesys.lo: ../../include/net-snmp/snmpv3_api.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmpv3.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/transform_oids.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/keytools.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/scapi.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/lcd_time.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmp_secmod.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/snmpusm.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/mib_module_config.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/agent_module_config.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/snmp_agent.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/snmp_vars.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/agent_handler.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/var_struct.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/agent_registry.h
+./host/hrh_filesys.lo: ../../include/net-snmp/library/fd_event_manager.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/ds_agent.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/agent_read_config.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/agent_trap.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/all_helpers.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/instance.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/baby_steps.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/scalar.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/scalar_group.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/watcher.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/multiplexer.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/null.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/debug_handler.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/cache_handler.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/old_api.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/read_only.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/row_merge.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/serialize.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/mode_end_call.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/table.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/table_data.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/table_dataset.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/table_tdata.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/table_iterator.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/table_container.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/table_array.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/mfd.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/hardware/memory.h
+./host/hrh_filesys.lo: ../../include/net-snmp/agent/hardware/fsys.h
+./host/hrh_filesys.lo: host_res.h ./host/hrh_filesys.h
+./host/hrh_filesys.lo: ./host/hrh_storage.h ./host/hr_disk.h
+./host/hrh_storage.lo: ../../include/net-snmp/net-snmp-config.h
+./host/hrh_storage.lo: ../../include/net-snmp/system/linux.h
+./host/hrh_storage.lo: ../../include/net-snmp/system/sysv.h
+./host/hrh_storage.lo: ../../include/net-snmp/system/generic.h
+./host/hrh_storage.lo: ../../include/net-snmp/machine/generic.h
+./host/hrh_storage.lo: ../../include/net-snmp/net-snmp-includes.h
+./host/hrh_storage.lo: ../../include/net-snmp/definitions.h
+./host/hrh_storage.lo: ../../include/net-snmp/types.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/types.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmp_api.h
+./host/hrh_storage.lo: ../../include/net-snmp/varbind_api.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmp_client.h
+./host/hrh_storage.lo: ../../include/net-snmp/pdu_api.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/asn1.h
+./host/hrh_storage.lo: ../../include/net-snmp/session_api.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/callback.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmp_transport.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmp_service.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/ucd_compat.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/mib.h
+./host/hrh_storage.lo: ../../include/net-snmp/mib_api.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/parse.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/oid_stash.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmp_impl.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmp.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmp-tc.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/getopt.h
+./host/hrh_storage.lo: ../../include/net-snmp/utilities.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/system.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/tools.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/int64.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/mt_support.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmp_alarm.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/data_list.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/check_varbind.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/container.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/factory.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmp_logging.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/container_binary_array.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/container_list_ssll.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/container_iterator.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/container.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmp_assert.h
+./host/hrh_storage.lo: ../../include/net-snmp/version.h
+./host/hrh_storage.lo: ../../include/net-snmp/config_api.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/read_config.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/default_store.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmp_enum.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/vacm.h
+./host/hrh_storage.lo: ../../include/net-snmp/output_api.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmp_debug.h
+./host/hrh_storage.lo: ../../include/net-snmp/snmpv3_api.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmpv3.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/transform_oids.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/keytools.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/scapi.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/lcd_time.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmp_secmod.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/snmpusm.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/mib_module_config.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/agent_module_config.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/snmp_agent.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/snmp_vars.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/agent_handler.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/var_struct.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/agent_registry.h
+./host/hrh_storage.lo: ../../include/net-snmp/library/fd_event_manager.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/ds_agent.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/agent_read_config.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/agent_trap.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/all_helpers.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/instance.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/baby_steps.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/scalar.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/scalar_group.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/watcher.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/multiplexer.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/null.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/debug_handler.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/cache_handler.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/old_api.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/read_only.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/row_merge.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/serialize.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/mode_end_call.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/table.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/table_data.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/table_dataset.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/table_tdata.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/table_iterator.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/table_container.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/table_array.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/mfd.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/hardware/memory.h
+./host/hrh_storage.lo: ../../include/net-snmp/agent/hardware/fsys.h
+./host/hrh_storage.lo: host_res.h ./host/hrh_filesys.h
+./host/hrh_storage.lo: ./host/hrh_storage.h ./host/hr_disk.h
 ./host/hr_network.lo: ../../include/net-snmp/net-snmp-config.h
 ./host/hr_network.lo: ../../include/net-snmp/system/linux.h
 ./host/hr_network.lo: ../../include/net-snmp/system/sysv.h
@@ -4419,32 +4094,14 @@
 ./host/hr_network.lo: ../../include/net-snmp/net-snmp-includes.h
 ./host/hr_network.lo: ../../include/net-snmp/definitions.h
 ./host/hr_network.lo: ../../include/net-snmp/types.h
+./host/hr_network.lo: ../../include/net-snmp/library/types.h
 ./host/hr_network.lo: ../../include/net-snmp/library/snmp_api.h
-./host/hr_network.lo: ../../include/net-snmp/library/asn1.h
-./host/hr_network.lo: ../../include/net-snmp/library/snmp_impl.h
-./host/hr_network.lo: ../../include/net-snmp/library/snmp.h
-./host/hr_network.lo: ../../include/net-snmp/library/snmp-tc.h
-./host/hr_network.lo: ../../include/net-snmp/utilities.h
+./host/hr_network.lo: ../../include/net-snmp/varbind_api.h
 ./host/hr_network.lo: ../../include/net-snmp/library/snmp_client.h
-./host/hr_network.lo: ../../include/net-snmp/library/system.h
-./host/hr_network.lo: ../../include/net-snmp/library/tools.h
-./host/hr_network.lo: ../../include/net-snmp/library/int64.h
-./host/hr_network.lo: ../../include/net-snmp/library/mt_support.h
-./host/hr_network.lo: ../../include/net-snmp/library/snmp_alarm.h
-./host/hr_network.lo: ../../include/net-snmp/library/callback.h
-./host/hr_network.lo: ../../include/net-snmp/library/data_list.h
-./host/hr_network.lo: ../../include/net-snmp/library/oid_stash.h
-./host/hr_network.lo: ../../include/net-snmp/library/check_varbind.h
-./host/hr_network.lo: ../../include/net-snmp/library/container.h
-./host/hr_network.lo: ../../include/net-snmp/library/factory.h
-./host/hr_network.lo: ../../include/net-snmp/library/snmp_logging.h
-./host/hr_network.lo: ../../include/net-snmp/library/container_binary_array.h
-./host/hr_network.lo: ../../include/net-snmp/library/container_list_ssll.h
-./host/hr_network.lo: ../../include/net-snmp/library/container_iterator.h
-./host/hr_network.lo: ../../include/net-snmp/library/container.h
-./host/hr_network.lo: ../../include/net-snmp/library/snmp_assert.h
-./host/hr_network.lo: ../../include/net-snmp/version.h
+./host/hr_network.lo: ../../include/net-snmp/pdu_api.h
+./host/hr_network.lo: ../../include/net-snmp/library/asn1.h
 ./host/hr_network.lo: ../../include/net-snmp/session_api.h
+./host/hr_network.lo: ../../include/net-snmp/library/callback.h
 ./host/hr_network.lo: ../../include/net-snmp/library/snmp_transport.h
 ./host/hr_network.lo: ../../include/net-snmp/library/snmp_service.h
 ./host/hr_network.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -4455,11 +4112,31 @@
 ./host/hr_network.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./host/hr_network.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./host/hr_network.lo: ../../include/net-snmp/library/ucd_compat.h
-./host/hr_network.lo: ../../include/net-snmp/pdu_api.h
-./host/hr_network.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_network.lo: ../../include/net-snmp/library/mib.h
+./host/hr_network.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_network.lo: ../../include/net-snmp/library/parse.h
-./host/hr_network.lo: ../../include/net-snmp/varbind_api.h
+./host/hr_network.lo: ../../include/net-snmp/library/oid_stash.h
+./host/hr_network.lo: ../../include/net-snmp/library/snmp_impl.h
+./host/hr_network.lo: ../../include/net-snmp/library/snmp.h
+./host/hr_network.lo: ../../include/net-snmp/library/snmp-tc.h
+./host/hr_network.lo: ../../include/net-snmp/library/getopt.h
+./host/hr_network.lo: ../../include/net-snmp/utilities.h
+./host/hr_network.lo: ../../include/net-snmp/library/system.h
+./host/hr_network.lo: ../../include/net-snmp/library/tools.h
+./host/hr_network.lo: ../../include/net-snmp/library/int64.h
+./host/hr_network.lo: ../../include/net-snmp/library/mt_support.h
+./host/hr_network.lo: ../../include/net-snmp/library/snmp_alarm.h
+./host/hr_network.lo: ../../include/net-snmp/library/data_list.h
+./host/hr_network.lo: ../../include/net-snmp/library/check_varbind.h
+./host/hr_network.lo: ../../include/net-snmp/library/container.h
+./host/hr_network.lo: ../../include/net-snmp/library/factory.h
+./host/hr_network.lo: ../../include/net-snmp/library/snmp_logging.h
+./host/hr_network.lo: ../../include/net-snmp/library/container_binary_array.h
+./host/hr_network.lo: ../../include/net-snmp/library/container_list_ssll.h
+./host/hr_network.lo: ../../include/net-snmp/library/container_iterator.h
+./host/hr_network.lo: ../../include/net-snmp/library/container.h
+./host/hr_network.lo: ../../include/net-snmp/library/snmp_assert.h
+./host/hr_network.lo: ../../include/net-snmp/version.h
 ./host/hr_network.lo: ../../include/net-snmp/config_api.h
 ./host/hr_network.lo: ../../include/net-snmp/library/read_config.h
 ./host/hr_network.lo: ../../include/net-snmp/library/default_store.h
@@ -4524,32 +4201,14 @@
 ./host/hr_other.lo: ../../include/net-snmp/net-snmp-includes.h
 ./host/hr_other.lo: ../../include/net-snmp/definitions.h
 ./host/hr_other.lo: ../../include/net-snmp/types.h
+./host/hr_other.lo: ../../include/net-snmp/library/types.h
 ./host/hr_other.lo: ../../include/net-snmp/library/snmp_api.h
-./host/hr_other.lo: ../../include/net-snmp/library/asn1.h
-./host/hr_other.lo: ../../include/net-snmp/library/snmp_impl.h
-./host/hr_other.lo: ../../include/net-snmp/library/snmp.h
-./host/hr_other.lo: ../../include/net-snmp/library/snmp-tc.h
-./host/hr_other.lo: ../../include/net-snmp/utilities.h
+./host/hr_other.lo: ../../include/net-snmp/varbind_api.h
 ./host/hr_other.lo: ../../include/net-snmp/library/snmp_client.h
-./host/hr_other.lo: ../../include/net-snmp/library/system.h
-./host/hr_other.lo: ../../include/net-snmp/library/tools.h
-./host/hr_other.lo: ../../include/net-snmp/library/int64.h
-./host/hr_other.lo: ../../include/net-snmp/library/mt_support.h
-./host/hr_other.lo: ../../include/net-snmp/library/snmp_alarm.h
-./host/hr_other.lo: ../../include/net-snmp/library/callback.h
-./host/hr_other.lo: ../../include/net-snmp/library/data_list.h
-./host/hr_other.lo: ../../include/net-snmp/library/oid_stash.h
-./host/hr_other.lo: ../../include/net-snmp/library/check_varbind.h
-./host/hr_other.lo: ../../include/net-snmp/library/container.h
-./host/hr_other.lo: ../../include/net-snmp/library/factory.h
-./host/hr_other.lo: ../../include/net-snmp/library/snmp_logging.h
-./host/hr_other.lo: ../../include/net-snmp/library/container_binary_array.h
-./host/hr_other.lo: ../../include/net-snmp/library/container_list_ssll.h
-./host/hr_other.lo: ../../include/net-snmp/library/container_iterator.h
-./host/hr_other.lo: ../../include/net-snmp/library/container.h
-./host/hr_other.lo: ../../include/net-snmp/library/snmp_assert.h
-./host/hr_other.lo: ../../include/net-snmp/version.h
+./host/hr_other.lo: ../../include/net-snmp/pdu_api.h
+./host/hr_other.lo: ../../include/net-snmp/library/asn1.h
 ./host/hr_other.lo: ../../include/net-snmp/session_api.h
+./host/hr_other.lo: ../../include/net-snmp/library/callback.h
 ./host/hr_other.lo: ../../include/net-snmp/library/snmp_transport.h
 ./host/hr_other.lo: ../../include/net-snmp/library/snmp_service.h
 ./host/hr_other.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -4560,11 +4219,31 @@
 ./host/hr_other.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./host/hr_other.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./host/hr_other.lo: ../../include/net-snmp/library/ucd_compat.h
-./host/hr_other.lo: ../../include/net-snmp/pdu_api.h
-./host/hr_other.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_other.lo: ../../include/net-snmp/library/mib.h
+./host/hr_other.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_other.lo: ../../include/net-snmp/library/parse.h
-./host/hr_other.lo: ../../include/net-snmp/varbind_api.h
+./host/hr_other.lo: ../../include/net-snmp/library/oid_stash.h
+./host/hr_other.lo: ../../include/net-snmp/library/snmp_impl.h
+./host/hr_other.lo: ../../include/net-snmp/library/snmp.h
+./host/hr_other.lo: ../../include/net-snmp/library/snmp-tc.h
+./host/hr_other.lo: ../../include/net-snmp/library/getopt.h
+./host/hr_other.lo: ../../include/net-snmp/utilities.h
+./host/hr_other.lo: ../../include/net-snmp/library/system.h
+./host/hr_other.lo: ../../include/net-snmp/library/tools.h
+./host/hr_other.lo: ../../include/net-snmp/library/int64.h
+./host/hr_other.lo: ../../include/net-snmp/library/mt_support.h
+./host/hr_other.lo: ../../include/net-snmp/library/snmp_alarm.h
+./host/hr_other.lo: ../../include/net-snmp/library/data_list.h
+./host/hr_other.lo: ../../include/net-snmp/library/check_varbind.h
+./host/hr_other.lo: ../../include/net-snmp/library/container.h
+./host/hr_other.lo: ../../include/net-snmp/library/factory.h
+./host/hr_other.lo: ../../include/net-snmp/library/snmp_logging.h
+./host/hr_other.lo: ../../include/net-snmp/library/container_binary_array.h
+./host/hr_other.lo: ../../include/net-snmp/library/container_list_ssll.h
+./host/hr_other.lo: ../../include/net-snmp/library/container_iterator.h
+./host/hr_other.lo: ../../include/net-snmp/library/container.h
+./host/hr_other.lo: ../../include/net-snmp/library/snmp_assert.h
+./host/hr_other.lo: ../../include/net-snmp/version.h
 ./host/hr_other.lo: ../../include/net-snmp/config_api.h
 ./host/hr_other.lo: ../../include/net-snmp/library/read_config.h
 ./host/hr_other.lo: ../../include/net-snmp/library/default_store.h
@@ -4598,32 +4277,14 @@
 ./host/hr_partition.lo: ../../include/net-snmp/net-snmp-includes.h
 ./host/hr_partition.lo: ../../include/net-snmp/definitions.h
 ./host/hr_partition.lo: ../../include/net-snmp/types.h
+./host/hr_partition.lo: ../../include/net-snmp/library/types.h
 ./host/hr_partition.lo: ../../include/net-snmp/library/snmp_api.h
-./host/hr_partition.lo: ../../include/net-snmp/library/asn1.h
-./host/hr_partition.lo: ../../include/net-snmp/library/snmp_impl.h
-./host/hr_partition.lo: ../../include/net-snmp/library/snmp.h
-./host/hr_partition.lo: ../../include/net-snmp/library/snmp-tc.h
-./host/hr_partition.lo: ../../include/net-snmp/utilities.h
+./host/hr_partition.lo: ../../include/net-snmp/varbind_api.h
 ./host/hr_partition.lo: ../../include/net-snmp/library/snmp_client.h
-./host/hr_partition.lo: ../../include/net-snmp/library/system.h
-./host/hr_partition.lo: ../../include/net-snmp/library/tools.h
-./host/hr_partition.lo: ../../include/net-snmp/library/int64.h
-./host/hr_partition.lo: ../../include/net-snmp/library/mt_support.h
-./host/hr_partition.lo: ../../include/net-snmp/library/snmp_alarm.h
-./host/hr_partition.lo: ../../include/net-snmp/library/callback.h
-./host/hr_partition.lo: ../../include/net-snmp/library/data_list.h
-./host/hr_partition.lo: ../../include/net-snmp/library/oid_stash.h
-./host/hr_partition.lo: ../../include/net-snmp/library/check_varbind.h
-./host/hr_partition.lo: ../../include/net-snmp/library/container.h
-./host/hr_partition.lo: ../../include/net-snmp/library/factory.h
-./host/hr_partition.lo: ../../include/net-snmp/library/snmp_logging.h
-./host/hr_partition.lo: ../../include/net-snmp/library/container_binary_array.h
-./host/hr_partition.lo: ../../include/net-snmp/library/container_list_ssll.h
-./host/hr_partition.lo: ../../include/net-snmp/library/container_iterator.h
-./host/hr_partition.lo: ../../include/net-snmp/library/container.h
-./host/hr_partition.lo: ../../include/net-snmp/library/snmp_assert.h
-./host/hr_partition.lo: ../../include/net-snmp/version.h
+./host/hr_partition.lo: ../../include/net-snmp/pdu_api.h
+./host/hr_partition.lo: ../../include/net-snmp/library/asn1.h
 ./host/hr_partition.lo: ../../include/net-snmp/session_api.h
+./host/hr_partition.lo: ../../include/net-snmp/library/callback.h
 ./host/hr_partition.lo: ../../include/net-snmp/library/snmp_transport.h
 ./host/hr_partition.lo: ../../include/net-snmp/library/snmp_service.h
 ./host/hr_partition.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -4634,11 +4295,31 @@
 ./host/hr_partition.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./host/hr_partition.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./host/hr_partition.lo: ../../include/net-snmp/library/ucd_compat.h
-./host/hr_partition.lo: ../../include/net-snmp/pdu_api.h
-./host/hr_partition.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_partition.lo: ../../include/net-snmp/library/mib.h
+./host/hr_partition.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_partition.lo: ../../include/net-snmp/library/parse.h
-./host/hr_partition.lo: ../../include/net-snmp/varbind_api.h
+./host/hr_partition.lo: ../../include/net-snmp/library/oid_stash.h
+./host/hr_partition.lo: ../../include/net-snmp/library/snmp_impl.h
+./host/hr_partition.lo: ../../include/net-snmp/library/snmp.h
+./host/hr_partition.lo: ../../include/net-snmp/library/snmp-tc.h
+./host/hr_partition.lo: ../../include/net-snmp/library/getopt.h
+./host/hr_partition.lo: ../../include/net-snmp/utilities.h
+./host/hr_partition.lo: ../../include/net-snmp/library/system.h
+./host/hr_partition.lo: ../../include/net-snmp/library/tools.h
+./host/hr_partition.lo: ../../include/net-snmp/library/int64.h
+./host/hr_partition.lo: ../../include/net-snmp/library/mt_support.h
+./host/hr_partition.lo: ../../include/net-snmp/library/snmp_alarm.h
+./host/hr_partition.lo: ../../include/net-snmp/library/data_list.h
+./host/hr_partition.lo: ../../include/net-snmp/library/check_varbind.h
+./host/hr_partition.lo: ../../include/net-snmp/library/container.h
+./host/hr_partition.lo: ../../include/net-snmp/library/factory.h
+./host/hr_partition.lo: ../../include/net-snmp/library/snmp_logging.h
+./host/hr_partition.lo: ../../include/net-snmp/library/container_binary_array.h
+./host/hr_partition.lo: ../../include/net-snmp/library/container_list_ssll.h
+./host/hr_partition.lo: ../../include/net-snmp/library/container_iterator.h
+./host/hr_partition.lo: ../../include/net-snmp/library/container.h
+./host/hr_partition.lo: ../../include/net-snmp/library/snmp_assert.h
+./host/hr_partition.lo: ../../include/net-snmp/version.h
 ./host/hr_partition.lo: ../../include/net-snmp/config_api.h
 ./host/hr_partition.lo: ../../include/net-snmp/library/read_config.h
 ./host/hr_partition.lo: ../../include/net-snmp/library/default_store.h
@@ -4673,32 +4354,14 @@
 ./host/hr_print.lo: ../../include/net-snmp/net-snmp-includes.h
 ./host/hr_print.lo: ../../include/net-snmp/definitions.h
 ./host/hr_print.lo: ../../include/net-snmp/types.h
+./host/hr_print.lo: ../../include/net-snmp/library/types.h
 ./host/hr_print.lo: ../../include/net-snmp/library/snmp_api.h
-./host/hr_print.lo: ../../include/net-snmp/library/asn1.h
-./host/hr_print.lo: ../../include/net-snmp/library/snmp_impl.h
-./host/hr_print.lo: ../../include/net-snmp/library/snmp.h
-./host/hr_print.lo: ../../include/net-snmp/library/snmp-tc.h
-./host/hr_print.lo: ../../include/net-snmp/utilities.h
+./host/hr_print.lo: ../../include/net-snmp/varbind_api.h
 ./host/hr_print.lo: ../../include/net-snmp/library/snmp_client.h
-./host/hr_print.lo: ../../include/net-snmp/library/system.h
-./host/hr_print.lo: ../../include/net-snmp/library/tools.h
-./host/hr_print.lo: ../../include/net-snmp/library/int64.h
-./host/hr_print.lo: ../../include/net-snmp/library/mt_support.h
-./host/hr_print.lo: ../../include/net-snmp/library/snmp_alarm.h
-./host/hr_print.lo: ../../include/net-snmp/library/callback.h
-./host/hr_print.lo: ../../include/net-snmp/library/data_list.h
-./host/hr_print.lo: ../../include/net-snmp/library/oid_stash.h
-./host/hr_print.lo: ../../include/net-snmp/library/check_varbind.h
-./host/hr_print.lo: ../../include/net-snmp/library/container.h
-./host/hr_print.lo: ../../include/net-snmp/library/factory.h
-./host/hr_print.lo: ../../include/net-snmp/library/snmp_logging.h
-./host/hr_print.lo: ../../include/net-snmp/library/container_binary_array.h
-./host/hr_print.lo: ../../include/net-snmp/library/container_list_ssll.h
-./host/hr_print.lo: ../../include/net-snmp/library/container_iterator.h
-./host/hr_print.lo: ../../include/net-snmp/library/container.h
-./host/hr_print.lo: ../../include/net-snmp/library/snmp_assert.h
-./host/hr_print.lo: ../../include/net-snmp/version.h
+./host/hr_print.lo: ../../include/net-snmp/pdu_api.h
+./host/hr_print.lo: ../../include/net-snmp/library/asn1.h
 ./host/hr_print.lo: ../../include/net-snmp/session_api.h
+./host/hr_print.lo: ../../include/net-snmp/library/callback.h
 ./host/hr_print.lo: ../../include/net-snmp/library/snmp_transport.h
 ./host/hr_print.lo: ../../include/net-snmp/library/snmp_service.h
 ./host/hr_print.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -4709,11 +4372,31 @@
 ./host/hr_print.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./host/hr_print.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./host/hr_print.lo: ../../include/net-snmp/library/ucd_compat.h
-./host/hr_print.lo: ../../include/net-snmp/pdu_api.h
-./host/hr_print.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_print.lo: ../../include/net-snmp/library/mib.h
+./host/hr_print.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_print.lo: ../../include/net-snmp/library/parse.h
-./host/hr_print.lo: ../../include/net-snmp/varbind_api.h
+./host/hr_print.lo: ../../include/net-snmp/library/oid_stash.h
+./host/hr_print.lo: ../../include/net-snmp/library/snmp_impl.h
+./host/hr_print.lo: ../../include/net-snmp/library/snmp.h
+./host/hr_print.lo: ../../include/net-snmp/library/snmp-tc.h
+./host/hr_print.lo: ../../include/net-snmp/library/getopt.h
+./host/hr_print.lo: ../../include/net-snmp/utilities.h
+./host/hr_print.lo: ../../include/net-snmp/library/system.h
+./host/hr_print.lo: ../../include/net-snmp/library/tools.h
+./host/hr_print.lo: ../../include/net-snmp/library/int64.h
+./host/hr_print.lo: ../../include/net-snmp/library/mt_support.h
+./host/hr_print.lo: ../../include/net-snmp/library/snmp_alarm.h
+./host/hr_print.lo: ../../include/net-snmp/library/data_list.h
+./host/hr_print.lo: ../../include/net-snmp/library/check_varbind.h
+./host/hr_print.lo: ../../include/net-snmp/library/container.h
+./host/hr_print.lo: ../../include/net-snmp/library/factory.h
+./host/hr_print.lo: ../../include/net-snmp/library/snmp_logging.h
+./host/hr_print.lo: ../../include/net-snmp/library/container_binary_array.h
+./host/hr_print.lo: ../../include/net-snmp/library/container_list_ssll.h
+./host/hr_print.lo: ../../include/net-snmp/library/container_iterator.h
+./host/hr_print.lo: ../../include/net-snmp/library/container.h
+./host/hr_print.lo: ../../include/net-snmp/library/snmp_assert.h
+./host/hr_print.lo: ../../include/net-snmp/version.h
 ./host/hr_print.lo: ../../include/net-snmp/config_api.h
 ./host/hr_print.lo: ../../include/net-snmp/library/read_config.h
 ./host/hr_print.lo: ../../include/net-snmp/library/default_store.h
@@ -4738,7 +4421,9 @@
 ./host/hr_print.lo: ../../include/net-snmp/agent/agent_registry.h
 ./host/hr_print.lo: ../../include/net-snmp/library/fd_event_manager.h
 ./host/hr_print.lo: ./host/hr_print.h struct.h
-./host/hr_print.lo: util_funcs.h
+./host/hr_print.lo: util_funcs.h util_funcs/header_generic.h
+./host/hr_print.lo: util_funcs/header_simple_table.h
+./host/hr_print.lo: util_funcs/MIB_STATS_CACHE_TIMEOUT.h
 ./host/hr_proc.lo: ../../include/net-snmp/net-snmp-config.h
 ./host/hr_proc.lo: ../../include/net-snmp/system/linux.h
 ./host/hr_proc.lo: ../../include/net-snmp/system/sysv.h
@@ -4747,32 +4432,14 @@
 ./host/hr_proc.lo: ../../include/net-snmp/net-snmp-includes.h
 ./host/hr_proc.lo: ../../include/net-snmp/definitions.h
 ./host/hr_proc.lo: ../../include/net-snmp/types.h
+./host/hr_proc.lo: ../../include/net-snmp/library/types.h
 ./host/hr_proc.lo: ../../include/net-snmp/library/snmp_api.h
-./host/hr_proc.lo: ../../include/net-snmp/library/asn1.h
-./host/hr_proc.lo: ../../include/net-snmp/library/snmp_impl.h
-./host/hr_proc.lo: ../../include/net-snmp/library/snmp.h
-./host/hr_proc.lo: ../../include/net-snmp/library/snmp-tc.h
-./host/hr_proc.lo: ../../include/net-snmp/utilities.h
+./host/hr_proc.lo: ../../include/net-snmp/varbind_api.h
 ./host/hr_proc.lo: ../../include/net-snmp/library/snmp_client.h
-./host/hr_proc.lo: ../../include/net-snmp/library/system.h
-./host/hr_proc.lo: ../../include/net-snmp/library/tools.h
-./host/hr_proc.lo: ../../include/net-snmp/library/int64.h
-./host/hr_proc.lo: ../../include/net-snmp/library/mt_support.h
-./host/hr_proc.lo: ../../include/net-snmp/library/snmp_alarm.h
-./host/hr_proc.lo: ../../include/net-snmp/library/callback.h
-./host/hr_proc.lo: ../../include/net-snmp/library/data_list.h
-./host/hr_proc.lo: ../../include/net-snmp/library/oid_stash.h
-./host/hr_proc.lo: ../../include/net-snmp/library/check_varbind.h
-./host/hr_proc.lo: ../../include/net-snmp/library/container.h
-./host/hr_proc.lo: ../../include/net-snmp/library/factory.h
-./host/hr_proc.lo: ../../include/net-snmp/library/snmp_logging.h
-./host/hr_proc.lo: ../../include/net-snmp/library/container_binary_array.h
-./host/hr_proc.lo: ../../include/net-snmp/library/container_list_ssll.h
-./host/hr_proc.lo: ../../include/net-snmp/library/container_iterator.h
-./host/hr_proc.lo: ../../include/net-snmp/library/container.h
-./host/hr_proc.lo: ../../include/net-snmp/library/snmp_assert.h
-./host/hr_proc.lo: ../../include/net-snmp/version.h
+./host/hr_proc.lo: ../../include/net-snmp/pdu_api.h
+./host/hr_proc.lo: ../../include/net-snmp/library/asn1.h
 ./host/hr_proc.lo: ../../include/net-snmp/session_api.h
+./host/hr_proc.lo: ../../include/net-snmp/library/callback.h
 ./host/hr_proc.lo: ../../include/net-snmp/library/snmp_transport.h
 ./host/hr_proc.lo: ../../include/net-snmp/library/snmp_service.h
 ./host/hr_proc.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -4783,11 +4450,31 @@
 ./host/hr_proc.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./host/hr_proc.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./host/hr_proc.lo: ../../include/net-snmp/library/ucd_compat.h
-./host/hr_proc.lo: ../../include/net-snmp/pdu_api.h
-./host/hr_proc.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_proc.lo: ../../include/net-snmp/library/mib.h
+./host/hr_proc.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_proc.lo: ../../include/net-snmp/library/parse.h
-./host/hr_proc.lo: ../../include/net-snmp/varbind_api.h
+./host/hr_proc.lo: ../../include/net-snmp/library/oid_stash.h
+./host/hr_proc.lo: ../../include/net-snmp/library/snmp_impl.h
+./host/hr_proc.lo: ../../include/net-snmp/library/snmp.h
+./host/hr_proc.lo: ../../include/net-snmp/library/snmp-tc.h
+./host/hr_proc.lo: ../../include/net-snmp/library/getopt.h
+./host/hr_proc.lo: ../../include/net-snmp/utilities.h
+./host/hr_proc.lo: ../../include/net-snmp/library/system.h
+./host/hr_proc.lo: ../../include/net-snmp/library/tools.h
+./host/hr_proc.lo: ../../include/net-snmp/library/int64.h
+./host/hr_proc.lo: ../../include/net-snmp/library/mt_support.h
+./host/hr_proc.lo: ../../include/net-snmp/library/snmp_alarm.h
+./host/hr_proc.lo: ../../include/net-snmp/library/data_list.h
+./host/hr_proc.lo: ../../include/net-snmp/library/check_varbind.h
+./host/hr_proc.lo: ../../include/net-snmp/library/container.h
+./host/hr_proc.lo: ../../include/net-snmp/library/factory.h
+./host/hr_proc.lo: ../../include/net-snmp/library/snmp_logging.h
+./host/hr_proc.lo: ../../include/net-snmp/library/container_binary_array.h
+./host/hr_proc.lo: ../../include/net-snmp/library/container_list_ssll.h
+./host/hr_proc.lo: ../../include/net-snmp/library/container_iterator.h
+./host/hr_proc.lo: ../../include/net-snmp/library/container.h
+./host/hr_proc.lo: ../../include/net-snmp/library/snmp_assert.h
+./host/hr_proc.lo: ../../include/net-snmp/version.h
 ./host/hr_proc.lo: ../../include/net-snmp/config_api.h
 ./host/hr_proc.lo: ../../include/net-snmp/library/read_config.h
 ./host/hr_proc.lo: ../../include/net-snmp/library/default_store.h
@@ -4854,32 +4541,14 @@
 ./host/hr_storage.lo: ../../include/net-snmp/net-snmp-includes.h
 ./host/hr_storage.lo: ../../include/net-snmp/definitions.h
 ./host/hr_storage.lo: ../../include/net-snmp/types.h
+./host/hr_storage.lo: ../../include/net-snmp/library/types.h
 ./host/hr_storage.lo: ../../include/net-snmp/library/snmp_api.h
-./host/hr_storage.lo: ../../include/net-snmp/library/asn1.h
-./host/hr_storage.lo: ../../include/net-snmp/library/snmp_impl.h
-./host/hr_storage.lo: ../../include/net-snmp/library/snmp.h
-./host/hr_storage.lo: ../../include/net-snmp/library/snmp-tc.h
-./host/hr_storage.lo: ../../include/net-snmp/utilities.h
+./host/hr_storage.lo: ../../include/net-snmp/varbind_api.h
 ./host/hr_storage.lo: ../../include/net-snmp/library/snmp_client.h
-./host/hr_storage.lo: ../../include/net-snmp/library/system.h
-./host/hr_storage.lo: ../../include/net-snmp/library/tools.h
-./host/hr_storage.lo: ../../include/net-snmp/library/int64.h
-./host/hr_storage.lo: ../../include/net-snmp/library/mt_support.h
-./host/hr_storage.lo: ../../include/net-snmp/library/snmp_alarm.h
-./host/hr_storage.lo: ../../include/net-snmp/library/callback.h
-./host/hr_storage.lo: ../../include/net-snmp/library/data_list.h
-./host/hr_storage.lo: ../../include/net-snmp/library/oid_stash.h
-./host/hr_storage.lo: ../../include/net-snmp/library/check_varbind.h
-./host/hr_storage.lo: ../../include/net-snmp/library/container.h
-./host/hr_storage.lo: ../../include/net-snmp/library/factory.h
-./host/hr_storage.lo: ../../include/net-snmp/library/snmp_logging.h
-./host/hr_storage.lo: ../../include/net-snmp/library/container_binary_array.h
-./host/hr_storage.lo: ../../include/net-snmp/library/container_list_ssll.h
-./host/hr_storage.lo: ../../include/net-snmp/library/container_iterator.h
-./host/hr_storage.lo: ../../include/net-snmp/library/container.h
-./host/hr_storage.lo: ../../include/net-snmp/library/snmp_assert.h
-./host/hr_storage.lo: ../../include/net-snmp/version.h
+./host/hr_storage.lo: ../../include/net-snmp/pdu_api.h
+./host/hr_storage.lo: ../../include/net-snmp/library/asn1.h
 ./host/hr_storage.lo: ../../include/net-snmp/session_api.h
+./host/hr_storage.lo: ../../include/net-snmp/library/callback.h
 ./host/hr_storage.lo: ../../include/net-snmp/library/snmp_transport.h
 ./host/hr_storage.lo: ../../include/net-snmp/library/snmp_service.h
 ./host/hr_storage.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -4890,11 +4559,31 @@
 ./host/hr_storage.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./host/hr_storage.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./host/hr_storage.lo: ../../include/net-snmp/library/ucd_compat.h
-./host/hr_storage.lo: ../../include/net-snmp/pdu_api.h
-./host/hr_storage.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_storage.lo: ../../include/net-snmp/library/mib.h
+./host/hr_storage.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_storage.lo: ../../include/net-snmp/library/parse.h
-./host/hr_storage.lo: ../../include/net-snmp/varbind_api.h
+./host/hr_storage.lo: ../../include/net-snmp/library/oid_stash.h
+./host/hr_storage.lo: ../../include/net-snmp/library/snmp_impl.h
+./host/hr_storage.lo: ../../include/net-snmp/library/snmp.h
+./host/hr_storage.lo: ../../include/net-snmp/library/snmp-tc.h
+./host/hr_storage.lo: ../../include/net-snmp/library/getopt.h
+./host/hr_storage.lo: ../../include/net-snmp/utilities.h
+./host/hr_storage.lo: ../../include/net-snmp/library/system.h
+./host/hr_storage.lo: ../../include/net-snmp/library/tools.h
+./host/hr_storage.lo: ../../include/net-snmp/library/int64.h
+./host/hr_storage.lo: ../../include/net-snmp/library/mt_support.h
+./host/hr_storage.lo: ../../include/net-snmp/library/snmp_alarm.h
+./host/hr_storage.lo: ../../include/net-snmp/library/data_list.h
+./host/hr_storage.lo: ../../include/net-snmp/library/check_varbind.h
+./host/hr_storage.lo: ../../include/net-snmp/library/container.h
+./host/hr_storage.lo: ../../include/net-snmp/library/factory.h
+./host/hr_storage.lo: ../../include/net-snmp/library/snmp_logging.h
+./host/hr_storage.lo: ../../include/net-snmp/library/container_binary_array.h
+./host/hr_storage.lo: ../../include/net-snmp/library/container_list_ssll.h
+./host/hr_storage.lo: ../../include/net-snmp/library/container_iterator.h
+./host/hr_storage.lo: ../../include/net-snmp/library/container.h
+./host/hr_storage.lo: ../../include/net-snmp/library/snmp_assert.h
+./host/hr_storage.lo: ../../include/net-snmp/version.h
 ./host/hr_storage.lo: ../../include/net-snmp/config_api.h
 ./host/hr_storage.lo: ../../include/net-snmp/library/read_config.h
 ./host/hr_storage.lo: ../../include/net-snmp/library/default_store.h
@@ -4952,6 +4641,112 @@
 ./host/hr_storage.lo: ../../include/net-snmp/agent/table_array.h
 ./host/hr_storage.lo: ../../include/net-snmp/agent/mfd.h
 ./host/hr_storage.lo: ../../include/net-snmp/agent/hardware/memory.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/net-snmp-config.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/system/linux.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/system/sysv.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/system/generic.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/machine/generic.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/net-snmp-includes.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/definitions.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/types.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/types.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmp_api.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/varbind_api.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmp_client.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/pdu_api.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/asn1.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/session_api.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/callback.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmp_transport.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmp_service.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/ucd_compat.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/mib.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/mib_api.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/parse.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/oid_stash.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmp.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/getopt.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/utilities.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/system.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/tools.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/int64.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/mt_support.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/data_list.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/check_varbind.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/container.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/factory.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/container_iterator.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/container.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/version.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/config_api.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/read_config.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/default_store.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmp_enum.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/vacm.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/output_api.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmp_debug.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/snmpv3_api.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmpv3.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/transform_oids.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/keytools.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/scapi.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/lcd_time.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmp_secmod.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/snmpusm.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/mib_module_config.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/agent_module_config.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/snmp_agent.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/snmp_vars.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/agent_handler.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/var_struct.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/agent_registry.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/library/fd_event_manager.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/ds_agent.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/agent_read_config.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/agent_trap.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/all_helpers.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/instance.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/baby_steps.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/scalar.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/scalar_group.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/watcher.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/multiplexer.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/null.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/debug_handler.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/cache_handler.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/old_api.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/read_only.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/row_merge.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/serialize.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/mode_end_call.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/table.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/table_data.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/table_dataset.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/table_tdata.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/table_iterator.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/table_container.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/table_array.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/agent/mfd.h
+./host/hrSWInstalledTable.lo: ../../include/net-snmp/data_access/swinst.h
+./host/hrSWInstalledTable.lo: ./host/hrSWInstalledTable.h
 ./host/hr_swinst.lo: ../../include/net-snmp/net-snmp-config.h
 ./host/hr_swinst.lo: ../../include/net-snmp/system/linux.h
 ./host/hr_swinst.lo: ../../include/net-snmp/system/sysv.h
@@ -4961,32 +4756,14 @@
 ./host/hr_swinst.lo: ../../include/net-snmp/net-snmp-includes.h
 ./host/hr_swinst.lo: ../../include/net-snmp/definitions.h
 ./host/hr_swinst.lo: ../../include/net-snmp/types.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/types.h
 ./host/hr_swinst.lo: ../../include/net-snmp/library/snmp_api.h
-./host/hr_swinst.lo: ../../include/net-snmp/library/asn1.h
-./host/hr_swinst.lo: ../../include/net-snmp/library/snmp_impl.h
-./host/hr_swinst.lo: ../../include/net-snmp/library/snmp.h
-./host/hr_swinst.lo: ../../include/net-snmp/library/snmp-tc.h
-./host/hr_swinst.lo: ../../include/net-snmp/utilities.h
+./host/hr_swinst.lo: ../../include/net-snmp/varbind_api.h
 ./host/hr_swinst.lo: ../../include/net-snmp/library/snmp_client.h
-./host/hr_swinst.lo: ../../include/net-snmp/library/system.h
-./host/hr_swinst.lo: ../../include/net-snmp/library/tools.h
-./host/hr_swinst.lo: ../../include/net-snmp/library/int64.h
-./host/hr_swinst.lo: ../../include/net-snmp/library/mt_support.h
-./host/hr_swinst.lo: ../../include/net-snmp/library/snmp_alarm.h
-./host/hr_swinst.lo: ../../include/net-snmp/library/callback.h
-./host/hr_swinst.lo: ../../include/net-snmp/library/data_list.h
-./host/hr_swinst.lo: ../../include/net-snmp/library/oid_stash.h
-./host/hr_swinst.lo: ../../include/net-snmp/library/check_varbind.h
-./host/hr_swinst.lo: ../../include/net-snmp/library/container.h
-./host/hr_swinst.lo: ../../include/net-snmp/library/factory.h
-./host/hr_swinst.lo: ../../include/net-snmp/library/snmp_logging.h
-./host/hr_swinst.lo: ../../include/net-snmp/library/container_binary_array.h
-./host/hr_swinst.lo: ../../include/net-snmp/library/container_list_ssll.h
-./host/hr_swinst.lo: ../../include/net-snmp/library/container_iterator.h
-./host/hr_swinst.lo: ../../include/net-snmp/library/container.h
-./host/hr_swinst.lo: ../../include/net-snmp/library/snmp_assert.h
-./host/hr_swinst.lo: ../../include/net-snmp/version.h
+./host/hr_swinst.lo: ../../include/net-snmp/pdu_api.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/asn1.h
 ./host/hr_swinst.lo: ../../include/net-snmp/session_api.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/callback.h
 ./host/hr_swinst.lo: ../../include/net-snmp/library/snmp_transport.h
 ./host/hr_swinst.lo: ../../include/net-snmp/library/snmp_service.h
 ./host/hr_swinst.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -4997,11 +4774,31 @@
 ./host/hr_swinst.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./host/hr_swinst.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./host/hr_swinst.lo: ../../include/net-snmp/library/ucd_compat.h
-./host/hr_swinst.lo: ../../include/net-snmp/pdu_api.h
-./host/hr_swinst.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_swinst.lo: ../../include/net-snmp/library/mib.h
+./host/hr_swinst.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_swinst.lo: ../../include/net-snmp/library/parse.h
-./host/hr_swinst.lo: ../../include/net-snmp/varbind_api.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/oid_stash.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/snmp_impl.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/snmp.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/snmp-tc.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/getopt.h
+./host/hr_swinst.lo: ../../include/net-snmp/utilities.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/system.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/tools.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/int64.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/mt_support.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/snmp_alarm.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/data_list.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/check_varbind.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/container.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/factory.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/snmp_logging.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/container_binary_array.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/container_list_ssll.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/container_iterator.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/container.h
+./host/hr_swinst.lo: ../../include/net-snmp/library/snmp_assert.h
+./host/hr_swinst.lo: ../../include/net-snmp/version.h
 ./host/hr_swinst.lo: ../../include/net-snmp/config_api.h
 ./host/hr_swinst.lo: ../../include/net-snmp/library/read_config.h
 ./host/hr_swinst.lo: ../../include/net-snmp/library/default_store.h
@@ -5033,36 +4830,15 @@
 ./host/hr_swrun.lo: ../../include/net-snmp/machine/generic.h
 ./host/hr_swrun.lo: ../../include/net-snmp/output_api.h
 ./host/hr_swrun.lo: ../../include/net-snmp/types.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/types.h
 ./host/hr_swrun.lo: ../../include/net-snmp/definitions.h
 ./host/hr_swrun.lo: ../../include/net-snmp/library/snmp_api.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/asn1.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/snmp_impl.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/snmp.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/snmp-tc.h
+./host/hr_swrun.lo: ../../include/net-snmp/varbind_api.h
 ./host/hr_swrun.lo: ../../include/net-snmp/library/snmp_client.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/snmp_debug.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/snmp_logging.h
-./host/hr_swrun.lo: host_res.h
-./host/hr_swrun.lo: ../../include/net-snmp/net-snmp-includes.h
-./host/hr_swrun.lo: ../../include/net-snmp/utilities.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/system.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/tools.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/int64.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/mt_support.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/snmp_alarm.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/callback.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/data_list.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/oid_stash.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/check_varbind.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/container.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/factory.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/container_binary_array.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/container_list_ssll.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/container_iterator.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/container.h
-./host/hr_swrun.lo: ../../include/net-snmp/library/snmp_assert.h
-./host/hr_swrun.lo: ../../include/net-snmp/version.h
+./host/hr_swrun.lo: ../../include/net-snmp/pdu_api.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/asn1.h
 ./host/hr_swrun.lo: ../../include/net-snmp/session_api.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/callback.h
 ./host/hr_swrun.lo: ../../include/net-snmp/library/snmp_transport.h
 ./host/hr_swrun.lo: ../../include/net-snmp/library/snmp_service.h
 ./host/hr_swrun.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -5073,11 +4849,34 @@
 ./host/hr_swrun.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./host/hr_swrun.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./host/hr_swrun.lo: ../../include/net-snmp/library/ucd_compat.h
-./host/hr_swrun.lo: ../../include/net-snmp/pdu_api.h
-./host/hr_swrun.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_swrun.lo: ../../include/net-snmp/library/mib.h
+./host/hr_swrun.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_swrun.lo: ../../include/net-snmp/library/parse.h
-./host/hr_swrun.lo: ../../include/net-snmp/varbind_api.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/oid_stash.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/snmp_impl.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/snmp.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/snmp-tc.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/snmp_debug.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/snmp_logging.h
+./host/hr_swrun.lo: host_res.h
+./host/hr_swrun.lo: ../../include/net-snmp/net-snmp-includes.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/getopt.h
+./host/hr_swrun.lo: ../../include/net-snmp/utilities.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/system.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/tools.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/int64.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/mt_support.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/snmp_alarm.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/data_list.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/check_varbind.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/container.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/factory.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/container_binary_array.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/container_list_ssll.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/container_iterator.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/container.h
+./host/hr_swrun.lo: ../../include/net-snmp/library/snmp_assert.h
+./host/hr_swrun.lo: ../../include/net-snmp/version.h
 ./host/hr_swrun.lo: ../../include/net-snmp/config_api.h
 ./host/hr_swrun.lo: ../../include/net-snmp/library/read_config.h
 ./host/hr_swrun.lo: ../../include/net-snmp/library/default_store.h
@@ -5102,6 +4901,219 @@
 ./host/hr_swrun.lo: ./host/hr_swrun.h
 ./host/hr_swrun.lo: ../../include/net-snmp/agent/auto_nlist.h
 ./host/hr_swrun.lo: ../../agent/kernel.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/net-snmp-config.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/system/linux.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/system/sysv.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/system/generic.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/machine/generic.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/net-snmp-includes.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/definitions.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/types.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/types.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmp_api.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/varbind_api.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmp_client.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/pdu_api.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/asn1.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/session_api.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/callback.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmp_transport.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmp_service.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/ucd_compat.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/mib.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/mib_api.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/parse.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/oid_stash.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmp.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/getopt.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/utilities.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/system.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/tools.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/int64.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/mt_support.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/data_list.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/check_varbind.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/container.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/factory.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/container_iterator.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/container.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/version.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/config_api.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/read_config.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/default_store.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmp_enum.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/vacm.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/output_api.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmp_debug.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/snmpv3_api.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmpv3.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/transform_oids.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/keytools.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/scapi.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/lcd_time.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmp_secmod.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/snmpusm.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/mib_module_config.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/agent_module_config.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/snmp_agent.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/snmp_vars.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/agent_handler.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/var_struct.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/agent_registry.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/library/fd_event_manager.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/ds_agent.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/agent_read_config.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/agent_trap.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/all_helpers.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/instance.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/baby_steps.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/scalar.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/scalar_group.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/watcher.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/multiplexer.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/null.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/debug_handler.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/cache_handler.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/old_api.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/read_only.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/row_merge.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/serialize.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/mode_end_call.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/table.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/table_data.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/table_dataset.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/table_tdata.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/table_iterator.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/table_container.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/table_array.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/agent/mfd.h
+./host/hrSWRunPerfTable.lo: ../../include/net-snmp/data_access/swrun.h
+./host/hrSWRunPerfTable.lo: ./host/hrSWRunPerfTable.h
+./host/hrSWRunPerfTable.lo: ./host/data_access/swrun.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/net-snmp-config.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/system/linux.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/system/sysv.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/system/generic.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/machine/generic.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/net-snmp-includes.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/definitions.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/types.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/types.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmp_api.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/varbind_api.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmp_client.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/pdu_api.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/asn1.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/session_api.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/callback.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmp_transport.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmp_service.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/ucd_compat.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/mib.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/mib_api.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/parse.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/oid_stash.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmp.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/getopt.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/utilities.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/system.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/tools.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/int64.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/mt_support.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/data_list.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/check_varbind.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/container.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/factory.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/container_iterator.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/container.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/version.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/config_api.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/read_config.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/default_store.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmp_enum.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/vacm.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/output_api.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmp_debug.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/snmpv3_api.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmpv3.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/transform_oids.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/keytools.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/scapi.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/lcd_time.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmp_secmod.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/snmpusm.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/mib_module_config.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/agent_module_config.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/snmp_agent.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/snmp_vars.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/agent_handler.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/var_struct.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/agent_registry.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/library/fd_event_manager.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/ds_agent.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/agent_read_config.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/agent_trap.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/all_helpers.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/instance.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/baby_steps.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/scalar.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/scalar_group.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/watcher.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/multiplexer.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/null.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/debug_handler.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/cache_handler.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/old_api.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/read_only.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/row_merge.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/serialize.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/mode_end_call.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/table.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/table_data.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/table_dataset.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/table_tdata.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/table_iterator.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/table_container.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/table_array.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/agent/mfd.h
+./host/hrSWRunTable.lo: ../../include/net-snmp/data_access/swrun.h
+./host/hrSWRunTable.lo: ./host/hrSWRunTable.h ./host/data_access/swrun.h
 ./host/hr_system.lo: ../../include/net-snmp/net-snmp-config.h
 ./host/hr_system.lo: ../../include/net-snmp/system/linux.h
 ./host/hr_system.lo: ../../include/net-snmp/system/sysv.h
@@ -5110,32 +5122,14 @@
 ./host/hr_system.lo: ../../include/net-snmp/net-snmp-includes.h
 ./host/hr_system.lo: ../../include/net-snmp/definitions.h
 ./host/hr_system.lo: ../../include/net-snmp/types.h
+./host/hr_system.lo: ../../include/net-snmp/library/types.h
 ./host/hr_system.lo: ../../include/net-snmp/library/snmp_api.h
-./host/hr_system.lo: ../../include/net-snmp/library/asn1.h
-./host/hr_system.lo: ../../include/net-snmp/library/snmp_impl.h
-./host/hr_system.lo: ../../include/net-snmp/library/snmp.h
-./host/hr_system.lo: ../../include/net-snmp/library/snmp-tc.h
-./host/hr_system.lo: ../../include/net-snmp/utilities.h
+./host/hr_system.lo: ../../include/net-snmp/varbind_api.h
 ./host/hr_system.lo: ../../include/net-snmp/library/snmp_client.h
-./host/hr_system.lo: ../../include/net-snmp/library/system.h
-./host/hr_system.lo: ../../include/net-snmp/library/tools.h
-./host/hr_system.lo: ../../include/net-snmp/library/int64.h
-./host/hr_system.lo: ../../include/net-snmp/library/mt_support.h
-./host/hr_system.lo: ../../include/net-snmp/library/snmp_alarm.h
-./host/hr_system.lo: ../../include/net-snmp/library/callback.h
-./host/hr_system.lo: ../../include/net-snmp/library/data_list.h
-./host/hr_system.lo: ../../include/net-snmp/library/oid_stash.h
-./host/hr_system.lo: ../../include/net-snmp/library/check_varbind.h
-./host/hr_system.lo: ../../include/net-snmp/library/container.h
-./host/hr_system.lo: ../../include/net-snmp/library/factory.h
-./host/hr_system.lo: ../../include/net-snmp/library/snmp_logging.h
-./host/hr_system.lo: ../../include/net-snmp/library/container_binary_array.h
-./host/hr_system.lo: ../../include/net-snmp/library/container_list_ssll.h
-./host/hr_system.lo: ../../include/net-snmp/library/container_iterator.h
-./host/hr_system.lo: ../../include/net-snmp/library/container.h
-./host/hr_system.lo: ../../include/net-snmp/library/snmp_assert.h
-./host/hr_system.lo: ../../include/net-snmp/version.h
+./host/hr_system.lo: ../../include/net-snmp/pdu_api.h
+./host/hr_system.lo: ../../include/net-snmp/library/asn1.h
 ./host/hr_system.lo: ../../include/net-snmp/session_api.h
+./host/hr_system.lo: ../../include/net-snmp/library/callback.h
 ./host/hr_system.lo: ../../include/net-snmp/library/snmp_transport.h
 ./host/hr_system.lo: ../../include/net-snmp/library/snmp_service.h
 ./host/hr_system.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -5146,11 +5140,31 @@
 ./host/hr_system.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./host/hr_system.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./host/hr_system.lo: ../../include/net-snmp/library/ucd_compat.h
-./host/hr_system.lo: ../../include/net-snmp/pdu_api.h
-./host/hr_system.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_system.lo: ../../include/net-snmp/library/mib.h
+./host/hr_system.lo: ../../include/net-snmp/mib_api.h
 ./host/hr_system.lo: ../../include/net-snmp/library/parse.h
-./host/hr_system.lo: ../../include/net-snmp/varbind_api.h
+./host/hr_system.lo: ../../include/net-snmp/library/oid_stash.h
+./host/hr_system.lo: ../../include/net-snmp/library/snmp_impl.h
+./host/hr_system.lo: ../../include/net-snmp/library/snmp.h
+./host/hr_system.lo: ../../include/net-snmp/library/snmp-tc.h
+./host/hr_system.lo: ../../include/net-snmp/library/getopt.h
+./host/hr_system.lo: ../../include/net-snmp/utilities.h
+./host/hr_system.lo: ../../include/net-snmp/library/system.h
+./host/hr_system.lo: ../../include/net-snmp/library/tools.h
+./host/hr_system.lo: ../../include/net-snmp/library/int64.h
+./host/hr_system.lo: ../../include/net-snmp/library/mt_support.h
+./host/hr_system.lo: ../../include/net-snmp/library/snmp_alarm.h
+./host/hr_system.lo: ../../include/net-snmp/library/data_list.h
+./host/hr_system.lo: ../../include/net-snmp/library/check_varbind.h
+./host/hr_system.lo: ../../include/net-snmp/library/container.h
+./host/hr_system.lo: ../../include/net-snmp/library/factory.h
+./host/hr_system.lo: ../../include/net-snmp/library/snmp_logging.h
+./host/hr_system.lo: ../../include/net-snmp/library/container_binary_array.h
+./host/hr_system.lo: ../../include/net-snmp/library/container_list_ssll.h
+./host/hr_system.lo: ../../include/net-snmp/library/container_iterator.h
+./host/hr_system.lo: ../../include/net-snmp/library/container.h
+./host/hr_system.lo: ../../include/net-snmp/library/snmp_assert.h
+./host/hr_system.lo: ../../include/net-snmp/version.h
 ./host/hr_system.lo: ../../include/net-snmp/config_api.h
 ./host/hr_system.lo: ../../include/net-snmp/library/read_config.h
 ./host/hr_system.lo: ../../include/net-snmp/library/default_store.h
@@ -5214,32 +5228,14 @@
 ./ip-mib/ip_scalars.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ip-mib/ip_scalars.lo: ../../include/net-snmp/definitions.h
 ./ip-mib/ip_scalars.lo: ../../include/net-snmp/types.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/types.h
 ./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/snmp_api.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/asn1.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/snmp_impl.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/snmp.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/snmp-tc.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/utilities.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/varbind_api.h
 ./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/snmp_client.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/system.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/tools.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/int64.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/mt_support.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/callback.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/data_list.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/oid_stash.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/check_varbind.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/container.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/factory.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/snmp_logging.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/container_binary_array.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/container_iterator.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/container.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/snmp_assert.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/version.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/pdu_api.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/asn1.h
 ./ip-mib/ip_scalars.lo: ../../include/net-snmp/session_api.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/callback.h
 ./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/snmp_service.h
 ./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -5250,11 +5246,31 @@
 ./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/ucd_compat.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/pdu_api.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/mib_api.h
 ./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/mib.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/mib_api.h
 ./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/parse.h
-./ip-mib/ip_scalars.lo: ../../include/net-snmp/varbind_api.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/oid_stash.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/snmp_impl.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/snmp.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/snmp-tc.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/getopt.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/utilities.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/system.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/tools.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/int64.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/mt_support.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/data_list.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/check_varbind.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/container.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/factory.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/snmp_logging.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/container_binary_array.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/container_iterator.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/container.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/snmp_assert.h
+./ip-mib/ip_scalars.lo: ../../include/net-snmp/version.h
 ./ip-mib/ip_scalars.lo: ../../include/net-snmp/config_api.h
 ./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/read_config.h
 ./ip-mib/ip_scalars.lo: ../../include/net-snmp/library/default_store.h
@@ -5320,32 +5336,14 @@
 ./mibII/at.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/at.lo: ../../include/net-snmp/definitions.h
 ./mibII/at.lo: ../../include/net-snmp/types.h
+./mibII/at.lo: ../../include/net-snmp/library/types.h
 ./mibII/at.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/at.lo: ../../include/net-snmp/library/asn1.h
-./mibII/at.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/at.lo: ../../include/net-snmp/library/snmp.h
-./mibII/at.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/at.lo: ../../include/net-snmp/utilities.h
+./mibII/at.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/at.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/at.lo: ../../include/net-snmp/library/system.h
-./mibII/at.lo: ../../include/net-snmp/library/tools.h
-./mibII/at.lo: ../../include/net-snmp/library/int64.h
-./mibII/at.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/at.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/at.lo: ../../include/net-snmp/library/callback.h
-./mibII/at.lo: ../../include/net-snmp/library/data_list.h
-./mibII/at.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/at.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/at.lo: ../../include/net-snmp/library/container.h
-./mibII/at.lo: ../../include/net-snmp/library/factory.h
-./mibII/at.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/at.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/at.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/at.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/at.lo: ../../include/net-snmp/library/container.h
-./mibII/at.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/at.lo: ../../include/net-snmp/version.h
+./mibII/at.lo: ../../include/net-snmp/pdu_api.h
+./mibII/at.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/at.lo: ../../include/net-snmp/session_api.h
+./mibII/at.lo: ../../include/net-snmp/library/callback.h
 ./mibII/at.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/at.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/at.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -5356,11 +5354,31 @@
 ./mibII/at.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/at.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/at.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/at.lo: ../../include/net-snmp/pdu_api.h
-./mibII/at.lo: ../../include/net-snmp/mib_api.h
 ./mibII/at.lo: ../../include/net-snmp/library/mib.h
+./mibII/at.lo: ../../include/net-snmp/mib_api.h
 ./mibII/at.lo: ../../include/net-snmp/library/parse.h
-./mibII/at.lo: ../../include/net-snmp/varbind_api.h
+./mibII/at.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/at.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/at.lo: ../../include/net-snmp/library/snmp.h
+./mibII/at.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/at.lo: ../../include/net-snmp/library/getopt.h
+./mibII/at.lo: ../../include/net-snmp/utilities.h
+./mibII/at.lo: ../../include/net-snmp/library/system.h
+./mibII/at.lo: ../../include/net-snmp/library/tools.h
+./mibII/at.lo: ../../include/net-snmp/library/int64.h
+./mibII/at.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/at.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/at.lo: ../../include/net-snmp/library/data_list.h
+./mibII/at.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/at.lo: ../../include/net-snmp/library/container.h
+./mibII/at.lo: ../../include/net-snmp/library/factory.h
+./mibII/at.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/at.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/at.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/at.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/at.lo: ../../include/net-snmp/library/container.h
+./mibII/at.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/at.lo: ../../include/net-snmp/version.h
 ./mibII/at.lo: ../../include/net-snmp/config_api.h
 ./mibII/at.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/at.lo: ../../include/net-snmp/library/default_store.h
@@ -5427,32 +5445,14 @@
 ./mibII/icmp.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/icmp.lo: ../../include/net-snmp/definitions.h
 ./mibII/icmp.lo: ../../include/net-snmp/types.h
+./mibII/icmp.lo: ../../include/net-snmp/library/types.h
 ./mibII/icmp.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/icmp.lo: ../../include/net-snmp/library/asn1.h
-./mibII/icmp.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/icmp.lo: ../../include/net-snmp/library/snmp.h
-./mibII/icmp.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/icmp.lo: ../../include/net-snmp/utilities.h
+./mibII/icmp.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/icmp.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/icmp.lo: ../../include/net-snmp/library/system.h
-./mibII/icmp.lo: ../../include/net-snmp/library/tools.h
-./mibII/icmp.lo: ../../include/net-snmp/library/int64.h
-./mibII/icmp.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/icmp.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/icmp.lo: ../../include/net-snmp/library/callback.h
-./mibII/icmp.lo: ../../include/net-snmp/library/data_list.h
-./mibII/icmp.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/icmp.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/icmp.lo: ../../include/net-snmp/library/container.h
-./mibII/icmp.lo: ../../include/net-snmp/library/factory.h
-./mibII/icmp.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/icmp.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/icmp.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/icmp.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/icmp.lo: ../../include/net-snmp/library/container.h
-./mibII/icmp.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/icmp.lo: ../../include/net-snmp/version.h
+./mibII/icmp.lo: ../../include/net-snmp/pdu_api.h
+./mibII/icmp.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/icmp.lo: ../../include/net-snmp/session_api.h
+./mibII/icmp.lo: ../../include/net-snmp/library/callback.h
 ./mibII/icmp.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/icmp.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/icmp.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -5463,11 +5463,31 @@
 ./mibII/icmp.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/icmp.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/icmp.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/icmp.lo: ../../include/net-snmp/pdu_api.h
-./mibII/icmp.lo: ../../include/net-snmp/mib_api.h
 ./mibII/icmp.lo: ../../include/net-snmp/library/mib.h
+./mibII/icmp.lo: ../../include/net-snmp/mib_api.h
 ./mibII/icmp.lo: ../../include/net-snmp/library/parse.h
-./mibII/icmp.lo: ../../include/net-snmp/varbind_api.h
+./mibII/icmp.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/icmp.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/icmp.lo: ../../include/net-snmp/library/snmp.h
+./mibII/icmp.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/icmp.lo: ../../include/net-snmp/library/getopt.h
+./mibII/icmp.lo: ../../include/net-snmp/utilities.h
+./mibII/icmp.lo: ../../include/net-snmp/library/system.h
+./mibII/icmp.lo: ../../include/net-snmp/library/tools.h
+./mibII/icmp.lo: ../../include/net-snmp/library/int64.h
+./mibII/icmp.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/icmp.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/icmp.lo: ../../include/net-snmp/library/data_list.h
+./mibII/icmp.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/icmp.lo: ../../include/net-snmp/library/container.h
+./mibII/icmp.lo: ../../include/net-snmp/library/factory.h
+./mibII/icmp.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/icmp.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/icmp.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/icmp.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/icmp.lo: ../../include/net-snmp/library/container.h
+./mibII/icmp.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/icmp.lo: ../../include/net-snmp/version.h
 ./mibII/icmp.lo: ../../include/net-snmp/config_api.h
 ./mibII/icmp.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/icmp.lo: ../../include/net-snmp/library/default_store.h
@@ -5521,8 +5541,10 @@
 ./mibII/icmp.lo: ../../include/net-snmp/agent/table_container.h
 ./mibII/icmp.lo: ../../include/net-snmp/agent/table_array.h
 ./mibII/icmp.lo: ../../include/net-snmp/agent/mfd.h
-./mibII/icmp.lo: ../../include/net-snmp/agent/auto_nlist.h util_funcs.h
-./mibII/icmp.lo: struct.h ./mibII/icmp.h ./mibII/sysORTable.h
+./mibII/icmp.lo: ../../include/net-snmp/agent/auto_nlist.h
+./mibII/icmp.lo: ../../include/net-snmp/agent/sysORTable.h
+./mibII/icmp.lo: ../../include/net-snmp/agent/agent_callbacks.h
+./mibII/icmp.lo: util_funcs/MIB_STATS_CACHE_TIMEOUT.h ./mibII/icmp.h
 ./mibII/interfaces.lo: ../../include/net-snmp/net-snmp-config.h
 ./mibII/interfaces.lo: ../../include/net-snmp/system/linux.h
 ./mibII/interfaces.lo: ../../include/net-snmp/system/sysv.h
@@ -5532,32 +5554,14 @@
 ./mibII/interfaces.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/interfaces.lo: ../../include/net-snmp/definitions.h
 ./mibII/interfaces.lo: ../../include/net-snmp/types.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/types.h
 ./mibII/interfaces.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/interfaces.lo: ../../include/net-snmp/library/asn1.h
-./mibII/interfaces.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/interfaces.lo: ../../include/net-snmp/library/snmp.h
-./mibII/interfaces.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/interfaces.lo: ../../include/net-snmp/utilities.h
+./mibII/interfaces.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/interfaces.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/interfaces.lo: ../../include/net-snmp/library/system.h
-./mibII/interfaces.lo: ../../include/net-snmp/library/tools.h
-./mibII/interfaces.lo: ../../include/net-snmp/library/int64.h
-./mibII/interfaces.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/interfaces.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/interfaces.lo: ../../include/net-snmp/library/callback.h
-./mibII/interfaces.lo: ../../include/net-snmp/library/data_list.h
-./mibII/interfaces.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/interfaces.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/interfaces.lo: ../../include/net-snmp/library/container.h
-./mibII/interfaces.lo: ../../include/net-snmp/library/factory.h
-./mibII/interfaces.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/interfaces.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/interfaces.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/interfaces.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/interfaces.lo: ../../include/net-snmp/library/container.h
-./mibII/interfaces.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/interfaces.lo: ../../include/net-snmp/version.h
+./mibII/interfaces.lo: ../../include/net-snmp/pdu_api.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/interfaces.lo: ../../include/net-snmp/session_api.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/callback.h
 ./mibII/interfaces.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/interfaces.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/interfaces.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -5568,11 +5572,31 @@
 ./mibII/interfaces.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/interfaces.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/interfaces.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/interfaces.lo: ../../include/net-snmp/pdu_api.h
-./mibII/interfaces.lo: ../../include/net-snmp/mib_api.h
 ./mibII/interfaces.lo: ../../include/net-snmp/library/mib.h
+./mibII/interfaces.lo: ../../include/net-snmp/mib_api.h
 ./mibII/interfaces.lo: ../../include/net-snmp/library/parse.h
-./mibII/interfaces.lo: ../../include/net-snmp/varbind_api.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/snmp.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/getopt.h
+./mibII/interfaces.lo: ../../include/net-snmp/utilities.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/system.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/tools.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/int64.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/data_list.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/container.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/factory.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/container.h
+./mibII/interfaces.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/interfaces.lo: ../../include/net-snmp/version.h
 ./mibII/interfaces.lo: ../../include/net-snmp/config_api.h
 ./mibII/interfaces.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/interfaces.lo: ../../include/net-snmp/library/default_store.h
@@ -5627,117 +5651,11 @@
 ./mibII/interfaces.lo: ../../include/net-snmp/agent/table_array.h
 ./mibII/interfaces.lo: ../../include/net-snmp/agent/mfd.h
 ./mibII/interfaces.lo: ../../include/net-snmp/agent/auto_nlist.h
+./mibII/interfaces.lo: ../../include/net-snmp/agent/sysORTable.h
+./mibII/interfaces.lo: ../../include/net-snmp/agent/agent_callbacks.h
 ./mibII/interfaces.lo: ../../include/net-snmp/data_access/interface.h
-./mibII/interfaces.lo: ./mibII/interfaces.h struct.h util_funcs.h
-./mibII/interfaces.lo: ./mibII/sysORTable.h
-./mibII/ip.lo: ../../include/net-snmp/net-snmp-config.h
-./mibII/ip.lo: ../../include/net-snmp/system/linux.h
-./mibII/ip.lo: ../../include/net-snmp/system/sysv.h
-./mibII/ip.lo: ../../include/net-snmp/system/generic.h
-./mibII/ip.lo: ../../include/net-snmp/machine/generic.h
-./mibII/ip.lo: ./mibII/mibII_common.h
-./mibII/ip.lo: ../../agent/kernel.h
-./mibII/ip.lo: ../../include/net-snmp/net-snmp-includes.h
-./mibII/ip.lo: ../../include/net-snmp/definitions.h
-./mibII/ip.lo: ../../include/net-snmp/types.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/ip.lo: ../../include/net-snmp/library/asn1.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmp.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/ip.lo: ../../include/net-snmp/utilities.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/ip.lo: ../../include/net-snmp/library/system.h
-./mibII/ip.lo: ../../include/net-snmp/library/tools.h
-./mibII/ip.lo: ../../include/net-snmp/library/int64.h
-./mibII/ip.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/ip.lo: ../../include/net-snmp/library/callback.h
-./mibII/ip.lo: ../../include/net-snmp/library/data_list.h
-./mibII/ip.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/ip.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/ip.lo: ../../include/net-snmp/library/container.h
-./mibII/ip.lo: ../../include/net-snmp/library/factory.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/ip.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/ip.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/ip.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/ip.lo: ../../include/net-snmp/library/container.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/ip.lo: ../../include/net-snmp/version.h
-./mibII/ip.lo: ../../include/net-snmp/session_api.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmp_transport.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmp_service.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmpUnixDomain.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmpUDPDomain.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmpTCPDomain.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmpIPXDomain.h
-./mibII/ip.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/ip.lo: ../../include/net-snmp/pdu_api.h
-./mibII/ip.lo: ../../include/net-snmp/mib_api.h
-./mibII/ip.lo: ../../include/net-snmp/library/mib.h
-./mibII/ip.lo: ../../include/net-snmp/library/parse.h
-./mibII/ip.lo: ../../include/net-snmp/varbind_api.h
-./mibII/ip.lo: ../../include/net-snmp/config_api.h
-./mibII/ip.lo: ../../include/net-snmp/library/read_config.h
-./mibII/ip.lo: ../../include/net-snmp/library/default_store.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmp_parse_args.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmp_enum.h
-./mibII/ip.lo: ../../include/net-snmp/library/vacm.h
-./mibII/ip.lo: ../../include/net-snmp/output_api.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmp_debug.h
-./mibII/ip.lo: ../../include/net-snmp/snmpv3_api.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmpv3.h
-./mibII/ip.lo: ../../include/net-snmp/library/transform_oids.h
-./mibII/ip.lo: ../../include/net-snmp/library/keytools.h
-./mibII/ip.lo: ../../include/net-snmp/library/scapi.h
-./mibII/ip.lo: ../../include/net-snmp/library/lcd_time.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmp_secmod.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
-./mibII/ip.lo: ../../include/net-snmp/library/snmpusm.h
-./mibII/ip.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
-./mibII/ip.lo: ../../include/net-snmp/agent/mib_module_config.h
-./mibII/ip.lo: ../../include/net-snmp/agent/agent_module_config.h
-./mibII/ip.lo: ../../include/net-snmp/agent/snmp_agent.h
-./mibII/ip.lo: ../../include/net-snmp/agent/snmp_vars.h
-./mibII/ip.lo: ../../include/net-snmp/agent/agent_handler.h
-./mibII/ip.lo: ../../include/net-snmp/agent/var_struct.h
-./mibII/ip.lo: ../../include/net-snmp/agent/agent_registry.h
-./mibII/ip.lo: ../../include/net-snmp/library/fd_event_manager.h
-./mibII/ip.lo: ../../include/net-snmp/agent/ds_agent.h
-./mibII/ip.lo: ../../include/net-snmp/agent/agent_read_config.h
-./mibII/ip.lo: ../../include/net-snmp/agent/agent_trap.h
-./mibII/ip.lo: ../../include/net-snmp/agent/all_helpers.h
-./mibII/ip.lo: ../../include/net-snmp/agent/instance.h
-./mibII/ip.lo: ../../include/net-snmp/agent/baby_steps.h
-./mibII/ip.lo: ../../include/net-snmp/agent/scalar.h
-./mibII/ip.lo: ../../include/net-snmp/agent/scalar_group.h
-./mibII/ip.lo: ../../include/net-snmp/agent/watcher.h
-./mibII/ip.lo: ../../include/net-snmp/agent/multiplexer.h
-./mibII/ip.lo: ../../include/net-snmp/agent/null.h
-./mibII/ip.lo: ../../include/net-snmp/agent/debug_handler.h
-./mibII/ip.lo: ../../include/net-snmp/agent/cache_handler.h
-./mibII/ip.lo: ../../include/net-snmp/agent/old_api.h
-./mibII/ip.lo: ../../include/net-snmp/agent/read_only.h
-./mibII/ip.lo: ../../include/net-snmp/agent/row_merge.h
-./mibII/ip.lo: ../../include/net-snmp/agent/serialize.h
-./mibII/ip.lo: ../../include/net-snmp/agent/bulk_to_next.h
-./mibII/ip.lo: ../../include/net-snmp/agent/mode_end_call.h
-./mibII/ip.lo: ../../include/net-snmp/agent/table.h
-./mibII/ip.lo: ../../include/net-snmp/agent/table_data.h
-./mibII/ip.lo: ../../include/net-snmp/agent/table_dataset.h
-./mibII/ip.lo: ../../include/net-snmp/agent/table_tdata.h
-./mibII/ip.lo: ../../include/net-snmp/agent/table_iterator.h
-./mibII/ip.lo: ../../include/net-snmp/agent/table_container.h
-./mibII/ip.lo: ../../include/net-snmp/agent/table_array.h
-./mibII/ip.lo: ../../include/net-snmp/agent/mfd.h
-./mibII/ip.lo: ../../include/net-snmp/agent/auto_nlist.h util_funcs.h
-./mibII/ip.lo: struct.h ./mibII/ip.h ./mibII/var_route.h
-./mibII/ip.lo: ./mibII/route_write.h ./mibII/at.h ./mibII/ipAddr.h
-./mibII/ip.lo: ./mibII/interfaces.h ./mibII/sysORTable.h
+./mibII/interfaces.lo: ./mibII/interfaces.h struct.h
+./mibII/interfaces.lo: util_funcs/header_generic.h
 ./mibII/ipAddr.lo: ../../include/net-snmp/net-snmp-config.h
 ./mibII/ipAddr.lo: ../../include/net-snmp/system/linux.h
 ./mibII/ipAddr.lo: ../../include/net-snmp/system/sysv.h
@@ -5747,32 +5665,14 @@
 ./mibII/ipAddr.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/ipAddr.lo: ../../include/net-snmp/definitions.h
 ./mibII/ipAddr.lo: ../../include/net-snmp/types.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/types.h
 ./mibII/ipAddr.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/ipAddr.lo: ../../include/net-snmp/library/asn1.h
-./mibII/ipAddr.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/ipAddr.lo: ../../include/net-snmp/library/snmp.h
-./mibII/ipAddr.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/ipAddr.lo: ../../include/net-snmp/utilities.h
+./mibII/ipAddr.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/ipAddr.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/ipAddr.lo: ../../include/net-snmp/library/system.h
-./mibII/ipAddr.lo: ../../include/net-snmp/library/tools.h
-./mibII/ipAddr.lo: ../../include/net-snmp/library/int64.h
-./mibII/ipAddr.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/ipAddr.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/ipAddr.lo: ../../include/net-snmp/library/callback.h
-./mibII/ipAddr.lo: ../../include/net-snmp/library/data_list.h
-./mibII/ipAddr.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/ipAddr.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/ipAddr.lo: ../../include/net-snmp/library/container.h
-./mibII/ipAddr.lo: ../../include/net-snmp/library/factory.h
-./mibII/ipAddr.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/ipAddr.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/ipAddr.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/ipAddr.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/ipAddr.lo: ../../include/net-snmp/library/container.h
-./mibII/ipAddr.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/ipAddr.lo: ../../include/net-snmp/version.h
+./mibII/ipAddr.lo: ../../include/net-snmp/pdu_api.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/ipAddr.lo: ../../include/net-snmp/session_api.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/callback.h
 ./mibII/ipAddr.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/ipAddr.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/ipAddr.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -5783,11 +5683,31 @@
 ./mibII/ipAddr.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/ipAddr.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/ipAddr.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/ipAddr.lo: ../../include/net-snmp/pdu_api.h
-./mibII/ipAddr.lo: ../../include/net-snmp/mib_api.h
 ./mibII/ipAddr.lo: ../../include/net-snmp/library/mib.h
+./mibII/ipAddr.lo: ../../include/net-snmp/mib_api.h
 ./mibII/ipAddr.lo: ../../include/net-snmp/library/parse.h
-./mibII/ipAddr.lo: ../../include/net-snmp/varbind_api.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/snmp.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/getopt.h
+./mibII/ipAddr.lo: ../../include/net-snmp/utilities.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/system.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/tools.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/int64.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/data_list.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/container.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/factory.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/container.h
+./mibII/ipAddr.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/ipAddr.lo: ../../include/net-snmp/version.h
 ./mibII/ipAddr.lo: ../../include/net-snmp/config_api.h
 ./mibII/ipAddr.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/ipAddr.lo: ../../include/net-snmp/library/default_store.h
@@ -5844,7 +5764,226 @@
 ./mibII/ipAddr.lo: ../../include/net-snmp/agent/auto_nlist.h
 ./mibII/ipAddr.lo: ../../include/net-snmp/data_access/interface.h
 ./mibII/ipAddr.lo: ./mibII/ip.h ./mibII/var_route.h ./mibII/route_write.h
-./mibII/ipAddr.lo: ./mibII/at.h ./mibII/interfaces.h ./mibII/sysORTable.h
+./mibII/ipAddr.lo: ./mibII/at.h ./mibII/interfaces.h
+./mibII/ip.lo: ../../include/net-snmp/net-snmp-config.h
+./mibII/ip.lo: ../../include/net-snmp/system/linux.h
+./mibII/ip.lo: ../../include/net-snmp/system/sysv.h
+./mibII/ip.lo: ../../include/net-snmp/system/generic.h
+./mibII/ip.lo: ../../include/net-snmp/machine/generic.h
+./mibII/ip.lo: ./mibII/mibII_common.h
+./mibII/ip.lo: ../../agent/kernel.h
+./mibII/ip.lo: ../../include/net-snmp/net-snmp-includes.h
+./mibII/ip.lo: ../../include/net-snmp/definitions.h
+./mibII/ip.lo: ../../include/net-snmp/types.h
+./mibII/ip.lo: ../../include/net-snmp/library/types.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmp_api.h
+./mibII/ip.lo: ../../include/net-snmp/varbind_api.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmp_client.h
+./mibII/ip.lo: ../../include/net-snmp/pdu_api.h
+./mibII/ip.lo: ../../include/net-snmp/library/asn1.h
+./mibII/ip.lo: ../../include/net-snmp/session_api.h
+./mibII/ip.lo: ../../include/net-snmp/library/callback.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmp_transport.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmp_service.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./mibII/ip.lo: ../../include/net-snmp/library/ucd_compat.h
+./mibII/ip.lo: ../../include/net-snmp/library/mib.h
+./mibII/ip.lo: ../../include/net-snmp/mib_api.h
+./mibII/ip.lo: ../../include/net-snmp/library/parse.h
+./mibII/ip.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmp.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/ip.lo: ../../include/net-snmp/library/getopt.h
+./mibII/ip.lo: ../../include/net-snmp/utilities.h
+./mibII/ip.lo: ../../include/net-snmp/library/system.h
+./mibII/ip.lo: ../../include/net-snmp/library/tools.h
+./mibII/ip.lo: ../../include/net-snmp/library/int64.h
+./mibII/ip.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/ip.lo: ../../include/net-snmp/library/data_list.h
+./mibII/ip.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/ip.lo: ../../include/net-snmp/library/container.h
+./mibII/ip.lo: ../../include/net-snmp/library/factory.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/ip.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/ip.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/ip.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/ip.lo: ../../include/net-snmp/library/container.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/ip.lo: ../../include/net-snmp/version.h
+./mibII/ip.lo: ../../include/net-snmp/config_api.h
+./mibII/ip.lo: ../../include/net-snmp/library/read_config.h
+./mibII/ip.lo: ../../include/net-snmp/library/default_store.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmp_enum.h
+./mibII/ip.lo: ../../include/net-snmp/library/vacm.h
+./mibII/ip.lo: ../../include/net-snmp/output_api.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmp_debug.h
+./mibII/ip.lo: ../../include/net-snmp/snmpv3_api.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmpv3.h
+./mibII/ip.lo: ../../include/net-snmp/library/transform_oids.h
+./mibII/ip.lo: ../../include/net-snmp/library/keytools.h
+./mibII/ip.lo: ../../include/net-snmp/library/scapi.h
+./mibII/ip.lo: ../../include/net-snmp/library/lcd_time.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmp_secmod.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./mibII/ip.lo: ../../include/net-snmp/library/snmpusm.h
+./mibII/ip.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./mibII/ip.lo: ../../include/net-snmp/agent/mib_module_config.h
+./mibII/ip.lo: ../../include/net-snmp/agent/agent_module_config.h
+./mibII/ip.lo: ../../include/net-snmp/agent/snmp_agent.h
+./mibII/ip.lo: ../../include/net-snmp/agent/snmp_vars.h
+./mibII/ip.lo: ../../include/net-snmp/agent/agent_handler.h
+./mibII/ip.lo: ../../include/net-snmp/agent/var_struct.h
+./mibII/ip.lo: ../../include/net-snmp/agent/agent_registry.h
+./mibII/ip.lo: ../../include/net-snmp/library/fd_event_manager.h
+./mibII/ip.lo: ../../include/net-snmp/agent/ds_agent.h
+./mibII/ip.lo: ../../include/net-snmp/agent/agent_read_config.h
+./mibII/ip.lo: ../../include/net-snmp/agent/agent_trap.h
+./mibII/ip.lo: ../../include/net-snmp/agent/all_helpers.h
+./mibII/ip.lo: ../../include/net-snmp/agent/instance.h
+./mibII/ip.lo: ../../include/net-snmp/agent/baby_steps.h
+./mibII/ip.lo: ../../include/net-snmp/agent/scalar.h
+./mibII/ip.lo: ../../include/net-snmp/agent/scalar_group.h
+./mibII/ip.lo: ../../include/net-snmp/agent/watcher.h
+./mibII/ip.lo: ../../include/net-snmp/agent/multiplexer.h
+./mibII/ip.lo: ../../include/net-snmp/agent/null.h
+./mibII/ip.lo: ../../include/net-snmp/agent/debug_handler.h
+./mibII/ip.lo: ../../include/net-snmp/agent/cache_handler.h
+./mibII/ip.lo: ../../include/net-snmp/agent/old_api.h
+./mibII/ip.lo: ../../include/net-snmp/agent/read_only.h
+./mibII/ip.lo: ../../include/net-snmp/agent/row_merge.h
+./mibII/ip.lo: ../../include/net-snmp/agent/serialize.h
+./mibII/ip.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./mibII/ip.lo: ../../include/net-snmp/agent/mode_end_call.h
+./mibII/ip.lo: ../../include/net-snmp/agent/table.h
+./mibII/ip.lo: ../../include/net-snmp/agent/table_data.h
+./mibII/ip.lo: ../../include/net-snmp/agent/table_dataset.h
+./mibII/ip.lo: ../../include/net-snmp/agent/table_tdata.h
+./mibII/ip.lo: ../../include/net-snmp/agent/table_iterator.h
+./mibII/ip.lo: ../../include/net-snmp/agent/table_container.h
+./mibII/ip.lo: ../../include/net-snmp/agent/table_array.h
+./mibII/ip.lo: ../../include/net-snmp/agent/mfd.h
+./mibII/ip.lo: ../../include/net-snmp/agent/auto_nlist.h
+./mibII/ip.lo: ../../include/net-snmp/agent/sysORTable.h
+./mibII/ip.lo: ../../include/net-snmp/agent/agent_callbacks.h
+./mibII/ip.lo: util_funcs/MIB_STATS_CACHE_TIMEOUT.h ./mibII/ip.h
+./mibII/ip.lo: ./mibII/var_route.h ./mibII/route_write.h ./mibII/at.h
+./mibII/ip.lo: ./mibII/ipAddr.h ./mibII/interfaces.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/net-snmp-config.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/system/linux.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/system/sysv.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/system/generic.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/machine/generic.h
+./mibII/ipCidrRouteTable_access.lo: ./mibII/route_headers.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/net-snmp-includes.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/definitions.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/types.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/types.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_api.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/varbind_api.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_client.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/pdu_api.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/asn1.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/session_api.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/callback.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_transport.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_service.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/ucd_compat.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/mib.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/mib_api.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/parse.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/getopt.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/utilities.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/system.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/tools.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/int64.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/data_list.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/container.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/factory.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/container.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/version.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/config_api.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/read_config.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/default_store.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_enum.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/vacm.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/output_api.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_debug.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/snmpv3_api.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmpv3.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/transform_oids.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/keytools.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/scapi.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/lcd_time.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_secmod.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmpusm.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/mib_module_config.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/agent_module_config.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/snmp_agent.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/snmp_vars.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/agent_handler.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/var_struct.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/agent_registry.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/fd_event_manager.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/ds_agent.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/agent_read_config.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/agent_trap.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/all_helpers.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/instance.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/baby_steps.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/scalar.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/scalar_group.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/watcher.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/multiplexer.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/null.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/debug_handler.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/cache_handler.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/old_api.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/read_only.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/row_merge.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/serialize.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/mode_end_call.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/table.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/table_data.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/table_dataset.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/table_tdata.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/table_iterator.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/table_container.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/table_array.h
+./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/mfd.h
+./mibII/ipCidrRouteTable_access.lo: ./mibII/ipCidrRouteTable_access.h
+./mibII/ipCidrRouteTable_access.lo: ./mibII/ipCidrRouteTable_enums.h
 ./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/net-snmp-config.h
 ./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/system/linux.h
 ./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/system/sysv.h
@@ -5854,32 +5993,14 @@
 ./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/definitions.h
 ./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/types.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/types.h
 ./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/asn1.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/snmp.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/utilities.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/system.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/tools.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/int64.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/callback.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/data_list.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/container.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/factory.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/container.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/version.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/pdu_api.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/session_api.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/callback.h
 ./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -5890,11 +6011,31 @@
 ./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/pdu_api.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/mib_api.h
 ./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/mib.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/mib_api.h
 ./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/parse.h
-./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/varbind_api.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/snmp.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/getopt.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/utilities.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/system.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/tools.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/int64.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/data_list.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/container.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/factory.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/container.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/version.h
 ./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/config_api.h
 ./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/ipCidrRouteTable.lo: ../../include/net-snmp/library/default_store.h
@@ -5954,111 +6095,6 @@
 ./mibII/ipCidrRouteTable.lo: ./mibII/ipCidrRouteTable_checkfns.h
 ./mibII/ipCidrRouteTable.lo: ./mibII/ipCidrRouteTable_access.h
 ./mibII/ipCidrRouteTable.lo: ./mibII/var_route.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/net-snmp-config.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/system/linux.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/system/sysv.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/system/generic.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/machine/generic.h
-./mibII/ipCidrRouteTable_access.lo: ./mibII/route_headers.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/net-snmp-includes.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/definitions.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/types.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/asn1.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/utilities.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/system.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/tools.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/int64.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/callback.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/data_list.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/container.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/factory.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/container.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/version.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/session_api.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_transport.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_service.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmpUnixDomain.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmpUDPDomain.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmpTCPDomain.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmpIPXDomain.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/pdu_api.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/mib_api.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/mib.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/parse.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/varbind_api.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/config_api.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/read_config.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/default_store.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_parse_args.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_enum.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/vacm.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/output_api.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_debug.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/snmpv3_api.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmpv3.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/transform_oids.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/keytools.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/scapi.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/lcd_time.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmp_secmod.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/snmpusm.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/mib_module_config.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/agent_module_config.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/snmp_agent.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/snmp_vars.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/agent_handler.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/var_struct.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/agent_registry.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/library/fd_event_manager.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/ds_agent.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/agent_read_config.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/agent_trap.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/all_helpers.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/instance.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/baby_steps.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/scalar.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/scalar_group.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/watcher.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/multiplexer.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/null.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/debug_handler.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/cache_handler.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/old_api.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/read_only.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/row_merge.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/serialize.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/bulk_to_next.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/mode_end_call.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/table.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/table_data.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/table_dataset.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/table_tdata.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/table_iterator.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/table_container.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/table_array.h
-./mibII/ipCidrRouteTable_access.lo: ../../include/net-snmp/agent/mfd.h
-./mibII/ipCidrRouteTable_access.lo: ./mibII/ipCidrRouteTable_access.h
-./mibII/ipCidrRouteTable_access.lo: ./mibII/ipCidrRouteTable_enums.h
 ./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/net-snmp-config.h
 ./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/system/linux.h
 ./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/system/sysv.h
@@ -6067,32 +6103,14 @@
 ./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/definitions.h
 ./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/types.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/types.h
 ./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/asn1.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/snmp.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/utilities.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/system.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/tools.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/int64.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/callback.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/data_list.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/container.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/factory.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/container.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/version.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/pdu_api.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/session_api.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/callback.h
 ./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -6103,11 +6121,31 @@
 ./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/pdu_api.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/mib_api.h
 ./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/mib.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/mib_api.h
 ./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/parse.h
-./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/varbind_api.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/snmp.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/getopt.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/utilities.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/system.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/tools.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/int64.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/data_list.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/container.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/factory.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/container.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/version.h
 ./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/config_api.h
 ./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/ipCidrRouteTable_checkfns.lo: ../../include/net-snmp/library/default_store.h
@@ -6135,32 +6173,14 @@
 ./mibII/ipv6.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/ipv6.lo: ../../include/net-snmp/definitions.h
 ./mibII/ipv6.lo: ../../include/net-snmp/types.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/types.h
 ./mibII/ipv6.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/ipv6.lo: ../../include/net-snmp/library/asn1.h
-./mibII/ipv6.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/ipv6.lo: ../../include/net-snmp/library/snmp.h
-./mibII/ipv6.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/ipv6.lo: ../../include/net-snmp/utilities.h
+./mibII/ipv6.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/ipv6.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/ipv6.lo: ../../include/net-snmp/library/system.h
-./mibII/ipv6.lo: ../../include/net-snmp/library/tools.h
-./mibII/ipv6.lo: ../../include/net-snmp/library/int64.h
-./mibII/ipv6.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/ipv6.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/ipv6.lo: ../../include/net-snmp/library/callback.h
-./mibII/ipv6.lo: ../../include/net-snmp/library/data_list.h
-./mibII/ipv6.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/ipv6.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/ipv6.lo: ../../include/net-snmp/library/container.h
-./mibII/ipv6.lo: ../../include/net-snmp/library/factory.h
-./mibII/ipv6.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/ipv6.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/ipv6.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/ipv6.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/ipv6.lo: ../../include/net-snmp/library/container.h
-./mibII/ipv6.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/ipv6.lo: ../../include/net-snmp/version.h
+./mibII/ipv6.lo: ../../include/net-snmp/pdu_api.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/ipv6.lo: ../../include/net-snmp/session_api.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/callback.h
 ./mibII/ipv6.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/ipv6.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/ipv6.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -6171,11 +6191,31 @@
 ./mibII/ipv6.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/ipv6.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/ipv6.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/ipv6.lo: ../../include/net-snmp/pdu_api.h
-./mibII/ipv6.lo: ../../include/net-snmp/mib_api.h
 ./mibII/ipv6.lo: ../../include/net-snmp/library/mib.h
+./mibII/ipv6.lo: ../../include/net-snmp/mib_api.h
 ./mibII/ipv6.lo: ../../include/net-snmp/library/parse.h
-./mibII/ipv6.lo: ../../include/net-snmp/varbind_api.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/snmp.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/getopt.h
+./mibII/ipv6.lo: ../../include/net-snmp/utilities.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/system.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/tools.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/int64.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/data_list.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/container.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/factory.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/container.h
+./mibII/ipv6.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/ipv6.lo: ../../include/net-snmp/version.h
 ./mibII/ipv6.lo: ../../include/net-snmp/config_api.h
 ./mibII/ipv6.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/ipv6.lo: ../../include/net-snmp/library/default_store.h
@@ -6230,9 +6270,8 @@
 ./mibII/ipv6.lo: ../../include/net-snmp/agent/table_array.h
 ./mibII/ipv6.lo: ../../include/net-snmp/agent/mfd.h
 ./mibII/ipv6.lo: ../../include/net-snmp/agent/auto_nlist.h
-./mibII/ipv6.lo: ../../agent/kernel.h util_funcs.h struct.h ./mibII/ipv6.h
-./mibII/ipv6.lo: ./mibII/var_route.h ./mibII/route_write.h ./mibII/at.h
-./mibII/ipv6.lo: ./mibII/interfaces.h
+./mibII/ipv6.lo: ../../agent/kernel.h ./mibII/ipv6.h ./mibII/var_route.h
+./mibII/ipv6.lo: ./mibII/route_write.h ./mibII/at.h ./mibII/interfaces.h
 ./mibII/kernel_linux.lo: ../../include/net-snmp/net-snmp-config.h
 ./mibII/kernel_linux.lo: ../../include/net-snmp/system/linux.h
 ./mibII/kernel_linux.lo: ../../include/net-snmp/system/sysv.h
@@ -6241,32 +6280,14 @@
 ./mibII/kernel_linux.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/kernel_linux.lo: ../../include/net-snmp/definitions.h
 ./mibII/kernel_linux.lo: ../../include/net-snmp/types.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/types.h
 ./mibII/kernel_linux.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/library/asn1.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/library/snmp.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/utilities.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/kernel_linux.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/library/system.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/library/tools.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/library/int64.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/library/callback.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/library/data_list.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/library/container.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/library/factory.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/library/container.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/version.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/pdu_api.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/kernel_linux.lo: ../../include/net-snmp/session_api.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/callback.h
 ./mibII/kernel_linux.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/kernel_linux.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/kernel_linux.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -6277,11 +6298,31 @@
 ./mibII/kernel_linux.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/kernel_linux.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/kernel_linux.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/pdu_api.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/mib_api.h
 ./mibII/kernel_linux.lo: ../../include/net-snmp/library/mib.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/mib_api.h
 ./mibII/kernel_linux.lo: ../../include/net-snmp/library/parse.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/varbind_api.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/snmp.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/getopt.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/utilities.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/system.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/tools.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/int64.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/data_list.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/container.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/factory.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/container.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/version.h
 ./mibII/kernel_linux.lo: ../../include/net-snmp/config_api.h
 ./mibII/kernel_linux.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/kernel_linux.lo: ../../include/net-snmp/library/default_store.h
@@ -6334,8 +6375,7 @@
 ./mibII/kernel_linux.lo: ../../include/net-snmp/agent/table_iterator.h
 ./mibII/kernel_linux.lo: ../../include/net-snmp/agent/table_container.h
 ./mibII/kernel_linux.lo: ../../include/net-snmp/agent/table_array.h
-./mibII/kernel_linux.lo: ../../include/net-snmp/agent/mfd.h util_funcs.h
-./mibII/kernel_linux.lo: struct.h
+./mibII/kernel_linux.lo: ../../include/net-snmp/agent/mfd.h
 ./mibII/kernel_linux.lo: ./mibII/kernel_linux.h
 ./mibII/kernel_netbsd.lo: ../../include/net-snmp/net-snmp-config.h
 ./mibII/kernel_netbsd.lo: ../../include/net-snmp/system/linux.h
@@ -6345,32 +6385,14 @@
 ./mibII/kernel_netbsd.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/kernel_netbsd.lo: ../../include/net-snmp/definitions.h
 ./mibII/kernel_netbsd.lo: ../../include/net-snmp/types.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/types.h
 ./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/asn1.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/snmp.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/utilities.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/system.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/tools.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/int64.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/callback.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/data_list.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/container.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/factory.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/container.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/version.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/pdu_api.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/kernel_netbsd.lo: ../../include/net-snmp/session_api.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/callback.h
 ./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -6381,11 +6403,31 @@
 ./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/pdu_api.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/mib_api.h
 ./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/mib.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/mib_api.h
 ./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/parse.h
-./mibII/kernel_netbsd.lo: ../../include/net-snmp/varbind_api.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/snmp.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/getopt.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/utilities.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/system.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/tools.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/int64.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/data_list.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/container.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/factory.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/container.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/kernel_netbsd.lo: ../../include/net-snmp/version.h
 ./mibII/kernel_netbsd.lo: ../../include/net-snmp/config_api.h
 ./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/kernel_netbsd.lo: ../../include/net-snmp/library/default_store.h
@@ -6448,32 +6490,14 @@
 ./mibII/mta_sendmail.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/mta_sendmail.lo: ../../include/net-snmp/definitions.h
 ./mibII/mta_sendmail.lo: ../../include/net-snmp/types.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/types.h
 ./mibII/mta_sendmail.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/library/asn1.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/library/snmp.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/utilities.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/mta_sendmail.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/library/system.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/library/tools.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/library/int64.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/library/callback.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/library/data_list.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/library/container.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/library/factory.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/library/container.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/version.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/pdu_api.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/mta_sendmail.lo: ../../include/net-snmp/session_api.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/callback.h
 ./mibII/mta_sendmail.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/mta_sendmail.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/mta_sendmail.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -6484,11 +6508,31 @@
 ./mibII/mta_sendmail.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/mta_sendmail.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/mta_sendmail.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/pdu_api.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/mib_api.h
 ./mibII/mta_sendmail.lo: ../../include/net-snmp/library/mib.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/mib_api.h
 ./mibII/mta_sendmail.lo: ../../include/net-snmp/library/parse.h
-./mibII/mta_sendmail.lo: ../../include/net-snmp/varbind_api.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/snmp.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/getopt.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/utilities.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/system.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/tools.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/int64.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/data_list.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/container.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/factory.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/container.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/mta_sendmail.lo: ../../include/net-snmp/version.h
 ./mibII/mta_sendmail.lo: ../../include/net-snmp/config_api.h
 ./mibII/mta_sendmail.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/mta_sendmail.lo: ../../include/net-snmp/library/default_store.h
@@ -6551,32 +6595,14 @@
 ./mibII/route_write.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/route_write.lo: ../../include/net-snmp/definitions.h
 ./mibII/route_write.lo: ../../include/net-snmp/types.h
+./mibII/route_write.lo: ../../include/net-snmp/library/types.h
 ./mibII/route_write.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/route_write.lo: ../../include/net-snmp/library/asn1.h
-./mibII/route_write.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/route_write.lo: ../../include/net-snmp/library/snmp.h
-./mibII/route_write.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/route_write.lo: ../../include/net-snmp/utilities.h
+./mibII/route_write.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/route_write.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/route_write.lo: ../../include/net-snmp/library/system.h
-./mibII/route_write.lo: ../../include/net-snmp/library/tools.h
-./mibII/route_write.lo: ../../include/net-snmp/library/int64.h
-./mibII/route_write.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/route_write.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/route_write.lo: ../../include/net-snmp/library/callback.h
-./mibII/route_write.lo: ../../include/net-snmp/library/data_list.h
-./mibII/route_write.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/route_write.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/route_write.lo: ../../include/net-snmp/library/container.h
-./mibII/route_write.lo: ../../include/net-snmp/library/factory.h
-./mibII/route_write.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/route_write.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/route_write.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/route_write.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/route_write.lo: ../../include/net-snmp/library/container.h
-./mibII/route_write.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/route_write.lo: ../../include/net-snmp/version.h
+./mibII/route_write.lo: ../../include/net-snmp/pdu_api.h
+./mibII/route_write.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/route_write.lo: ../../include/net-snmp/session_api.h
+./mibII/route_write.lo: ../../include/net-snmp/library/callback.h
 ./mibII/route_write.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/route_write.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/route_write.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -6587,11 +6613,31 @@
 ./mibII/route_write.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/route_write.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/route_write.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/route_write.lo: ../../include/net-snmp/pdu_api.h
-./mibII/route_write.lo: ../../include/net-snmp/mib_api.h
 ./mibII/route_write.lo: ../../include/net-snmp/library/mib.h
+./mibII/route_write.lo: ../../include/net-snmp/mib_api.h
 ./mibII/route_write.lo: ../../include/net-snmp/library/parse.h
-./mibII/route_write.lo: ../../include/net-snmp/varbind_api.h
+./mibII/route_write.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/route_write.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/route_write.lo: ../../include/net-snmp/library/snmp.h
+./mibII/route_write.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/route_write.lo: ../../include/net-snmp/library/getopt.h
+./mibII/route_write.lo: ../../include/net-snmp/utilities.h
+./mibII/route_write.lo: ../../include/net-snmp/library/system.h
+./mibII/route_write.lo: ../../include/net-snmp/library/tools.h
+./mibII/route_write.lo: ../../include/net-snmp/library/int64.h
+./mibII/route_write.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/route_write.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/route_write.lo: ../../include/net-snmp/library/data_list.h
+./mibII/route_write.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/route_write.lo: ../../include/net-snmp/library/container.h
+./mibII/route_write.lo: ../../include/net-snmp/library/factory.h
+./mibII/route_write.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/route_write.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/route_write.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/route_write.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/route_write.lo: ../../include/net-snmp/library/container.h
+./mibII/route_write.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/route_write.lo: ../../include/net-snmp/version.h
 ./mibII/route_write.lo: ../../include/net-snmp/config_api.h
 ./mibII/route_write.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/route_write.lo: ../../include/net-snmp/library/default_store.h
@@ -6655,32 +6701,14 @@
 ./mibII/setSerialNo.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/setSerialNo.lo: ../../include/net-snmp/definitions.h
 ./mibII/setSerialNo.lo: ../../include/net-snmp/types.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/types.h
 ./mibII/setSerialNo.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/library/asn1.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/library/snmp.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/utilities.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/setSerialNo.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/library/system.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/library/tools.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/library/int64.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/library/callback.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/library/data_list.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/library/container.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/library/factory.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/library/container.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/version.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/pdu_api.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/setSerialNo.lo: ../../include/net-snmp/session_api.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/callback.h
 ./mibII/setSerialNo.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/setSerialNo.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/setSerialNo.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -6691,11 +6719,31 @@
 ./mibII/setSerialNo.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/setSerialNo.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/setSerialNo.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/pdu_api.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/mib_api.h
 ./mibII/setSerialNo.lo: ../../include/net-snmp/library/mib.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/mib_api.h
 ./mibII/setSerialNo.lo: ../../include/net-snmp/library/parse.h
-./mibII/setSerialNo.lo: ../../include/net-snmp/varbind_api.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/snmp.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/getopt.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/utilities.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/system.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/tools.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/int64.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/data_list.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/container.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/factory.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/container.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/setSerialNo.lo: ../../include/net-snmp/version.h
 ./mibII/setSerialNo.lo: ../../include/net-snmp/config_api.h
 ./mibII/setSerialNo.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/setSerialNo.lo: ../../include/net-snmp/library/default_store.h
@@ -6750,6 +6798,114 @@
 ./mibII/setSerialNo.lo: ../../include/net-snmp/agent/table_array.h
 ./mibII/setSerialNo.lo: ../../include/net-snmp/agent/mfd.h
 ./mibII/setSerialNo.lo: ./mibII/setSerialNo.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/net-snmp-config.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/system/linux.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/system/sysv.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/system/generic.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/machine/generic.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/net-snmp-includes.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/definitions.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/types.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/types.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmp_api.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/varbind_api.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmp_client.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/pdu_api.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/asn1.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/session_api.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/callback.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmp_transport.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmp_service.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/ucd_compat.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/mib.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/mib_api.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/parse.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmp.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/getopt.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/utilities.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/system.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/tools.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/int64.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/data_list.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/container.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/factory.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/container.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/version.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/config_api.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/read_config.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/default_store.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmp_enum.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/vacm.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/output_api.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmp_debug.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/snmpv3_api.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmpv3.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/transform_oids.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/keytools.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/scapi.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/lcd_time.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmp_secmod.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/snmpusm.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/mib_module_config.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/agent_module_config.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/snmp_agent.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/snmp_vars.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/agent_handler.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/var_struct.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/agent_registry.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/library/fd_event_manager.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/ds_agent.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/agent_read_config.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/agent_trap.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/all_helpers.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/instance.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/baby_steps.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/scalar.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/scalar_group.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/watcher.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/multiplexer.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/null.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/debug_handler.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/cache_handler.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/old_api.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/read_only.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/row_merge.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/serialize.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/mode_end_call.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/table.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/table_data.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/table_dataset.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/table_tdata.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/table_iterator.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/table_container.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/table_array.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/mfd.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/sysORTable.h
+./mibII/snmp_mib_5_5.lo: ../../include/net-snmp/agent/agent_callbacks.h
+./mibII/snmp_mib_5_5.lo: ./utilities/snmp_get_statistic.h
+./mibII/snmp_mib_5_5.lo: ./mibII/snmp_mib_5_5.h ./mibII/updates.h
 ./mibII/snmp_mib.lo: ../../include/net-snmp/net-snmp-config.h
 ./mibII/snmp_mib.lo: ../../include/net-snmp/system/linux.h
 ./mibII/snmp_mib.lo: ../../include/net-snmp/system/sysv.h
@@ -6758,32 +6914,14 @@
 ./mibII/snmp_mib.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/snmp_mib.lo: ../../include/net-snmp/definitions.h
 ./mibII/snmp_mib.lo: ../../include/net-snmp/types.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/types.h
 ./mibII/snmp_mib.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/library/asn1.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/library/snmp.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/utilities.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/snmp_mib.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/library/system.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/library/tools.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/library/int64.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/library/callback.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/library/data_list.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/library/container.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/library/factory.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/library/container.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/version.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/pdu_api.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/snmp_mib.lo: ../../include/net-snmp/session_api.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/callback.h
 ./mibII/snmp_mib.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/snmp_mib.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/snmp_mib.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -6794,11 +6932,31 @@
 ./mibII/snmp_mib.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/snmp_mib.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/snmp_mib.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/pdu_api.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/mib_api.h
 ./mibII/snmp_mib.lo: ../../include/net-snmp/library/mib.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/mib_api.h
 ./mibII/snmp_mib.lo: ../../include/net-snmp/library/parse.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/varbind_api.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/snmp.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/getopt.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/utilities.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/system.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/tools.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/int64.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/data_list.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/container.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/factory.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/container.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/version.h
 ./mibII/snmp_mib.lo: ../../include/net-snmp/config_api.h
 ./mibII/snmp_mib.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/snmp_mib.lo: ../../include/net-snmp/library/default_store.h
@@ -6851,8 +7009,10 @@
 ./mibII/snmp_mib.lo: ../../include/net-snmp/agent/table_iterator.h
 ./mibII/snmp_mib.lo: ../../include/net-snmp/agent/table_container.h
 ./mibII/snmp_mib.lo: ../../include/net-snmp/agent/table_array.h
-./mibII/snmp_mib.lo: ../../include/net-snmp/agent/mfd.h util_funcs.h struct.h
-./mibII/snmp_mib.lo: ./mibII/snmp_mib.h ./mibII/sysORTable.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/agent/mfd.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/agent/sysORTable.h
+./mibII/snmp_mib.lo: ../../include/net-snmp/agent/agent_callbacks.h
+./mibII/snmp_mib.lo: ./mibII/snmp_mib.h ./mibII/updates.h
 ./mibII/sysORTable.lo: ../../include/net-snmp/net-snmp-config.h
 ./mibII/sysORTable.lo: ../../include/net-snmp/system/linux.h
 ./mibII/sysORTable.lo: ../../include/net-snmp/system/sysv.h
@@ -6861,32 +7021,14 @@
 ./mibII/sysORTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/sysORTable.lo: ../../include/net-snmp/definitions.h
 ./mibII/sysORTable.lo: ../../include/net-snmp/types.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/types.h
 ./mibII/sysORTable.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/sysORTable.lo: ../../include/net-snmp/library/asn1.h
-./mibII/sysORTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/sysORTable.lo: ../../include/net-snmp/library/snmp.h
-./mibII/sysORTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/sysORTable.lo: ../../include/net-snmp/utilities.h
+./mibII/sysORTable.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/sysORTable.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/sysORTable.lo: ../../include/net-snmp/library/system.h
-./mibII/sysORTable.lo: ../../include/net-snmp/library/tools.h
-./mibII/sysORTable.lo: ../../include/net-snmp/library/int64.h
-./mibII/sysORTable.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/sysORTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/sysORTable.lo: ../../include/net-snmp/library/callback.h
-./mibII/sysORTable.lo: ../../include/net-snmp/library/data_list.h
-./mibII/sysORTable.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/sysORTable.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/sysORTable.lo: ../../include/net-snmp/library/container.h
-./mibII/sysORTable.lo: ../../include/net-snmp/library/factory.h
-./mibII/sysORTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/sysORTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/sysORTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/sysORTable.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/sysORTable.lo: ../../include/net-snmp/library/container.h
-./mibII/sysORTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/sysORTable.lo: ../../include/net-snmp/version.h
+./mibII/sysORTable.lo: ../../include/net-snmp/pdu_api.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/sysORTable.lo: ../../include/net-snmp/session_api.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/callback.h
 ./mibII/sysORTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/sysORTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/sysORTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -6897,11 +7039,31 @@
 ./mibII/sysORTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/sysORTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/sysORTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/sysORTable.lo: ../../include/net-snmp/pdu_api.h
-./mibII/sysORTable.lo: ../../include/net-snmp/mib_api.h
 ./mibII/sysORTable.lo: ../../include/net-snmp/library/mib.h
+./mibII/sysORTable.lo: ../../include/net-snmp/mib_api.h
 ./mibII/sysORTable.lo: ../../include/net-snmp/library/parse.h
-./mibII/sysORTable.lo: ../../include/net-snmp/varbind_api.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/snmp.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/getopt.h
+./mibII/sysORTable.lo: ../../include/net-snmp/utilities.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/system.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/tools.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/int64.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/data_list.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/container.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/factory.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/container.h
+./mibII/sysORTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/sysORTable.lo: ../../include/net-snmp/version.h
 ./mibII/sysORTable.lo: ../../include/net-snmp/config_api.h
 ./mibII/sysORTable.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/sysORTable.lo: ../../include/net-snmp/library/default_store.h
@@ -6955,9 +7117,10 @@
 ./mibII/sysORTable.lo: ../../include/net-snmp/agent/table_container.h
 ./mibII/sysORTable.lo: ../../include/net-snmp/agent/table_array.h
 ./mibII/sysORTable.lo: ../../include/net-snmp/agent/mfd.h
+./mibII/sysORTable.lo: ../../include/net-snmp/agent/agent_sysORTable.h
+./mibII/sysORTable.lo: ../../include/net-snmp/agent/sysORTable.h
 ./mibII/sysORTable.lo: ../../include/net-snmp/agent/agent_callbacks.h
-./mibII/sysORTable.lo: struct.h util_funcs.h ./mibII/sysORTable.h
-./mibII/sysORTable.lo: ../../agent/snmpd.h agentx/subagent.h agentx/client.h
+./mibII/sysORTable.lo: ./mibII/sysORTable.h
 ./mibII/system_mib.lo: ../../include/net-snmp/net-snmp-config.h
 ./mibII/system_mib.lo: ../../include/net-snmp/system/linux.h
 ./mibII/system_mib.lo: ../../include/net-snmp/system/sysv.h
@@ -6966,32 +7129,14 @@
 ./mibII/system_mib.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/system_mib.lo: ../../include/net-snmp/definitions.h
 ./mibII/system_mib.lo: ../../include/net-snmp/types.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/types.h
 ./mibII/system_mib.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/system_mib.lo: ../../include/net-snmp/library/asn1.h
-./mibII/system_mib.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/system_mib.lo: ../../include/net-snmp/library/snmp.h
-./mibII/system_mib.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/system_mib.lo: ../../include/net-snmp/utilities.h
+./mibII/system_mib.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/system_mib.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/system_mib.lo: ../../include/net-snmp/library/system.h
-./mibII/system_mib.lo: ../../include/net-snmp/library/tools.h
-./mibII/system_mib.lo: ../../include/net-snmp/library/int64.h
-./mibII/system_mib.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/system_mib.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/system_mib.lo: ../../include/net-snmp/library/callback.h
-./mibII/system_mib.lo: ../../include/net-snmp/library/data_list.h
-./mibII/system_mib.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/system_mib.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/system_mib.lo: ../../include/net-snmp/library/container.h
-./mibII/system_mib.lo: ../../include/net-snmp/library/factory.h
-./mibII/system_mib.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/system_mib.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/system_mib.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/system_mib.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/system_mib.lo: ../../include/net-snmp/library/container.h
-./mibII/system_mib.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/system_mib.lo: ../../include/net-snmp/version.h
+./mibII/system_mib.lo: ../../include/net-snmp/pdu_api.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/system_mib.lo: ../../include/net-snmp/session_api.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/callback.h
 ./mibII/system_mib.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/system_mib.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/system_mib.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -7002,11 +7147,31 @@
 ./mibII/system_mib.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/system_mib.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/system_mib.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/system_mib.lo: ../../include/net-snmp/pdu_api.h
-./mibII/system_mib.lo: ../../include/net-snmp/mib_api.h
 ./mibII/system_mib.lo: ../../include/net-snmp/library/mib.h
+./mibII/system_mib.lo: ../../include/net-snmp/mib_api.h
 ./mibII/system_mib.lo: ../../include/net-snmp/library/parse.h
-./mibII/system_mib.lo: ../../include/net-snmp/varbind_api.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/snmp.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/getopt.h
+./mibII/system_mib.lo: ../../include/net-snmp/utilities.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/system.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/tools.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/int64.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/data_list.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/container.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/factory.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/container.h
+./mibII/system_mib.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/system_mib.lo: ../../include/net-snmp/version.h
 ./mibII/system_mib.lo: ../../include/net-snmp/config_api.h
 ./mibII/system_mib.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/system_mib.lo: ../../include/net-snmp/library/default_store.h
@@ -7059,8 +7224,13 @@
 ./mibII/system_mib.lo: ../../include/net-snmp/agent/table_iterator.h
 ./mibII/system_mib.lo: ../../include/net-snmp/agent/table_container.h
 ./mibII/system_mib.lo: ../../include/net-snmp/agent/table_array.h
-./mibII/system_mib.lo: ../../include/net-snmp/agent/mfd.h util_funcs.h
-./mibII/system_mib.lo: struct.h ./mibII/system_mib.h ./mibII/sysORTable.h
+./mibII/system_mib.lo: ../../include/net-snmp/agent/mfd.h
+./mibII/system_mib.lo: ../../include/net-snmp/agent/sysORTable.h
+./mibII/system_mib.lo: ../../include/net-snmp/agent/agent_callbacks.h
+./mibII/system_mib.lo: util_funcs.h util_funcs/header_generic.h
+./mibII/system_mib.lo: util_funcs/header_simple_table.h struct.h
+./mibII/system_mib.lo: util_funcs/MIB_STATS_CACHE_TIMEOUT.h
+./mibII/system_mib.lo: ./mibII/system_mib.h ./mibII/updates.h
 ./mibII/tcp.lo: ../../include/net-snmp/net-snmp-config.h
 ./mibII/tcp.lo: ../../include/net-snmp/system/linux.h
 ./mibII/tcp.lo: ../../include/net-snmp/system/sysv.h
@@ -7071,32 +7241,14 @@
 ./mibII/tcp.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/tcp.lo: ../../include/net-snmp/definitions.h
 ./mibII/tcp.lo: ../../include/net-snmp/types.h
+./mibII/tcp.lo: ../../include/net-snmp/library/types.h
 ./mibII/tcp.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/tcp.lo: ../../include/net-snmp/library/asn1.h
-./mibII/tcp.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/tcp.lo: ../../include/net-snmp/library/snmp.h
-./mibII/tcp.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/tcp.lo: ../../include/net-snmp/utilities.h
+./mibII/tcp.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/tcp.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/tcp.lo: ../../include/net-snmp/library/system.h
-./mibII/tcp.lo: ../../include/net-snmp/library/tools.h
-./mibII/tcp.lo: ../../include/net-snmp/library/int64.h
-./mibII/tcp.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/tcp.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/tcp.lo: ../../include/net-snmp/library/callback.h
-./mibII/tcp.lo: ../../include/net-snmp/library/data_list.h
-./mibII/tcp.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/tcp.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/tcp.lo: ../../include/net-snmp/library/container.h
-./mibII/tcp.lo: ../../include/net-snmp/library/factory.h
-./mibII/tcp.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/tcp.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/tcp.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/tcp.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/tcp.lo: ../../include/net-snmp/library/container.h
-./mibII/tcp.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/tcp.lo: ../../include/net-snmp/version.h
+./mibII/tcp.lo: ../../include/net-snmp/pdu_api.h
+./mibII/tcp.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/tcp.lo: ../../include/net-snmp/session_api.h
+./mibII/tcp.lo: ../../include/net-snmp/library/callback.h
 ./mibII/tcp.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/tcp.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/tcp.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -7107,11 +7259,31 @@
 ./mibII/tcp.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/tcp.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/tcp.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/tcp.lo: ../../include/net-snmp/pdu_api.h
-./mibII/tcp.lo: ../../include/net-snmp/mib_api.h
 ./mibII/tcp.lo: ../../include/net-snmp/library/mib.h
+./mibII/tcp.lo: ../../include/net-snmp/mib_api.h
 ./mibII/tcp.lo: ../../include/net-snmp/library/parse.h
-./mibII/tcp.lo: ../../include/net-snmp/varbind_api.h
+./mibII/tcp.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/tcp.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/tcp.lo: ../../include/net-snmp/library/snmp.h
+./mibII/tcp.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/tcp.lo: ../../include/net-snmp/library/getopt.h
+./mibII/tcp.lo: ../../include/net-snmp/utilities.h
+./mibII/tcp.lo: ../../include/net-snmp/library/system.h
+./mibII/tcp.lo: ../../include/net-snmp/library/tools.h
+./mibII/tcp.lo: ../../include/net-snmp/library/int64.h
+./mibII/tcp.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/tcp.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/tcp.lo: ../../include/net-snmp/library/data_list.h
+./mibII/tcp.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/tcp.lo: ../../include/net-snmp/library/container.h
+./mibII/tcp.lo: ../../include/net-snmp/library/factory.h
+./mibII/tcp.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/tcp.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/tcp.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/tcp.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/tcp.lo: ../../include/net-snmp/library/container.h
+./mibII/tcp.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/tcp.lo: ../../include/net-snmp/version.h
 ./mibII/tcp.lo: ../../include/net-snmp/config_api.h
 ./mibII/tcp.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/tcp.lo: ../../include/net-snmp/library/default_store.h
@@ -7165,9 +7337,11 @@
 ./mibII/tcp.lo: ../../include/net-snmp/agent/table_container.h
 ./mibII/tcp.lo: ../../include/net-snmp/agent/table_array.h
 ./mibII/tcp.lo: ../../include/net-snmp/agent/mfd.h
-./mibII/tcp.lo: ../../include/net-snmp/agent/auto_nlist.h util_funcs.h
-./mibII/tcp.lo: struct.h ./mibII/tcp.h ./mibII/tcpTable.h
-./mibII/tcp.lo: ./mibII/sysORTable.h
+./mibII/tcp.lo: ../../include/net-snmp/agent/auto_nlist.h
+./mibII/tcp.lo: ../../include/net-snmp/agent/sysORTable.h
+./mibII/tcp.lo: ../../include/net-snmp/agent/agent_callbacks.h
+./mibII/tcp.lo: util_funcs/MIB_STATS_CACHE_TIMEOUT.h ./mibII/tcp.h
+./mibII/tcp.lo: ./mibII/tcpTable.h
 ./mibII/tcpTable.lo: ../../include/net-snmp/net-snmp-config.h
 ./mibII/tcpTable.lo: ../../include/net-snmp/system/linux.h
 ./mibII/tcpTable.lo: ../../include/net-snmp/system/sysv.h
@@ -7178,32 +7352,14 @@
 ./mibII/tcpTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/tcpTable.lo: ../../include/net-snmp/definitions.h
 ./mibII/tcpTable.lo: ../../include/net-snmp/types.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/types.h
 ./mibII/tcpTable.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/tcpTable.lo: ../../include/net-snmp/library/asn1.h
-./mibII/tcpTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/tcpTable.lo: ../../include/net-snmp/library/snmp.h
-./mibII/tcpTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/tcpTable.lo: ../../include/net-snmp/utilities.h
+./mibII/tcpTable.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/tcpTable.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/tcpTable.lo: ../../include/net-snmp/library/system.h
-./mibII/tcpTable.lo: ../../include/net-snmp/library/tools.h
-./mibII/tcpTable.lo: ../../include/net-snmp/library/int64.h
-./mibII/tcpTable.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/tcpTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/tcpTable.lo: ../../include/net-snmp/library/callback.h
-./mibII/tcpTable.lo: ../../include/net-snmp/library/data_list.h
-./mibII/tcpTable.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/tcpTable.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/tcpTable.lo: ../../include/net-snmp/library/container.h
-./mibII/tcpTable.lo: ../../include/net-snmp/library/factory.h
-./mibII/tcpTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/tcpTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/tcpTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/tcpTable.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/tcpTable.lo: ../../include/net-snmp/library/container.h
-./mibII/tcpTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/tcpTable.lo: ../../include/net-snmp/version.h
+./mibII/tcpTable.lo: ../../include/net-snmp/pdu_api.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/tcpTable.lo: ../../include/net-snmp/session_api.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/callback.h
 ./mibII/tcpTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/tcpTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/tcpTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -7214,11 +7370,31 @@
 ./mibII/tcpTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/tcpTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/tcpTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/tcpTable.lo: ../../include/net-snmp/pdu_api.h
-./mibII/tcpTable.lo: ../../include/net-snmp/mib_api.h
 ./mibII/tcpTable.lo: ../../include/net-snmp/library/mib.h
+./mibII/tcpTable.lo: ../../include/net-snmp/mib_api.h
 ./mibII/tcpTable.lo: ../../include/net-snmp/library/parse.h
-./mibII/tcpTable.lo: ../../include/net-snmp/varbind_api.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/snmp.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/getopt.h
+./mibII/tcpTable.lo: ../../include/net-snmp/utilities.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/system.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/tools.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/int64.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/data_list.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/container.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/factory.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/container.h
+./mibII/tcpTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/tcpTable.lo: ../../include/net-snmp/version.h
 ./mibII/tcpTable.lo: ../../include/net-snmp/config_api.h
 ./mibII/tcpTable.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/tcpTable.lo: ../../include/net-snmp/library/default_store.h
@@ -7273,7 +7449,7 @@
 ./mibII/tcpTable.lo: ../../include/net-snmp/agent/table_array.h
 ./mibII/tcpTable.lo: ../../include/net-snmp/agent/mfd.h
 ./mibII/tcpTable.lo: ../../include/net-snmp/agent/auto_nlist.h ./mibII/tcp.h
-./mibII/tcpTable.lo: ./mibII/tcpTable.h ./mibII/sysORTable.h
+./mibII/tcpTable.lo: ./mibII/tcpTable.h
 ./mibII/udp.lo: ../../include/net-snmp/net-snmp-config.h
 ./mibII/udp.lo: ../../include/net-snmp/system/linux.h
 ./mibII/udp.lo: ../../include/net-snmp/system/sysv.h
@@ -7284,32 +7460,14 @@
 ./mibII/udp.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/udp.lo: ../../include/net-snmp/definitions.h
 ./mibII/udp.lo: ../../include/net-snmp/types.h
+./mibII/udp.lo: ../../include/net-snmp/library/types.h
 ./mibII/udp.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/udp.lo: ../../include/net-snmp/library/asn1.h
-./mibII/udp.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/udp.lo: ../../include/net-snmp/library/snmp.h
-./mibII/udp.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/udp.lo: ../../include/net-snmp/utilities.h
+./mibII/udp.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/udp.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/udp.lo: ../../include/net-snmp/library/system.h
-./mibII/udp.lo: ../../include/net-snmp/library/tools.h
-./mibII/udp.lo: ../../include/net-snmp/library/int64.h
-./mibII/udp.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/udp.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/udp.lo: ../../include/net-snmp/library/callback.h
-./mibII/udp.lo: ../../include/net-snmp/library/data_list.h
-./mibII/udp.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/udp.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/udp.lo: ../../include/net-snmp/library/container.h
-./mibII/udp.lo: ../../include/net-snmp/library/factory.h
-./mibII/udp.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/udp.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/udp.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/udp.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/udp.lo: ../../include/net-snmp/library/container.h
-./mibII/udp.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/udp.lo: ../../include/net-snmp/version.h
+./mibII/udp.lo: ../../include/net-snmp/pdu_api.h
+./mibII/udp.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/udp.lo: ../../include/net-snmp/session_api.h
+./mibII/udp.lo: ../../include/net-snmp/library/callback.h
 ./mibII/udp.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/udp.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/udp.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -7320,11 +7478,31 @@
 ./mibII/udp.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/udp.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/udp.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/udp.lo: ../../include/net-snmp/pdu_api.h
-./mibII/udp.lo: ../../include/net-snmp/mib_api.h
 ./mibII/udp.lo: ../../include/net-snmp/library/mib.h
+./mibII/udp.lo: ../../include/net-snmp/mib_api.h
 ./mibII/udp.lo: ../../include/net-snmp/library/parse.h
-./mibII/udp.lo: ../../include/net-snmp/varbind_api.h
+./mibII/udp.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/udp.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/udp.lo: ../../include/net-snmp/library/snmp.h
+./mibII/udp.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/udp.lo: ../../include/net-snmp/library/getopt.h
+./mibII/udp.lo: ../../include/net-snmp/utilities.h
+./mibII/udp.lo: ../../include/net-snmp/library/system.h
+./mibII/udp.lo: ../../include/net-snmp/library/tools.h
+./mibII/udp.lo: ../../include/net-snmp/library/int64.h
+./mibII/udp.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/udp.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/udp.lo: ../../include/net-snmp/library/data_list.h
+./mibII/udp.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/udp.lo: ../../include/net-snmp/library/container.h
+./mibII/udp.lo: ../../include/net-snmp/library/factory.h
+./mibII/udp.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/udp.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/udp.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/udp.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/udp.lo: ../../include/net-snmp/library/container.h
+./mibII/udp.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/udp.lo: ../../include/net-snmp/version.h
 ./mibII/udp.lo: ../../include/net-snmp/config_api.h
 ./mibII/udp.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/udp.lo: ../../include/net-snmp/library/default_store.h
@@ -7378,9 +7556,11 @@
 ./mibII/udp.lo: ../../include/net-snmp/agent/table_container.h
 ./mibII/udp.lo: ../../include/net-snmp/agent/table_array.h
 ./mibII/udp.lo: ../../include/net-snmp/agent/mfd.h
-./mibII/udp.lo: ../../include/net-snmp/agent/auto_nlist.h util_funcs.h
-./mibII/udp.lo: struct.h ./mibII/udp.h ./mibII/udpTable.h
-./mibII/udp.lo: ./mibII/sysORTable.h
+./mibII/udp.lo: ../../include/net-snmp/agent/auto_nlist.h
+./mibII/udp.lo: ../../include/net-snmp/agent/sysORTable.h
+./mibII/udp.lo: ../../include/net-snmp/agent/agent_callbacks.h
+./mibII/udp.lo: util_funcs/MIB_STATS_CACHE_TIMEOUT.h ./mibII/udp.h
+./mibII/udp.lo: ./mibII/udpTable.h
 ./mibII/udpTable.lo: ../../include/net-snmp/net-snmp-config.h
 ./mibII/udpTable.lo: ../../include/net-snmp/system/linux.h
 ./mibII/udpTable.lo: ../../include/net-snmp/system/sysv.h
@@ -7391,32 +7571,14 @@
 ./mibII/udpTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/udpTable.lo: ../../include/net-snmp/definitions.h
 ./mibII/udpTable.lo: ../../include/net-snmp/types.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/types.h
 ./mibII/udpTable.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/udpTable.lo: ../../include/net-snmp/library/asn1.h
-./mibII/udpTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/udpTable.lo: ../../include/net-snmp/library/snmp.h
-./mibII/udpTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/udpTable.lo: ../../include/net-snmp/utilities.h
+./mibII/udpTable.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/udpTable.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/udpTable.lo: ../../include/net-snmp/library/system.h
-./mibII/udpTable.lo: ../../include/net-snmp/library/tools.h
-./mibII/udpTable.lo: ../../include/net-snmp/library/int64.h
-./mibII/udpTable.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/udpTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/udpTable.lo: ../../include/net-snmp/library/callback.h
-./mibII/udpTable.lo: ../../include/net-snmp/library/data_list.h
-./mibII/udpTable.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/udpTable.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/udpTable.lo: ../../include/net-snmp/library/container.h
-./mibII/udpTable.lo: ../../include/net-snmp/library/factory.h
-./mibII/udpTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/udpTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/udpTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/udpTable.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/udpTable.lo: ../../include/net-snmp/library/container.h
-./mibII/udpTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/udpTable.lo: ../../include/net-snmp/version.h
+./mibII/udpTable.lo: ../../include/net-snmp/pdu_api.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/udpTable.lo: ../../include/net-snmp/session_api.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/callback.h
 ./mibII/udpTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/udpTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/udpTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -7427,11 +7589,31 @@
 ./mibII/udpTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/udpTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/udpTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/udpTable.lo: ../../include/net-snmp/pdu_api.h
-./mibII/udpTable.lo: ../../include/net-snmp/mib_api.h
 ./mibII/udpTable.lo: ../../include/net-snmp/library/mib.h
+./mibII/udpTable.lo: ../../include/net-snmp/mib_api.h
 ./mibII/udpTable.lo: ../../include/net-snmp/library/parse.h
-./mibII/udpTable.lo: ../../include/net-snmp/varbind_api.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/snmp.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/getopt.h
+./mibII/udpTable.lo: ../../include/net-snmp/utilities.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/system.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/tools.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/int64.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/data_list.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/container.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/factory.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/container.h
+./mibII/udpTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/udpTable.lo: ../../include/net-snmp/version.h
 ./mibII/udpTable.lo: ../../include/net-snmp/config_api.h
 ./mibII/udpTable.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/udpTable.lo: ../../include/net-snmp/library/default_store.h
@@ -7486,7 +7668,111 @@
 ./mibII/udpTable.lo: ../../include/net-snmp/agent/table_array.h
 ./mibII/udpTable.lo: ../../include/net-snmp/agent/mfd.h
 ./mibII/udpTable.lo: ../../include/net-snmp/agent/auto_nlist.h ./mibII/udp.h
-./mibII/udpTable.lo: ./mibII/udpTable.h ./mibII/sysORTable.h
+./mibII/udpTable.lo: ./mibII/udpTable.h
+./mibII/updates.lo: ../../include/net-snmp/net-snmp-config.h
+./mibII/updates.lo: ../../include/net-snmp/system/linux.h
+./mibII/updates.lo: ../../include/net-snmp/system/sysv.h
+./mibII/updates.lo: ../../include/net-snmp/system/generic.h
+./mibII/updates.lo: ../../include/net-snmp/machine/generic.h
+./mibII/updates.lo: ../../include/net-snmp/net-snmp-includes.h
+./mibII/updates.lo: ../../include/net-snmp/definitions.h
+./mibII/updates.lo: ../../include/net-snmp/types.h
+./mibII/updates.lo: ../../include/net-snmp/library/types.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmp_api.h
+./mibII/updates.lo: ../../include/net-snmp/varbind_api.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmp_client.h
+./mibII/updates.lo: ../../include/net-snmp/pdu_api.h
+./mibII/updates.lo: ../../include/net-snmp/library/asn1.h
+./mibII/updates.lo: ../../include/net-snmp/session_api.h
+./mibII/updates.lo: ../../include/net-snmp/library/callback.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmp_transport.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmp_service.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./mibII/updates.lo: ../../include/net-snmp/library/ucd_compat.h
+./mibII/updates.lo: ../../include/net-snmp/library/mib.h
+./mibII/updates.lo: ../../include/net-snmp/mib_api.h
+./mibII/updates.lo: ../../include/net-snmp/library/parse.h
+./mibII/updates.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmp.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/updates.lo: ../../include/net-snmp/library/getopt.h
+./mibII/updates.lo: ../../include/net-snmp/utilities.h
+./mibII/updates.lo: ../../include/net-snmp/library/system.h
+./mibII/updates.lo: ../../include/net-snmp/library/tools.h
+./mibII/updates.lo: ../../include/net-snmp/library/int64.h
+./mibII/updates.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/updates.lo: ../../include/net-snmp/library/data_list.h
+./mibII/updates.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/updates.lo: ../../include/net-snmp/library/container.h
+./mibII/updates.lo: ../../include/net-snmp/library/factory.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/updates.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/updates.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/updates.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/updates.lo: ../../include/net-snmp/library/container.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/updates.lo: ../../include/net-snmp/version.h
+./mibII/updates.lo: ../../include/net-snmp/config_api.h
+./mibII/updates.lo: ../../include/net-snmp/library/read_config.h
+./mibII/updates.lo: ../../include/net-snmp/library/default_store.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmp_enum.h
+./mibII/updates.lo: ../../include/net-snmp/library/vacm.h
+./mibII/updates.lo: ../../include/net-snmp/output_api.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmp_debug.h
+./mibII/updates.lo: ../../include/net-snmp/snmpv3_api.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmpv3.h
+./mibII/updates.lo: ../../include/net-snmp/library/transform_oids.h
+./mibII/updates.lo: ../../include/net-snmp/library/keytools.h
+./mibII/updates.lo: ../../include/net-snmp/library/scapi.h
+./mibII/updates.lo: ../../include/net-snmp/library/lcd_time.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmp_secmod.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./mibII/updates.lo: ../../include/net-snmp/library/snmpusm.h
+./mibII/updates.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./mibII/updates.lo: ../../include/net-snmp/agent/mib_module_config.h
+./mibII/updates.lo: ../../include/net-snmp/agent/agent_module_config.h
+./mibII/updates.lo: ../../include/net-snmp/agent/snmp_agent.h
+./mibII/updates.lo: ../../include/net-snmp/agent/snmp_vars.h
+./mibII/updates.lo: ../../include/net-snmp/agent/agent_handler.h
+./mibII/updates.lo: ../../include/net-snmp/agent/var_struct.h
+./mibII/updates.lo: ../../include/net-snmp/agent/agent_registry.h
+./mibII/updates.lo: ../../include/net-snmp/library/fd_event_manager.h
+./mibII/updates.lo: ../../include/net-snmp/agent/ds_agent.h
+./mibII/updates.lo: ../../include/net-snmp/agent/agent_read_config.h
+./mibII/updates.lo: ../../include/net-snmp/agent/agent_trap.h
+./mibII/updates.lo: ../../include/net-snmp/agent/all_helpers.h
+./mibII/updates.lo: ../../include/net-snmp/agent/instance.h
+./mibII/updates.lo: ../../include/net-snmp/agent/baby_steps.h
+./mibII/updates.lo: ../../include/net-snmp/agent/scalar.h
+./mibII/updates.lo: ../../include/net-snmp/agent/scalar_group.h
+./mibII/updates.lo: ../../include/net-snmp/agent/watcher.h
+./mibII/updates.lo: ../../include/net-snmp/agent/multiplexer.h
+./mibII/updates.lo: ../../include/net-snmp/agent/null.h
+./mibII/updates.lo: ../../include/net-snmp/agent/debug_handler.h
+./mibII/updates.lo: ../../include/net-snmp/agent/cache_handler.h
+./mibII/updates.lo: ../../include/net-snmp/agent/old_api.h
+./mibII/updates.lo: ../../include/net-snmp/agent/read_only.h
+./mibII/updates.lo: ../../include/net-snmp/agent/row_merge.h
+./mibII/updates.lo: ../../include/net-snmp/agent/serialize.h
+./mibII/updates.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./mibII/updates.lo: ../../include/net-snmp/agent/mode_end_call.h
+./mibII/updates.lo: ../../include/net-snmp/agent/table.h
+./mibII/updates.lo: ../../include/net-snmp/agent/table_data.h
+./mibII/updates.lo: ../../include/net-snmp/agent/table_dataset.h
+./mibII/updates.lo: ../../include/net-snmp/agent/table_tdata.h
+./mibII/updates.lo: ../../include/net-snmp/agent/table_iterator.h
+./mibII/updates.lo: ../../include/net-snmp/agent/table_container.h
+./mibII/updates.lo: ../../include/net-snmp/agent/table_array.h
+./mibII/updates.lo: ../../include/net-snmp/agent/mfd.h
 ./mibII/vacm_conf.lo: ../../include/net-snmp/net-snmp-config.h
 ./mibII/vacm_conf.lo: ../../include/net-snmp/system/linux.h
 ./mibII/vacm_conf.lo: ../../include/net-snmp/system/sysv.h
@@ -7495,32 +7781,14 @@
 ./mibII/vacm_conf.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/vacm_conf.lo: ../../include/net-snmp/definitions.h
 ./mibII/vacm_conf.lo: ../../include/net-snmp/types.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/types.h
 ./mibII/vacm_conf.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/library/asn1.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/library/snmp.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/utilities.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/vacm_conf.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/library/system.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/library/tools.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/library/int64.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/library/callback.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/library/data_list.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/library/container.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/library/factory.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/library/container.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/version.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/pdu_api.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/vacm_conf.lo: ../../include/net-snmp/session_api.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/callback.h
 ./mibII/vacm_conf.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/vacm_conf.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/vacm_conf.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -7531,11 +7799,31 @@
 ./mibII/vacm_conf.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/vacm_conf.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/vacm_conf.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/pdu_api.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/mib_api.h
 ./mibII/vacm_conf.lo: ../../include/net-snmp/library/mib.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/mib_api.h
 ./mibII/vacm_conf.lo: ../../include/net-snmp/library/parse.h
-./mibII/vacm_conf.lo: ../../include/net-snmp/varbind_api.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/snmp.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/getopt.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/utilities.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/system.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/tools.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/int64.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/data_list.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/container.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/factory.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/container.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/vacm_conf.lo: ../../include/net-snmp/version.h
 ./mibII/vacm_conf.lo: ../../include/net-snmp/config_api.h
 ./mibII/vacm_conf.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/vacm_conf.lo: ../../include/net-snmp/library/default_store.h
@@ -7590,8 +7878,7 @@
 ./mibII/vacm_conf.lo: ../../include/net-snmp/agent/table_array.h
 ./mibII/vacm_conf.lo: ../../include/net-snmp/agent/mfd.h
 ./mibII/vacm_conf.lo: ../../include/net-snmp/agent/agent_callbacks.h
-./mibII/vacm_conf.lo: ./mibII/vacm_conf.h util_funcs.h struct.h
-./mibII/vacm_conf.lo: ./mibII/sysORTable.h ../../agent/snmpd.h
+./mibII/vacm_conf.lo: ./mibII/vacm_conf.h ../../agent/snmpd.h
 ./mibII/vacm_context.lo: ../../include/net-snmp/net-snmp-config.h
 ./mibII/vacm_context.lo: ../../include/net-snmp/system/linux.h
 ./mibII/vacm_context.lo: ../../include/net-snmp/system/sysv.h
@@ -7600,32 +7887,14 @@
 ./mibII/vacm_context.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/vacm_context.lo: ../../include/net-snmp/definitions.h
 ./mibII/vacm_context.lo: ../../include/net-snmp/types.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/types.h
 ./mibII/vacm_context.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/vacm_context.lo: ../../include/net-snmp/library/asn1.h
-./mibII/vacm_context.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/vacm_context.lo: ../../include/net-snmp/library/snmp.h
-./mibII/vacm_context.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/vacm_context.lo: ../../include/net-snmp/utilities.h
+./mibII/vacm_context.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/vacm_context.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/vacm_context.lo: ../../include/net-snmp/library/system.h
-./mibII/vacm_context.lo: ../../include/net-snmp/library/tools.h
-./mibII/vacm_context.lo: ../../include/net-snmp/library/int64.h
-./mibII/vacm_context.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/vacm_context.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/vacm_context.lo: ../../include/net-snmp/library/callback.h
-./mibII/vacm_context.lo: ../../include/net-snmp/library/data_list.h
-./mibII/vacm_context.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/vacm_context.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/vacm_context.lo: ../../include/net-snmp/library/container.h
-./mibII/vacm_context.lo: ../../include/net-snmp/library/factory.h
-./mibII/vacm_context.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/vacm_context.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/vacm_context.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/vacm_context.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/vacm_context.lo: ../../include/net-snmp/library/container.h
-./mibII/vacm_context.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/vacm_context.lo: ../../include/net-snmp/version.h
+./mibII/vacm_context.lo: ../../include/net-snmp/pdu_api.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/vacm_context.lo: ../../include/net-snmp/session_api.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/callback.h
 ./mibII/vacm_context.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/vacm_context.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/vacm_context.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -7636,11 +7905,31 @@
 ./mibII/vacm_context.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/vacm_context.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/vacm_context.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/vacm_context.lo: ../../include/net-snmp/pdu_api.h
-./mibII/vacm_context.lo: ../../include/net-snmp/mib_api.h
 ./mibII/vacm_context.lo: ../../include/net-snmp/library/mib.h
+./mibII/vacm_context.lo: ../../include/net-snmp/mib_api.h
 ./mibII/vacm_context.lo: ../../include/net-snmp/library/parse.h
-./mibII/vacm_context.lo: ../../include/net-snmp/varbind_api.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/snmp.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/getopt.h
+./mibII/vacm_context.lo: ../../include/net-snmp/utilities.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/system.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/tools.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/int64.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/data_list.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/container.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/factory.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/container.h
+./mibII/vacm_context.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/vacm_context.lo: ../../include/net-snmp/version.h
 ./mibII/vacm_context.lo: ../../include/net-snmp/config_api.h
 ./mibII/vacm_context.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/vacm_context.lo: ../../include/net-snmp/library/default_store.h
@@ -7703,32 +7992,14 @@
 ./mibII/vacm_vars.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/vacm_vars.lo: ../../include/net-snmp/definitions.h
 ./mibII/vacm_vars.lo: ../../include/net-snmp/types.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/types.h
 ./mibII/vacm_vars.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/library/asn1.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/library/snmp.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/utilities.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/vacm_vars.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/library/system.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/library/tools.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/library/int64.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/library/callback.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/library/data_list.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/library/container.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/library/factory.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/library/container.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/version.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/pdu_api.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/vacm_vars.lo: ../../include/net-snmp/session_api.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/callback.h
 ./mibII/vacm_vars.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/vacm_vars.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/vacm_vars.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -7739,11 +8010,31 @@
 ./mibII/vacm_vars.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/vacm_vars.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/vacm_vars.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/pdu_api.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/mib_api.h
 ./mibII/vacm_vars.lo: ../../include/net-snmp/library/mib.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/mib_api.h
 ./mibII/vacm_vars.lo: ../../include/net-snmp/library/parse.h
-./mibII/vacm_vars.lo: ../../include/net-snmp/varbind_api.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/snmp.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/getopt.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/utilities.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/system.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/tools.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/int64.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/data_list.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/container.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/factory.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/container.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/version.h
 ./mibII/vacm_vars.lo: ../../include/net-snmp/config_api.h
 ./mibII/vacm_vars.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/vacm_vars.lo: ../../include/net-snmp/library/default_store.h
@@ -7798,8 +8089,8 @@
 ./mibII/vacm_vars.lo: ../../include/net-snmp/agent/table_array.h
 ./mibII/vacm_vars.lo: ../../include/net-snmp/agent/mfd.h
 ./mibII/vacm_vars.lo: ../../include/net-snmp/agent/agent_callbacks.h
-./mibII/vacm_vars.lo: ./mibII/vacm_vars.h util_funcs.h struct.h
-./mibII/vacm_vars.lo: ./mibII/sysORTable.h
+./mibII/vacm_vars.lo: ../../include/net-snmp/agent/sysORTable.h
+./mibII/vacm_vars.lo: ./mibII/vacm_vars.h util_funcs/header_generic.h
 ./mibII/var_route.lo: ../../include/net-snmp/net-snmp-config.h
 ./mibII/var_route.lo: ../../include/net-snmp/system/linux.h
 ./mibII/var_route.lo: ../../include/net-snmp/system/sysv.h
@@ -7809,32 +8100,14 @@
 ./mibII/var_route.lo: ../../include/net-snmp/net-snmp-includes.h
 ./mibII/var_route.lo: ../../include/net-snmp/definitions.h
 ./mibII/var_route.lo: ../../include/net-snmp/types.h
+./mibII/var_route.lo: ../../include/net-snmp/library/types.h
 ./mibII/var_route.lo: ../../include/net-snmp/library/snmp_api.h
-./mibII/var_route.lo: ../../include/net-snmp/library/asn1.h
-./mibII/var_route.lo: ../../include/net-snmp/library/snmp_impl.h
-./mibII/var_route.lo: ../../include/net-snmp/library/snmp.h
-./mibII/var_route.lo: ../../include/net-snmp/library/snmp-tc.h
-./mibII/var_route.lo: ../../include/net-snmp/utilities.h
+./mibII/var_route.lo: ../../include/net-snmp/varbind_api.h
 ./mibII/var_route.lo: ../../include/net-snmp/library/snmp_client.h
-./mibII/var_route.lo: ../../include/net-snmp/library/system.h
-./mibII/var_route.lo: ../../include/net-snmp/library/tools.h
-./mibII/var_route.lo: ../../include/net-snmp/library/int64.h
-./mibII/var_route.lo: ../../include/net-snmp/library/mt_support.h
-./mibII/var_route.lo: ../../include/net-snmp/library/snmp_alarm.h
-./mibII/var_route.lo: ../../include/net-snmp/library/callback.h
-./mibII/var_route.lo: ../../include/net-snmp/library/data_list.h
-./mibII/var_route.lo: ../../include/net-snmp/library/oid_stash.h
-./mibII/var_route.lo: ../../include/net-snmp/library/check_varbind.h
-./mibII/var_route.lo: ../../include/net-snmp/library/container.h
-./mibII/var_route.lo: ../../include/net-snmp/library/factory.h
-./mibII/var_route.lo: ../../include/net-snmp/library/snmp_logging.h
-./mibII/var_route.lo: ../../include/net-snmp/library/container_binary_array.h
-./mibII/var_route.lo: ../../include/net-snmp/library/container_list_ssll.h
-./mibII/var_route.lo: ../../include/net-snmp/library/container_iterator.h
-./mibII/var_route.lo: ../../include/net-snmp/library/container.h
-./mibII/var_route.lo: ../../include/net-snmp/library/snmp_assert.h
-./mibII/var_route.lo: ../../include/net-snmp/version.h
+./mibII/var_route.lo: ../../include/net-snmp/pdu_api.h
+./mibII/var_route.lo: ../../include/net-snmp/library/asn1.h
 ./mibII/var_route.lo: ../../include/net-snmp/session_api.h
+./mibII/var_route.lo: ../../include/net-snmp/library/callback.h
 ./mibII/var_route.lo: ../../include/net-snmp/library/snmp_transport.h
 ./mibII/var_route.lo: ../../include/net-snmp/library/snmp_service.h
 ./mibII/var_route.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -7845,11 +8118,31 @@
 ./mibII/var_route.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./mibII/var_route.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./mibII/var_route.lo: ../../include/net-snmp/library/ucd_compat.h
-./mibII/var_route.lo: ../../include/net-snmp/pdu_api.h
-./mibII/var_route.lo: ../../include/net-snmp/mib_api.h
 ./mibII/var_route.lo: ../../include/net-snmp/library/mib.h
+./mibII/var_route.lo: ../../include/net-snmp/mib_api.h
 ./mibII/var_route.lo: ../../include/net-snmp/library/parse.h
-./mibII/var_route.lo: ../../include/net-snmp/varbind_api.h
+./mibII/var_route.lo: ../../include/net-snmp/library/oid_stash.h
+./mibII/var_route.lo: ../../include/net-snmp/library/snmp_impl.h
+./mibII/var_route.lo: ../../include/net-snmp/library/snmp.h
+./mibII/var_route.lo: ../../include/net-snmp/library/snmp-tc.h
+./mibII/var_route.lo: ../../include/net-snmp/library/getopt.h
+./mibII/var_route.lo: ../../include/net-snmp/utilities.h
+./mibII/var_route.lo: ../../include/net-snmp/library/system.h
+./mibII/var_route.lo: ../../include/net-snmp/library/tools.h
+./mibII/var_route.lo: ../../include/net-snmp/library/int64.h
+./mibII/var_route.lo: ../../include/net-snmp/library/mt_support.h
+./mibII/var_route.lo: ../../include/net-snmp/library/snmp_alarm.h
+./mibII/var_route.lo: ../../include/net-snmp/library/data_list.h
+./mibII/var_route.lo: ../../include/net-snmp/library/check_varbind.h
+./mibII/var_route.lo: ../../include/net-snmp/library/container.h
+./mibII/var_route.lo: ../../include/net-snmp/library/factory.h
+./mibII/var_route.lo: ../../include/net-snmp/library/snmp_logging.h
+./mibII/var_route.lo: ../../include/net-snmp/library/container_binary_array.h
+./mibII/var_route.lo: ../../include/net-snmp/library/container_list_ssll.h
+./mibII/var_route.lo: ../../include/net-snmp/library/container_iterator.h
+./mibII/var_route.lo: ../../include/net-snmp/library/container.h
+./mibII/var_route.lo: ../../include/net-snmp/library/snmp_assert.h
+./mibII/var_route.lo: ../../include/net-snmp/version.h
 ./mibII/var_route.lo: ../../include/net-snmp/config_api.h
 ./mibII/var_route.lo: ../../include/net-snmp/library/read_config.h
 ./mibII/var_route.lo: ../../include/net-snmp/library/default_store.h
@@ -7907,7 +8200,7 @@
 ./mibII/var_route.lo: ../../include/net-snmp/data_access/interface.h
 ./mibII/var_route.lo: ./mibII/ip.h ./mibII/var_route.h ./mibII/route_write.h
 ./mibII/var_route.lo: ./mibII/at.h ../../agent/kernel.h ./mibII/interfaces.h
-./mibII/var_route.lo: struct.h util_funcs.h
+./mibII/var_route.lo: struct.h
 ./misc/ipfwacc.lo: ../../include/net-snmp/net-snmp-config.h
 ./misc/ipfwacc.lo: ../../include/net-snmp/system/linux.h
 ./misc/ipfwacc.lo: ../../include/net-snmp/system/sysv.h
@@ -7916,32 +8209,14 @@
 ./misc/ipfwacc.lo: ../../include/net-snmp/net-snmp-includes.h
 ./misc/ipfwacc.lo: ../../include/net-snmp/definitions.h
 ./misc/ipfwacc.lo: ../../include/net-snmp/types.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/types.h
 ./misc/ipfwacc.lo: ../../include/net-snmp/library/snmp_api.h
-./misc/ipfwacc.lo: ../../include/net-snmp/library/asn1.h
-./misc/ipfwacc.lo: ../../include/net-snmp/library/snmp_impl.h
-./misc/ipfwacc.lo: ../../include/net-snmp/library/snmp.h
-./misc/ipfwacc.lo: ../../include/net-snmp/library/snmp-tc.h
-./misc/ipfwacc.lo: ../../include/net-snmp/utilities.h
+./misc/ipfwacc.lo: ../../include/net-snmp/varbind_api.h
 ./misc/ipfwacc.lo: ../../include/net-snmp/library/snmp_client.h
-./misc/ipfwacc.lo: ../../include/net-snmp/library/system.h
-./misc/ipfwacc.lo: ../../include/net-snmp/library/tools.h
-./misc/ipfwacc.lo: ../../include/net-snmp/library/int64.h
-./misc/ipfwacc.lo: ../../include/net-snmp/library/mt_support.h
-./misc/ipfwacc.lo: ../../include/net-snmp/library/snmp_alarm.h
-./misc/ipfwacc.lo: ../../include/net-snmp/library/callback.h
-./misc/ipfwacc.lo: ../../include/net-snmp/library/data_list.h
-./misc/ipfwacc.lo: ../../include/net-snmp/library/oid_stash.h
-./misc/ipfwacc.lo: ../../include/net-snmp/library/check_varbind.h
-./misc/ipfwacc.lo: ../../include/net-snmp/library/container.h
-./misc/ipfwacc.lo: ../../include/net-snmp/library/factory.h
-./misc/ipfwacc.lo: ../../include/net-snmp/library/snmp_logging.h
-./misc/ipfwacc.lo: ../../include/net-snmp/library/container_binary_array.h
-./misc/ipfwacc.lo: ../../include/net-snmp/library/container_list_ssll.h
-./misc/ipfwacc.lo: ../../include/net-snmp/library/container_iterator.h
-./misc/ipfwacc.lo: ../../include/net-snmp/library/container.h
-./misc/ipfwacc.lo: ../../include/net-snmp/library/snmp_assert.h
-./misc/ipfwacc.lo: ../../include/net-snmp/version.h
+./misc/ipfwacc.lo: ../../include/net-snmp/pdu_api.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/asn1.h
 ./misc/ipfwacc.lo: ../../include/net-snmp/session_api.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/callback.h
 ./misc/ipfwacc.lo: ../../include/net-snmp/library/snmp_transport.h
 ./misc/ipfwacc.lo: ../../include/net-snmp/library/snmp_service.h
 ./misc/ipfwacc.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -7952,11 +8227,31 @@
 ./misc/ipfwacc.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./misc/ipfwacc.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./misc/ipfwacc.lo: ../../include/net-snmp/library/ucd_compat.h
-./misc/ipfwacc.lo: ../../include/net-snmp/pdu_api.h
-./misc/ipfwacc.lo: ../../include/net-snmp/mib_api.h
 ./misc/ipfwacc.lo: ../../include/net-snmp/library/mib.h
+./misc/ipfwacc.lo: ../../include/net-snmp/mib_api.h
 ./misc/ipfwacc.lo: ../../include/net-snmp/library/parse.h
-./misc/ipfwacc.lo: ../../include/net-snmp/varbind_api.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/oid_stash.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/snmp_impl.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/snmp.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/snmp-tc.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/getopt.h
+./misc/ipfwacc.lo: ../../include/net-snmp/utilities.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/system.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/tools.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/int64.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/mt_support.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/snmp_alarm.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/data_list.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/check_varbind.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/container.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/factory.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/snmp_logging.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/container_binary_array.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/container_list_ssll.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/container_iterator.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/container.h
+./misc/ipfwacc.lo: ../../include/net-snmp/library/snmp_assert.h
+./misc/ipfwacc.lo: ../../include/net-snmp/version.h
 ./misc/ipfwacc.lo: ../../include/net-snmp/config_api.h
 ./misc/ipfwacc.lo: ../../include/net-snmp/library/read_config.h
 ./misc/ipfwacc.lo: ../../include/net-snmp/library/default_store.h
@@ -8009,8 +8304,8 @@
 ./misc/ipfwacc.lo: ../../include/net-snmp/agent/table_iterator.h
 ./misc/ipfwacc.lo: ../../include/net-snmp/agent/table_container.h
 ./misc/ipfwacc.lo: ../../include/net-snmp/agent/table_array.h
-./misc/ipfwacc.lo: ../../include/net-snmp/agent/mfd.h util_funcs.h struct.h
-./misc/ipfwacc.lo: ./misc/ipfwacc.h
+./misc/ipfwacc.lo: ../../include/net-snmp/agent/mfd.h
+./misc/ipfwacc.lo: util_funcs/header_simple_table.h ./misc/ipfwacc.h
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/net-snmp-config.h
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/system/linux.h
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/system/sysv.h
@@ -8019,32 +8314,14 @@
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/net-snmp-includes.h
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/definitions.h
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/types.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/types.h
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/snmp_api.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/asn1.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/snmp_impl.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/snmp.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/snmp-tc.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/utilities.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/varbind_api.h
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/snmp_client.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/system.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/tools.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/int64.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/mt_support.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/snmp_alarm.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/callback.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/data_list.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/oid_stash.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/check_varbind.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/container.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/factory.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/snmp_logging.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/container_binary_array.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/container_list_ssll.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/container_iterator.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/container.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/snmp_assert.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/version.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/pdu_api.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/asn1.h
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/session_api.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/callback.h
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/snmp_transport.h
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/snmp_service.h
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -8055,11 +8332,31 @@
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/ucd_compat.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/pdu_api.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/mib_api.h
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/mib.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/mib_api.h
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/parse.h
-./notification-log-mib/notification_log.lo: ../../include/net-snmp/varbind_api.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/oid_stash.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/snmp_impl.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/snmp.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/snmp-tc.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/getopt.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/utilities.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/system.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/tools.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/int64.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/mt_support.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/snmp_alarm.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/data_list.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/check_varbind.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/container.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/factory.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/snmp_logging.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/container_binary_array.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/container_list_ssll.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/container_iterator.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/container.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/snmp_assert.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/version.h
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/config_api.h
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/read_config.h
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/library/default_store.h
@@ -8113,7 +8410,8 @@
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/agent/table_container.h
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/agent/table_array.h
 ./notification-log-mib/notification_log.lo: ../../include/net-snmp/agent/mfd.h
-./notification-log-mib/notification_log.lo: ../../agent/mibgroup/mibII/sysORTable.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/agent/sysORTable.h
+./notification-log-mib/notification_log.lo: ../../include/net-snmp/agent/agent_callbacks.h
 ./notification-log-mib/notification_log.lo: ./notification-log-mib/notification_log.h
 ./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/net-snmp-config.h
 ./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/system/linux.h
@@ -8123,32 +8421,14 @@
 ./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/definitions.h
 ./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/types.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/types.h
 ./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/snmp_api.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/asn1.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/snmp.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/utilities.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/varbind_api.h
 ./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/snmp_client.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/system.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/tools.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/int64.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/mt_support.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/callback.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/data_list.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/oid_stash.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/check_varbind.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/container.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/factory.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/container_iterator.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/container.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/version.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/pdu_api.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/asn1.h
 ./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/session_api.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/callback.h
 ./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -8159,11 +8439,31 @@
 ./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/pdu_api.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/mib_api.h
 ./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/mib.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/mib_api.h
 ./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/parse.h
-./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/varbind_api.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/oid_stash.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/snmp.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/getopt.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/utilities.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/system.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/tools.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/int64.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/mt_support.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/data_list.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/check_varbind.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/container.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/factory.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/container_iterator.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/container.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/version.h
 ./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/config_api.h
 ./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/read_config.h
 ./notification/snmpNotifyFilterProfileTable.lo: ../../include/net-snmp/library/default_store.h
@@ -8227,32 +8527,14 @@
 ./notification/snmpNotifyTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./notification/snmpNotifyTable.lo: ../../include/net-snmp/definitions.h
 ./notification/snmpNotifyTable.lo: ../../include/net-snmp/types.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/types.h
 ./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/snmp_api.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/asn1.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/snmp.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/utilities.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/varbind_api.h
 ./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/snmp_client.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/system.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/tools.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/int64.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/mt_support.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/callback.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/data_list.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/oid_stash.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/check_varbind.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/container.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/factory.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/container_iterator.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/container.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/version.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/pdu_api.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/asn1.h
 ./notification/snmpNotifyTable.lo: ../../include/net-snmp/session_api.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/callback.h
 ./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -8263,11 +8545,31 @@
 ./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/pdu_api.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/mib_api.h
 ./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/mib.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/mib_api.h
 ./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/parse.h
-./notification/snmpNotifyTable.lo: ../../include/net-snmp/varbind_api.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/oid_stash.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/snmp.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/getopt.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/utilities.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/system.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/tools.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/int64.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/mt_support.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/data_list.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/check_varbind.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/container.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/factory.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/container_iterator.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/container.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/version.h
 ./notification/snmpNotifyTable.lo: ../../include/net-snmp/config_api.h
 ./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/read_config.h
 ./notification/snmpNotifyTable.lo: ../../include/net-snmp/library/default_store.h
@@ -8333,8 +8635,743 @@
 ./notification/snmpNotifyTable.lo: snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable.h
 ./notification/snmpNotifyTable.lo: snmp-notification-mib/snmpNotifyFilterTable/snmpNotifyFilterTable_data_access.h
 ./notification/snmpNotifyTable.lo: ../../include/net-snmp/agent/agent_callbacks.h
-./notification/snmpNotifyTable.lo: ../../agent/mibgroup/mibII/sysORTable.h
+./notification/snmpNotifyTable.lo: ../../include/net-snmp/agent/sysORTable.h
 ./notification/snmpNotifyTable.lo: notification-log-mib/notification_log.h
+./Rmon/agutil.lo: ../../include/net-snmp/net-snmp-config.h
+./Rmon/agutil.lo: ../../include/net-snmp/system/linux.h
+./Rmon/agutil.lo: ../../include/net-snmp/system/sysv.h
+./Rmon/agutil.lo: ../../include/net-snmp/system/generic.h
+./Rmon/agutil.lo: ../../include/net-snmp/machine/generic.h
+./Rmon/agutil.lo: ../../include/net-snmp/net-snmp-includes.h
+./Rmon/agutil.lo: ../../include/net-snmp/definitions.h
+./Rmon/agutil.lo: ../../include/net-snmp/types.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/types.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_api.h
+./Rmon/agutil.lo: ../../include/net-snmp/varbind_api.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_client.h
+./Rmon/agutil.lo: ../../include/net-snmp/pdu_api.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/asn1.h
+./Rmon/agutil.lo: ../../include/net-snmp/session_api.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/callback.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_transport.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_service.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/ucd_compat.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/mib.h
+./Rmon/agutil.lo: ../../include/net-snmp/mib_api.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/parse.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/oid_stash.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_impl.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmp.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmp-tc.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/getopt.h
+./Rmon/agutil.lo: ../../include/net-snmp/utilities.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/system.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/tools.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/int64.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/mt_support.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_alarm.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/data_list.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/check_varbind.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/container.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/factory.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_logging.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/container_binary_array.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/container_list_ssll.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/container_iterator.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/container.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_assert.h
+./Rmon/agutil.lo: ../../include/net-snmp/version.h
+./Rmon/agutil.lo: ../../include/net-snmp/config_api.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/read_config.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/default_store.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_enum.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/vacm.h
+./Rmon/agutil.lo: ../../include/net-snmp/output_api.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_debug.h
+./Rmon/agutil.lo: ../../include/net-snmp/snmpv3_api.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmpv3.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/transform_oids.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/keytools.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/scapi.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/lcd_time.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmp_secmod.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/snmpusm.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/mib_module_config.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/agent_module_config.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/snmp_agent.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/snmp_vars.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/agent_handler.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/var_struct.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/agent_registry.h
+./Rmon/agutil.lo: ../../include/net-snmp/library/fd_event_manager.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/ds_agent.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/agent_read_config.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/agent_trap.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/all_helpers.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/instance.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/baby_steps.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/scalar.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/scalar_group.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/watcher.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/multiplexer.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/null.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/debug_handler.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/cache_handler.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/old_api.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/read_only.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/row_merge.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/serialize.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/mode_end_call.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/table.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/table_data.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/table_dataset.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/table_tdata.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/table_iterator.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/table_container.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/table_array.h
+./Rmon/agutil.lo: ../../include/net-snmp/agent/mfd.h ./Rmon/agutil.h
+./Rmon/agutil.lo: ./Rmon/agutil_api.h
+./Rmon/alarm.lo: ../../include/net-snmp/net-snmp-config.h
+./Rmon/alarm.lo: ../../include/net-snmp/system/linux.h
+./Rmon/alarm.lo: ../../include/net-snmp/system/sysv.h
+./Rmon/alarm.lo: ../../include/net-snmp/system/generic.h
+./Rmon/alarm.lo: ../../include/net-snmp/machine/generic.h
+./Rmon/alarm.lo: ../../include/net-snmp/net-snmp-includes.h
+./Rmon/alarm.lo: ../../include/net-snmp/definitions.h
+./Rmon/alarm.lo: ../../include/net-snmp/types.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/types.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_api.h
+./Rmon/alarm.lo: ../../include/net-snmp/varbind_api.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_client.h
+./Rmon/alarm.lo: ../../include/net-snmp/pdu_api.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/asn1.h
+./Rmon/alarm.lo: ../../include/net-snmp/session_api.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/callback.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_transport.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_service.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/ucd_compat.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/mib.h
+./Rmon/alarm.lo: ../../include/net-snmp/mib_api.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/parse.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/oid_stash.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_impl.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmp.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmp-tc.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/getopt.h
+./Rmon/alarm.lo: ../../include/net-snmp/utilities.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/system.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/tools.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/int64.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/mt_support.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_alarm.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/data_list.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/check_varbind.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/container.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/factory.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_logging.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/container_binary_array.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/container_list_ssll.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/container_iterator.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/container.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_assert.h
+./Rmon/alarm.lo: ../../include/net-snmp/version.h
+./Rmon/alarm.lo: ../../include/net-snmp/config_api.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/read_config.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/default_store.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_enum.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/vacm.h
+./Rmon/alarm.lo: ../../include/net-snmp/output_api.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_debug.h
+./Rmon/alarm.lo: ../../include/net-snmp/snmpv3_api.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmpv3.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/transform_oids.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/keytools.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/scapi.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/lcd_time.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmp_secmod.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/snmpusm.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/mib_module_config.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/agent_module_config.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/snmp_agent.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/snmp_vars.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/agent_handler.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/var_struct.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/agent_registry.h
+./Rmon/alarm.lo: ../../include/net-snmp/library/fd_event_manager.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/ds_agent.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/agent_read_config.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/agent_trap.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/all_helpers.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/instance.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/baby_steps.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/scalar.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/scalar_group.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/watcher.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/multiplexer.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/null.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/debug_handler.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/cache_handler.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/old_api.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/read_only.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/row_merge.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/serialize.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/mode_end_call.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/table.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/table_data.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/table_dataset.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/table_tdata.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/table_iterator.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/table_container.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/table_array.h
+./Rmon/alarm.lo: ../../include/net-snmp/agent/mfd.h ./Rmon/alarm.h
+./Rmon/alarm.lo: ./Rmon/agutil_api.h ./Rmon/row_api.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/net-snmp-config.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/system/linux.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/system/sysv.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/system/generic.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/machine/generic.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/net-snmp-includes.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/definitions.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/types.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/types.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmp_api.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/varbind_api.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmp_client.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/pdu_api.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/asn1.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/session_api.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/callback.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmp_transport.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmp_service.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/ucd_compat.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/mib.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/mib_api.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/parse.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/oid_stash.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmp.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/getopt.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/utilities.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/system.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/tools.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/int64.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/mt_support.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/data_list.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/check_varbind.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/container.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/factory.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/container_iterator.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/container.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/version.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/config_api.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/read_config.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/default_store.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmp_enum.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/vacm.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/output_api.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmp_debug.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/snmpv3_api.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmpv3.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/transform_oids.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/keytools.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/scapi.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/lcd_time.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmp_secmod.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/snmpusm.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/mib_module_config.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/agent_module_config.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/snmp_agent.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/snmp_vars.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/agent_handler.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/var_struct.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/agent_registry.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/library/fd_event_manager.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/ds_agent.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/agent_read_config.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/agent_trap.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/all_helpers.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/instance.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/baby_steps.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/scalar.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/scalar_group.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/watcher.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/multiplexer.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/null.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/debug_handler.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/cache_handler.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/old_api.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/read_only.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/row_merge.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/serialize.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/mode_end_call.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/table.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/table_data.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/table_dataset.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/table_tdata.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/table_iterator.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/table_container.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/table_array.h
+./Rmon/alarmTable.lo: ../../include/net-snmp/agent/mfd.h utilities/iquery.h
+./Rmon/alarmTable.lo: ./Rmon/alarmTable.h
+./Rmon/event.lo: ../../include/net-snmp/net-snmp-config.h
+./Rmon/event.lo: ../../include/net-snmp/system/linux.h
+./Rmon/event.lo: ../../include/net-snmp/system/sysv.h
+./Rmon/event.lo: ../../include/net-snmp/system/generic.h
+./Rmon/event.lo: ../../include/net-snmp/machine/generic.h
+./Rmon/event.lo: ../../include/net-snmp/net-snmp-includes.h
+./Rmon/event.lo: ../../include/net-snmp/definitions.h
+./Rmon/event.lo: ../../include/net-snmp/types.h
+./Rmon/event.lo: ../../include/net-snmp/library/types.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmp_api.h
+./Rmon/event.lo: ../../include/net-snmp/varbind_api.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmp_client.h
+./Rmon/event.lo: ../../include/net-snmp/pdu_api.h
+./Rmon/event.lo: ../../include/net-snmp/library/asn1.h
+./Rmon/event.lo: ../../include/net-snmp/session_api.h
+./Rmon/event.lo: ../../include/net-snmp/library/callback.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmp_transport.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmp_service.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./Rmon/event.lo: ../../include/net-snmp/library/ucd_compat.h
+./Rmon/event.lo: ../../include/net-snmp/library/mib.h
+./Rmon/event.lo: ../../include/net-snmp/mib_api.h
+./Rmon/event.lo: ../../include/net-snmp/library/parse.h
+./Rmon/event.lo: ../../include/net-snmp/library/oid_stash.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmp_impl.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmp.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmp-tc.h
+./Rmon/event.lo: ../../include/net-snmp/library/getopt.h
+./Rmon/event.lo: ../../include/net-snmp/utilities.h
+./Rmon/event.lo: ../../include/net-snmp/library/system.h
+./Rmon/event.lo: ../../include/net-snmp/library/tools.h
+./Rmon/event.lo: ../../include/net-snmp/library/int64.h
+./Rmon/event.lo: ../../include/net-snmp/library/mt_support.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmp_alarm.h
+./Rmon/event.lo: ../../include/net-snmp/library/data_list.h
+./Rmon/event.lo: ../../include/net-snmp/library/check_varbind.h
+./Rmon/event.lo: ../../include/net-snmp/library/container.h
+./Rmon/event.lo: ../../include/net-snmp/library/factory.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmp_logging.h
+./Rmon/event.lo: ../../include/net-snmp/library/container_binary_array.h
+./Rmon/event.lo: ../../include/net-snmp/library/container_list_ssll.h
+./Rmon/event.lo: ../../include/net-snmp/library/container_iterator.h
+./Rmon/event.lo: ../../include/net-snmp/library/container.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmp_assert.h
+./Rmon/event.lo: ../../include/net-snmp/version.h
+./Rmon/event.lo: ../../include/net-snmp/config_api.h
+./Rmon/event.lo: ../../include/net-snmp/library/read_config.h
+./Rmon/event.lo: ../../include/net-snmp/library/default_store.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmp_enum.h
+./Rmon/event.lo: ../../include/net-snmp/library/vacm.h
+./Rmon/event.lo: ../../include/net-snmp/output_api.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmp_debug.h
+./Rmon/event.lo: ../../include/net-snmp/snmpv3_api.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmpv3.h
+./Rmon/event.lo: ../../include/net-snmp/library/transform_oids.h
+./Rmon/event.lo: ../../include/net-snmp/library/keytools.h
+./Rmon/event.lo: ../../include/net-snmp/library/scapi.h
+./Rmon/event.lo: ../../include/net-snmp/library/lcd_time.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmp_secmod.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./Rmon/event.lo: ../../include/net-snmp/library/snmpusm.h
+./Rmon/event.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./Rmon/event.lo: ../../include/net-snmp/agent/mib_module_config.h
+./Rmon/event.lo: ../../include/net-snmp/agent/agent_module_config.h
+./Rmon/event.lo: ../../include/net-snmp/agent/snmp_agent.h
+./Rmon/event.lo: ../../include/net-snmp/agent/snmp_vars.h
+./Rmon/event.lo: ../../include/net-snmp/agent/agent_handler.h
+./Rmon/event.lo: ../../include/net-snmp/agent/var_struct.h
+./Rmon/event.lo: ../../include/net-snmp/agent/agent_registry.h
+./Rmon/event.lo: ../../include/net-snmp/library/fd_event_manager.h
+./Rmon/event.lo: ../../include/net-snmp/agent/ds_agent.h
+./Rmon/event.lo: ../../include/net-snmp/agent/agent_read_config.h
+./Rmon/event.lo: ../../include/net-snmp/agent/agent_trap.h
+./Rmon/event.lo: ../../include/net-snmp/agent/all_helpers.h
+./Rmon/event.lo: ../../include/net-snmp/agent/instance.h
+./Rmon/event.lo: ../../include/net-snmp/agent/baby_steps.h
+./Rmon/event.lo: ../../include/net-snmp/agent/scalar.h
+./Rmon/event.lo: ../../include/net-snmp/agent/scalar_group.h
+./Rmon/event.lo: ../../include/net-snmp/agent/watcher.h
+./Rmon/event.lo: ../../include/net-snmp/agent/multiplexer.h
+./Rmon/event.lo: ../../include/net-snmp/agent/null.h
+./Rmon/event.lo: ../../include/net-snmp/agent/debug_handler.h
+./Rmon/event.lo: ../../include/net-snmp/agent/cache_handler.h
+./Rmon/event.lo: ../../include/net-snmp/agent/old_api.h
+./Rmon/event.lo: ../../include/net-snmp/agent/read_only.h
+./Rmon/event.lo: ../../include/net-snmp/agent/row_merge.h
+./Rmon/event.lo: ../../include/net-snmp/agent/serialize.h
+./Rmon/event.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./Rmon/event.lo: ../../include/net-snmp/agent/mode_end_call.h
+./Rmon/event.lo: ../../include/net-snmp/agent/table.h
+./Rmon/event.lo: ../../include/net-snmp/agent/table_data.h
+./Rmon/event.lo: ../../include/net-snmp/agent/table_dataset.h
+./Rmon/event.lo: ../../include/net-snmp/agent/table_tdata.h
+./Rmon/event.lo: ../../include/net-snmp/agent/table_iterator.h
+./Rmon/event.lo: ../../include/net-snmp/agent/table_container.h
+./Rmon/event.lo: ../../include/net-snmp/agent/table_array.h
+./Rmon/event.lo: ../../include/net-snmp/agent/mfd.h ./Rmon/event.h
+./Rmon/event.lo: ./Rmon/agutil_api.h ./Rmon/row_api.h
+./Rmon/history.lo: ../../include/net-snmp/net-snmp-config.h
+./Rmon/history.lo: ../../include/net-snmp/system/linux.h
+./Rmon/history.lo: ../../include/net-snmp/system/sysv.h
+./Rmon/history.lo: ../../include/net-snmp/system/generic.h
+./Rmon/history.lo: ../../include/net-snmp/machine/generic.h
+./Rmon/history.lo: ../../include/net-snmp/net-snmp-includes.h
+./Rmon/history.lo: ../../include/net-snmp/definitions.h
+./Rmon/history.lo: ../../include/net-snmp/types.h
+./Rmon/history.lo: ../../include/net-snmp/library/types.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmp_api.h
+./Rmon/history.lo: ../../include/net-snmp/varbind_api.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmp_client.h
+./Rmon/history.lo: ../../include/net-snmp/pdu_api.h
+./Rmon/history.lo: ../../include/net-snmp/library/asn1.h
+./Rmon/history.lo: ../../include/net-snmp/session_api.h
+./Rmon/history.lo: ../../include/net-snmp/library/callback.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmp_transport.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmp_service.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./Rmon/history.lo: ../../include/net-snmp/library/ucd_compat.h
+./Rmon/history.lo: ../../include/net-snmp/library/mib.h
+./Rmon/history.lo: ../../include/net-snmp/mib_api.h
+./Rmon/history.lo: ../../include/net-snmp/library/parse.h
+./Rmon/history.lo: ../../include/net-snmp/library/oid_stash.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmp_impl.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmp.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmp-tc.h
+./Rmon/history.lo: ../../include/net-snmp/library/getopt.h
+./Rmon/history.lo: ../../include/net-snmp/utilities.h
+./Rmon/history.lo: ../../include/net-snmp/library/system.h
+./Rmon/history.lo: ../../include/net-snmp/library/tools.h
+./Rmon/history.lo: ../../include/net-snmp/library/int64.h
+./Rmon/history.lo: ../../include/net-snmp/library/mt_support.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmp_alarm.h
+./Rmon/history.lo: ../../include/net-snmp/library/data_list.h
+./Rmon/history.lo: ../../include/net-snmp/library/check_varbind.h
+./Rmon/history.lo: ../../include/net-snmp/library/container.h
+./Rmon/history.lo: ../../include/net-snmp/library/factory.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmp_logging.h
+./Rmon/history.lo: ../../include/net-snmp/library/container_binary_array.h
+./Rmon/history.lo: ../../include/net-snmp/library/container_list_ssll.h
+./Rmon/history.lo: ../../include/net-snmp/library/container_iterator.h
+./Rmon/history.lo: ../../include/net-snmp/library/container.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmp_assert.h
+./Rmon/history.lo: ../../include/net-snmp/version.h
+./Rmon/history.lo: ../../include/net-snmp/config_api.h
+./Rmon/history.lo: ../../include/net-snmp/library/read_config.h
+./Rmon/history.lo: ../../include/net-snmp/library/default_store.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmp_enum.h
+./Rmon/history.lo: ../../include/net-snmp/library/vacm.h
+./Rmon/history.lo: ../../include/net-snmp/output_api.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmp_debug.h
+./Rmon/history.lo: ../../include/net-snmp/snmpv3_api.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmpv3.h
+./Rmon/history.lo: ../../include/net-snmp/library/transform_oids.h
+./Rmon/history.lo: ../../include/net-snmp/library/keytools.h
+./Rmon/history.lo: ../../include/net-snmp/library/scapi.h
+./Rmon/history.lo: ../../include/net-snmp/library/lcd_time.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmp_secmod.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./Rmon/history.lo: ../../include/net-snmp/library/snmpusm.h
+./Rmon/history.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./Rmon/history.lo: ../../include/net-snmp/agent/mib_module_config.h
+./Rmon/history.lo: ../../include/net-snmp/agent/agent_module_config.h
+./Rmon/history.lo: ../../include/net-snmp/agent/snmp_agent.h
+./Rmon/history.lo: ../../include/net-snmp/agent/snmp_vars.h
+./Rmon/history.lo: ../../include/net-snmp/agent/agent_handler.h
+./Rmon/history.lo: ../../include/net-snmp/agent/var_struct.h
+./Rmon/history.lo: ../../include/net-snmp/agent/agent_registry.h
+./Rmon/history.lo: ../../include/net-snmp/library/fd_event_manager.h
+./Rmon/history.lo: ../../include/net-snmp/agent/ds_agent.h
+./Rmon/history.lo: ../../include/net-snmp/agent/agent_read_config.h
+./Rmon/history.lo: ../../include/net-snmp/agent/agent_trap.h
+./Rmon/history.lo: ../../include/net-snmp/agent/all_helpers.h
+./Rmon/history.lo: ../../include/net-snmp/agent/instance.h
+./Rmon/history.lo: ../../include/net-snmp/agent/baby_steps.h
+./Rmon/history.lo: ../../include/net-snmp/agent/scalar.h
+./Rmon/history.lo: ../../include/net-snmp/agent/scalar_group.h
+./Rmon/history.lo: ../../include/net-snmp/agent/watcher.h
+./Rmon/history.lo: ../../include/net-snmp/agent/multiplexer.h
+./Rmon/history.lo: ../../include/net-snmp/agent/null.h
+./Rmon/history.lo: ../../include/net-snmp/agent/debug_handler.h
+./Rmon/history.lo: ../../include/net-snmp/agent/cache_handler.h
+./Rmon/history.lo: ../../include/net-snmp/agent/old_api.h
+./Rmon/history.lo: ../../include/net-snmp/agent/read_only.h
+./Rmon/history.lo: ../../include/net-snmp/agent/row_merge.h
+./Rmon/history.lo: ../../include/net-snmp/agent/serialize.h
+./Rmon/history.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./Rmon/history.lo: ../../include/net-snmp/agent/mode_end_call.h
+./Rmon/history.lo: ../../include/net-snmp/agent/table.h
+./Rmon/history.lo: ../../include/net-snmp/agent/table_data.h
+./Rmon/history.lo: ../../include/net-snmp/agent/table_dataset.h
+./Rmon/history.lo: ../../include/net-snmp/agent/table_tdata.h
+./Rmon/history.lo: ../../include/net-snmp/agent/table_iterator.h
+./Rmon/history.lo: ../../include/net-snmp/agent/table_container.h
+./Rmon/history.lo: ../../include/net-snmp/agent/table_array.h
+./Rmon/history.lo: ../../include/net-snmp/agent/mfd.h ./Rmon/history.h
+./Rmon/history.lo: ./Rmon/agutil_api.h ./Rmon/row_api.h
+./Rmon/rows.lo: ../../include/net-snmp/net-snmp-config.h
+./Rmon/rows.lo: ../../include/net-snmp/system/linux.h
+./Rmon/rows.lo: ../../include/net-snmp/system/sysv.h
+./Rmon/rows.lo: ../../include/net-snmp/system/generic.h
+./Rmon/rows.lo: ../../include/net-snmp/machine/generic.h
+./Rmon/rows.lo: ../../include/net-snmp/net-snmp-includes.h
+./Rmon/rows.lo: ../../include/net-snmp/definitions.h
+./Rmon/rows.lo: ../../include/net-snmp/types.h
+./Rmon/rows.lo: ../../include/net-snmp/library/types.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmp_api.h
+./Rmon/rows.lo: ../../include/net-snmp/varbind_api.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmp_client.h
+./Rmon/rows.lo: ../../include/net-snmp/pdu_api.h
+./Rmon/rows.lo: ../../include/net-snmp/library/asn1.h
+./Rmon/rows.lo: ../../include/net-snmp/session_api.h
+./Rmon/rows.lo: ../../include/net-snmp/library/callback.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmp_transport.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmp_service.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./Rmon/rows.lo: ../../include/net-snmp/library/ucd_compat.h
+./Rmon/rows.lo: ../../include/net-snmp/library/mib.h
+./Rmon/rows.lo: ../../include/net-snmp/mib_api.h
+./Rmon/rows.lo: ../../include/net-snmp/library/parse.h
+./Rmon/rows.lo: ../../include/net-snmp/library/oid_stash.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmp_impl.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmp.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmp-tc.h
+./Rmon/rows.lo: ../../include/net-snmp/library/getopt.h
+./Rmon/rows.lo: ../../include/net-snmp/utilities.h
+./Rmon/rows.lo: ../../include/net-snmp/library/system.h
+./Rmon/rows.lo: ../../include/net-snmp/library/tools.h
+./Rmon/rows.lo: ../../include/net-snmp/library/int64.h
+./Rmon/rows.lo: ../../include/net-snmp/library/mt_support.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmp_alarm.h
+./Rmon/rows.lo: ../../include/net-snmp/library/data_list.h
+./Rmon/rows.lo: ../../include/net-snmp/library/check_varbind.h
+./Rmon/rows.lo: ../../include/net-snmp/library/container.h
+./Rmon/rows.lo: ../../include/net-snmp/library/factory.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmp_logging.h
+./Rmon/rows.lo: ../../include/net-snmp/library/container_binary_array.h
+./Rmon/rows.lo: ../../include/net-snmp/library/container_list_ssll.h
+./Rmon/rows.lo: ../../include/net-snmp/library/container_iterator.h
+./Rmon/rows.lo: ../../include/net-snmp/library/container.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmp_assert.h
+./Rmon/rows.lo: ../../include/net-snmp/version.h
+./Rmon/rows.lo: ../../include/net-snmp/config_api.h
+./Rmon/rows.lo: ../../include/net-snmp/library/read_config.h
+./Rmon/rows.lo: ../../include/net-snmp/library/default_store.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmp_enum.h
+./Rmon/rows.lo: ../../include/net-snmp/library/vacm.h
+./Rmon/rows.lo: ../../include/net-snmp/output_api.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmp_debug.h
+./Rmon/rows.lo: ../../include/net-snmp/snmpv3_api.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmpv3.h
+./Rmon/rows.lo: ../../include/net-snmp/library/transform_oids.h
+./Rmon/rows.lo: ../../include/net-snmp/library/keytools.h
+./Rmon/rows.lo: ../../include/net-snmp/library/scapi.h
+./Rmon/rows.lo: ../../include/net-snmp/library/lcd_time.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmp_secmod.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./Rmon/rows.lo: ../../include/net-snmp/library/snmpusm.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/mib_module_config.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/agent_module_config.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/snmp_agent.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/snmp_vars.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/agent_handler.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/var_struct.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/agent_registry.h
+./Rmon/rows.lo: ../../include/net-snmp/library/fd_event_manager.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/ds_agent.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/agent_read_config.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/agent_trap.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/all_helpers.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/instance.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/baby_steps.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/scalar.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/scalar_group.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/watcher.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/multiplexer.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/null.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/debug_handler.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/cache_handler.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/old_api.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/read_only.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/row_merge.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/serialize.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/mode_end_call.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/table.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/table_data.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/table_dataset.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/table_tdata.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/table_iterator.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/table_container.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/table_array.h
+./Rmon/rows.lo: ../../include/net-snmp/agent/mfd.h ./Rmon/agutil_api.h
+./Rmon/rows.lo: ./Rmon/rows.h ./Rmon/row_api.h
+./Rmon/statistics.lo: ../../include/net-snmp/net-snmp-config.h
+./Rmon/statistics.lo: ../../include/net-snmp/system/linux.h
+./Rmon/statistics.lo: ../../include/net-snmp/system/sysv.h
+./Rmon/statistics.lo: ../../include/net-snmp/system/generic.h
+./Rmon/statistics.lo: ../../include/net-snmp/machine/generic.h
+./Rmon/statistics.lo: ../../include/net-snmp/net-snmp-includes.h
+./Rmon/statistics.lo: ../../include/net-snmp/definitions.h
+./Rmon/statistics.lo: ../../include/net-snmp/types.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/types.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_api.h
+./Rmon/statistics.lo: ../../include/net-snmp/varbind_api.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_client.h
+./Rmon/statistics.lo: ../../include/net-snmp/pdu_api.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/asn1.h
+./Rmon/statistics.lo: ../../include/net-snmp/session_api.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/callback.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_transport.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_service.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/ucd_compat.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/mib.h
+./Rmon/statistics.lo: ../../include/net-snmp/mib_api.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/parse.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/oid_stash.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_impl.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmp.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmp-tc.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/getopt.h
+./Rmon/statistics.lo: ../../include/net-snmp/utilities.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/system.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/tools.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/int64.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/mt_support.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_alarm.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/data_list.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/check_varbind.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/container.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/factory.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_logging.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/container_binary_array.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/container_list_ssll.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/container_iterator.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/container.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_assert.h
+./Rmon/statistics.lo: ../../include/net-snmp/version.h
+./Rmon/statistics.lo: ../../include/net-snmp/config_api.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/read_config.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/default_store.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_enum.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/vacm.h
+./Rmon/statistics.lo: ../../include/net-snmp/output_api.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_debug.h
+./Rmon/statistics.lo: ../../include/net-snmp/snmpv3_api.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmpv3.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/transform_oids.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/keytools.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/scapi.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/lcd_time.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmp_secmod.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/snmpusm.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/mib_module_config.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/agent_module_config.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/snmp_agent.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/snmp_vars.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/agent_handler.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/var_struct.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/agent_registry.h
+./Rmon/statistics.lo: ../../include/net-snmp/library/fd_event_manager.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/ds_agent.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/agent_read_config.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/agent_trap.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/all_helpers.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/instance.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/baby_steps.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/scalar.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/scalar_group.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/watcher.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/multiplexer.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/null.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/debug_handler.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/cache_handler.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/old_api.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/read_only.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/row_merge.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/serialize.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/mode_end_call.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/table.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/table_data.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/table_dataset.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/table_tdata.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/table_iterator.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/table_container.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/table_array.h
+./Rmon/statistics.lo: ../../include/net-snmp/agent/mfd.h ./Rmon/statistics.h
+./Rmon/statistics.lo: ./Rmon/agutil_api.h ./Rmon/row_api.h
 ./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/net-snmp-config.h
 ./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/system/linux.h
 ./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/system/sysv.h
@@ -8343,32 +9380,14 @@
 ./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/definitions.h
 ./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/types.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/types.h
 ./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/snmp_api.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/asn1.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/snmp.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/varbind_api.h
 ./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/snmp_client.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/system.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/tools.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/int64.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/mt_support.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/callback.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/data_list.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/oid_stash.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/check_varbind.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/factory.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/container_iterator.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/version.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/pdu_api.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/asn1.h
 ./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/session_api.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/callback.h
 ./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -8379,11 +9398,31 @@
 ./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/pdu_api.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/mib.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/parse.h
-./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/varbind_api.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/oid_stash.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/snmp.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/getopt.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/system.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/tools.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/int64.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/mt_support.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/data_list.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/check_varbind.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/factory.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/container_iterator.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/version.h
 ./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/config_api.h
 ./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/read_config.h
 ./sctp-mib/sctpAssocLocalAddrTable.lo: ../../include/net-snmp/library/default_store.h
@@ -8447,32 +9486,14 @@
 ./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/definitions.h
 ./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/types.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/types.h
 ./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/snmp_api.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/asn1.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/snmp.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/varbind_api.h
 ./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/snmp_client.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/system.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/tools.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/int64.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/mt_support.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/callback.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/data_list.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/oid_stash.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/check_varbind.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/factory.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/container_iterator.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/version.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/pdu_api.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/asn1.h
 ./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/session_api.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/callback.h
 ./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -8483,11 +9504,31 @@
 ./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/pdu_api.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/mib.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/parse.h
-./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/varbind_api.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/oid_stash.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/snmp.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/getopt.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/system.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/tools.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/int64.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/mt_support.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/data_list.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/check_varbind.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/factory.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/container_iterator.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/version.h
 ./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/config_api.h
 ./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/read_config.h
 ./sctp-mib/sctpAssocRemAddrTable.lo: ../../include/net-snmp/library/default_store.h
@@ -8551,32 +9592,14 @@
 ./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/definitions.h
 ./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/types.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/types.h
 ./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/snmp_api.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/asn1.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/snmp.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/varbind_api.h
 ./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/snmp_client.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/system.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/tools.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/int64.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/mt_support.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/callback.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/data_list.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/oid_stash.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/check_varbind.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/factory.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/container_iterator.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/version.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/pdu_api.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/asn1.h
 ./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/session_api.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/callback.h
 ./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -8587,11 +9610,31 @@
 ./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/pdu_api.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/mib.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/parse.h
-./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/varbind_api.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/oid_stash.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/snmp.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/getopt.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/system.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/tools.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/int64.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/mt_support.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/data_list.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/check_varbind.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/factory.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/container_iterator.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/version.h
 ./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/config_api.h
 ./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/read_config.h
 ./sctp-mib/sctpAssocTable.lo: ../../include/net-snmp/library/default_store.h
@@ -8655,32 +9698,14 @@
 ./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/definitions.h
 ./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/types.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/types.h
 ./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/snmp_api.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/asn1.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/snmp.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/varbind_api.h
 ./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/snmp_client.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/system.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/tools.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/int64.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/mt_support.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/callback.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/data_list.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/oid_stash.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/check_varbind.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/factory.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/container_iterator.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/version.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/pdu_api.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/asn1.h
 ./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/session_api.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/callback.h
 ./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -8691,11 +9716,31 @@
 ./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/pdu_api.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/mib.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/parse.h
-./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/varbind_api.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/oid_stash.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/snmp.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/getopt.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/system.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/tools.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/int64.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/mt_support.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/data_list.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/check_varbind.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/factory.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/container_iterator.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/version.h
 ./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/config_api.h
 ./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/read_config.h
 ./sctp-mib/sctpLookupLocalPortTable.lo: ../../include/net-snmp/library/default_store.h
@@ -8759,32 +9804,14 @@
 ./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/definitions.h
 ./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/types.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/types.h
 ./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/snmp_api.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/asn1.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/snmp.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/varbind_api.h
 ./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/snmp_client.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/system.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/tools.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/int64.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/mt_support.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/callback.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/data_list.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/oid_stash.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/check_varbind.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/factory.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/container_iterator.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/version.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/pdu_api.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/asn1.h
 ./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/session_api.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/callback.h
 ./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -8795,11 +9822,31 @@
 ./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/pdu_api.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/mib.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/parse.h
-./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/varbind_api.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/oid_stash.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/snmp.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/getopt.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/system.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/tools.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/int64.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/mt_support.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/data_list.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/check_varbind.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/factory.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/container_iterator.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/version.h
 ./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/config_api.h
 ./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/read_config.h
 ./sctp-mib/sctpLookupRemHostNameTable.lo: ../../include/net-snmp/library/default_store.h
@@ -8863,32 +9910,14 @@
 ./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/definitions.h
 ./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/types.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/types.h
 ./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/snmp_api.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/asn1.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/snmp.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/varbind_api.h
 ./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/snmp_client.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/system.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/tools.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/int64.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/mt_support.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/callback.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/data_list.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/oid_stash.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/check_varbind.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/factory.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/container_iterator.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/version.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/pdu_api.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/asn1.h
 ./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/session_api.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/callback.h
 ./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -8899,11 +9928,31 @@
 ./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/pdu_api.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/mib.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/parse.h
-./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/varbind_api.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/oid_stash.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/snmp.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/getopt.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/system.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/tools.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/int64.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/mt_support.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/data_list.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/check_varbind.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/factory.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/container_iterator.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/version.h
 ./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/config_api.h
 ./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/read_config.h
 ./sctp-mib/sctpLookupRemIPAddrTable.lo: ../../include/net-snmp/library/default_store.h
@@ -8967,32 +10016,14 @@
 ./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/definitions.h
 ./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/types.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/types.h
 ./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/snmp_api.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/asn1.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/snmp.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/varbind_api.h
 ./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/snmp_client.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/system.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/tools.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/int64.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/mt_support.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/callback.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/data_list.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/oid_stash.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/check_varbind.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/factory.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/container_iterator.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/version.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/pdu_api.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/asn1.h
 ./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/session_api.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/callback.h
 ./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -9003,11 +10034,31 @@
 ./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/pdu_api.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/mib.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/parse.h
-./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/varbind_api.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/oid_stash.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/snmp.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/getopt.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/system.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/tools.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/int64.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/mt_support.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/data_list.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/check_varbind.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/factory.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/container_iterator.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/version.h
 ./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/config_api.h
 ./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/read_config.h
 ./sctp-mib/sctpLookupRemPortTable.lo: ../../include/net-snmp/library/default_store.h
@@ -9071,32 +10122,14 @@
 ./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/net-snmp-includes.h
 ./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/definitions.h
 ./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/types.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/types.h
 ./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/snmp_api.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/asn1.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/snmp_impl.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/snmp.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/snmp-tc.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/varbind_api.h
 ./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/snmp_client.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/system.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/tools.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/int64.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/mt_support.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/snmp_alarm.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/callback.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/data_list.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/oid_stash.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/check_varbind.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/factory.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/snmp_logging.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/container_binary_array.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/container_list_ssll.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/container_iterator.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/snmp_assert.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/version.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/pdu_api.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/asn1.h
 ./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/session_api.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/callback.h
 ./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/snmp_transport.h
 ./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/snmp_service.h
 ./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -9107,11 +10140,31 @@
 ./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/ucd_compat.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/pdu_api.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/mib.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/parse.h
-./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/varbind_api.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/oid_stash.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/snmp_impl.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/snmp.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/snmp-tc.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/getopt.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/system.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/tools.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/int64.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/mt_support.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/snmp_alarm.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/data_list.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/check_varbind.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/factory.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/snmp_logging.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/container_binary_array.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/container_list_ssll.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/container_iterator.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/snmp_assert.h
+./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/version.h
 ./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/config_api.h
 ./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/read_config.h
 ./sctp-mib/sctpLookupRemPrimIPAddrTable.lo: ../../include/net-snmp/library/default_store.h
@@ -9175,32 +10228,14 @@
 ./sctp-mib/sctpScalars.lo: ../../include/net-snmp/net-snmp-includes.h
 ./sctp-mib/sctpScalars.lo: ../../include/net-snmp/definitions.h
 ./sctp-mib/sctpScalars.lo: ../../include/net-snmp/types.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/types.h
 ./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/snmp_api.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/asn1.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/snmp_impl.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/snmp.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/snmp-tc.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/varbind_api.h
 ./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/snmp_client.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/system.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/tools.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/int64.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/mt_support.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/snmp_alarm.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/callback.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/data_list.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/oid_stash.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/check_varbind.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/factory.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/snmp_logging.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/container_binary_array.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/container_list_ssll.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/container_iterator.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/snmp_assert.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/version.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/pdu_api.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/asn1.h
 ./sctp-mib/sctpScalars.lo: ../../include/net-snmp/session_api.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/callback.h
 ./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/snmp_transport.h
 ./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/snmp_service.h
 ./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -9211,11 +10246,31 @@
 ./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/ucd_compat.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/pdu_api.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/mib.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/parse.h
-./sctp-mib/sctpScalars.lo: ../../include/net-snmp/varbind_api.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/oid_stash.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/snmp_impl.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/snmp.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/snmp-tc.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/getopt.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/system.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/tools.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/int64.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/mt_support.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/snmp_alarm.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/data_list.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/check_varbind.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/factory.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/snmp_logging.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/container_binary_array.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/container_list_ssll.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/container_iterator.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/snmp_assert.h
+./sctp-mib/sctpScalars.lo: ../../include/net-snmp/version.h
 ./sctp-mib/sctpScalars.lo: ../../include/net-snmp/config_api.h
 ./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/read_config.h
 ./sctp-mib/sctpScalars.lo: ../../include/net-snmp/library/default_store.h
@@ -9279,32 +10334,14 @@
 ./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/net-snmp-includes.h
 ./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/definitions.h
 ./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/types.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/types.h
 ./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/snmp_api.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/asn1.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/snmp_impl.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/snmp.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/snmp-tc.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/varbind_api.h
 ./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/snmp_client.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/system.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/tools.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/int64.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/mt_support.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/snmp_alarm.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/callback.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/data_list.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/oid_stash.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/check_varbind.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/factory.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/snmp_logging.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/container_binary_array.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/container_list_ssll.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/container_iterator.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/snmp_assert.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/version.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/pdu_api.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/asn1.h
 ./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/session_api.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/callback.h
 ./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/snmp_transport.h
 ./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/snmp_service.h
 ./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -9315,11 +10352,31 @@
 ./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/ucd_compat.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/pdu_api.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/mib.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/parse.h
-./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/varbind_api.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/oid_stash.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/snmp_impl.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/snmp.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/snmp-tc.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/getopt.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/system.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/tools.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/int64.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/mt_support.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/snmp_alarm.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/data_list.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/check_varbind.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/factory.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/snmp_logging.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/container_binary_array.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/container_list_ssll.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/container_iterator.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/snmp_assert.h
+./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/version.h
 ./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/config_api.h
 ./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/read_config.h
 ./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/library/default_store.h
@@ -9374,6 +10431,111 @@
 ./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/agent/table_array.h
 ./sctp-mib/sctpScalars_common.lo: ../../include/net-snmp/agent/mfd.h
 ./sctp-mib/sctpScalars_common.lo: ./sctp-mib/sctpScalars_common.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/net-snmp-config.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/system/linux.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/system/sysv.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/system/generic.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/machine/generic.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/net-snmp-includes.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/definitions.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/types.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/types.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmp_api.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/varbind_api.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmp_client.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/pdu_api.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/asn1.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/session_api.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/callback.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmp_transport.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmp_service.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/ucd_compat.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/mib.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/mib_api.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/parse.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/oid_stash.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmp_impl.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmp.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmp-tc.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/getopt.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/system.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/tools.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/int64.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/mt_support.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmp_alarm.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/data_list.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/check_varbind.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/factory.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmp_logging.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/container_binary_array.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/container_list_ssll.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/container_iterator.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmp_assert.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/version.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/config_api.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/read_config.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/default_store.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmp_enum.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/vacm.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/output_api.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmp_debug.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/snmpv3_api.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmpv3.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/transform_oids.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/keytools.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/scapi.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/lcd_time.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmp_secmod.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/snmpusm.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/mib_module_config.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/agent_module_config.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/snmp_agent.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/snmp_vars.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/agent_handler.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/var_struct.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/agent_registry.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/library/fd_event_manager.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/ds_agent.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/agent_read_config.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/agent_trap.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/all_helpers.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/instance.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/baby_steps.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/scalar.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/scalar_group.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/watcher.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/multiplexer.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/null.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/debug_handler.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/cache_handler.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/old_api.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/read_only.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/row_merge.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/serialize.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/mode_end_call.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/table.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/table_data.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/table_dataset.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/table_tdata.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/table_iterator.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/table_container.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/table_array.h
+./sctp-mib/sctpScalars_freebsd.lo: ../../include/net-snmp/agent/mfd.h
+./sctp-mib/sctpScalars_freebsd.lo: ./sctp-mib/sctpScalars_common.h
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/net-snmp-config.h
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/system/linux.h
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/system/sysv.h
@@ -9382,32 +10544,14 @@
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/net-snmp-includes.h
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/definitions.h
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/types.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/types.h
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/snmp_api.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/asn1.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/snmp_impl.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/snmp.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/snmp-tc.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/varbind_api.h
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/snmp_client.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/system.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/tools.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/int64.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/mt_support.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/snmp_alarm.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/callback.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/data_list.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/oid_stash.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/check_varbind.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/factory.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/snmp_logging.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/container_binary_array.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/container_list_ssll.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/container_iterator.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/snmp_assert.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/version.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/pdu_api.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/asn1.h
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/session_api.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/callback.h
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/snmp_transport.h
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/snmp_service.h
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -9418,11 +10562,31 @@
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/ucd_compat.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/pdu_api.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/mib.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/parse.h
-./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/varbind_api.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/oid_stash.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/snmp_impl.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/snmp.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/snmp-tc.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/getopt.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/system.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/tools.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/int64.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/mt_support.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/snmp_alarm.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/data_list.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/check_varbind.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/factory.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/snmp_logging.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/container_binary_array.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/container_list_ssll.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/container_iterator.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/snmp_assert.h
+./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/version.h
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/config_api.h
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/read_config.h
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/library/default_store.h
@@ -9477,6 +10641,112 @@
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/agent/table_array.h
 ./sctp-mib/sctpScalars_linux.lo: ../../include/net-snmp/agent/mfd.h
 ./sctp-mib/sctpScalars_linux.lo: ./sctp-mib/sctpScalars_common.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/net-snmp-config.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/system/linux.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/system/sysv.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/system/generic.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/machine/generic.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/net-snmp-includes.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/definitions.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/types.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/types.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmp_api.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/varbind_api.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmp_client.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/pdu_api.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/asn1.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/session_api.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/callback.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmp_transport.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmp_service.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/ucd_compat.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/mib.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/mib_api.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/parse.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/oid_stash.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmp_impl.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmp.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmp-tc.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/getopt.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/system.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/tools.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/int64.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/mt_support.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmp_alarm.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/data_list.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/check_varbind.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/factory.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmp_logging.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/container_binary_array.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/container_list_ssll.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/container_iterator.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmp_assert.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/version.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/config_api.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/read_config.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/default_store.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmp_enum.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/vacm.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/output_api.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmp_debug.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/snmpv3_api.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmpv3.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/transform_oids.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/keytools.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/scapi.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/lcd_time.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmp_secmod.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/snmpusm.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/mib_module_config.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/agent_module_config.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/snmp_agent.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/snmp_vars.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/agent_handler.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/var_struct.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/agent_registry.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/library/fd_event_manager.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/ds_agent.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/agent_read_config.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/agent_trap.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/all_helpers.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/instance.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/baby_steps.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/scalar.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/scalar_group.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/watcher.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/multiplexer.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/null.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/debug_handler.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/cache_handler.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/old_api.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/read_only.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/row_merge.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/serialize.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/mode_end_call.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/table.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/table_data.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/table_dataset.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/table_tdata.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/table_iterator.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/table_container.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/table_array.h
+./sctp-mib/sctpScalars_solaris2.lo: ../../include/net-snmp/agent/mfd.h
+./sctp-mib/sctpScalars_solaris2.lo: ./sctp-mib/sctpScalars_common.h
+./sctp-mib/sctpScalars_solaris2.lo: kernel_sunos5.h
 ./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/net-snmp-config.h
 ./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/system/linux.h
 ./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/system/sysv.h
@@ -9485,32 +10755,14 @@
 ./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/net-snmp-includes.h
 ./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/definitions.h
 ./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/types.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/types.h
 ./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/snmp_api.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/asn1.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/snmp_impl.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/snmp.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/snmp-tc.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/varbind_api.h
 ./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/snmp_client.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/system.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/tools.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/int64.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/mt_support.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/snmp_alarm.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/callback.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/data_list.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/oid_stash.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/check_varbind.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/factory.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/snmp_logging.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/container_binary_array.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/container_list_ssll.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/container_iterator.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/snmp_assert.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/version.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/pdu_api.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/asn1.h
 ./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/session_api.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/callback.h
 ./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/snmp_transport.h
 ./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/snmp_service.h
 ./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -9521,11 +10773,31 @@
 ./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/ucd_compat.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/pdu_api.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/mib.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/parse.h
-./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/varbind_api.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/oid_stash.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/snmp_impl.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/snmp.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/snmp-tc.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/getopt.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/system.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/tools.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/int64.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/mt_support.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/snmp_alarm.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/data_list.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/check_varbind.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/factory.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/snmp_logging.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/container_binary_array.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/container_list_ssll.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/container_iterator.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/snmp_assert.h
+./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/version.h
 ./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/config_api.h
 ./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/read_config.h
 ./sctp-mib/sctpTables_common.lo: ../../include/net-snmp/library/default_store.h
@@ -9588,6 +10860,117 @@
 ./sctp-mib/sctpTables_common.lo: ./sctp-mib/sctpLookupRemHostNameTable.h
 ./sctp-mib/sctpTables_common.lo: ./sctp-mib/sctpLookupRemPrimIPAddrTable.h
 ./sctp-mib/sctpTables_common.lo: ./sctp-mib/sctpLookupRemIPAddrTable.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/net-snmp-config.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/system/linux.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/system/sysv.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/system/generic.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/machine/generic.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/net-snmp-includes.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/definitions.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/types.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/types.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmp_api.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/varbind_api.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmp_client.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/pdu_api.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/asn1.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/session_api.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/callback.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmp_transport.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmp_service.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/ucd_compat.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/mib.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/mib_api.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/parse.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/oid_stash.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmp_impl.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmp.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmp-tc.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/getopt.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/system.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/tools.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/int64.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/mt_support.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmp_alarm.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/data_list.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/check_varbind.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/factory.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmp_logging.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/container_binary_array.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/container_list_ssll.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/container_iterator.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmp_assert.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/version.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/config_api.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/read_config.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/default_store.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmp_enum.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/vacm.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/output_api.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmp_debug.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/snmpv3_api.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmpv3.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/transform_oids.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/keytools.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/scapi.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/lcd_time.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmp_secmod.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/snmpusm.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/mib_module_config.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/agent_module_config.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/snmp_agent.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/snmp_vars.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/agent_handler.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/var_struct.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/agent_registry.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/library/fd_event_manager.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/ds_agent.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/agent_read_config.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/agent_trap.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/all_helpers.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/instance.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/baby_steps.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/scalar.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/scalar_group.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/watcher.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/multiplexer.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/null.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/debug_handler.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/cache_handler.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/old_api.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/read_only.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/row_merge.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/serialize.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/mode_end_call.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/table.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/table_data.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/table_dataset.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/table_tdata.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/table_iterator.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/table_container.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/table_array.h
+./sctp-mib/sctpTables_freebsd.lo: ../../include/net-snmp/agent/mfd.h
+./sctp-mib/sctpTables_freebsd.lo: ./sctp-mib/sctpAssocTable.h
+./sctp-mib/sctpTables_freebsd.lo: ./sctp-mib/sctpTables_common.h
+./sctp-mib/sctpTables_freebsd.lo: ./sctp-mib/sctpAssocLocalAddrTable.h
+./sctp-mib/sctpTables_freebsd.lo: ./sctp-mib/sctpAssocRemAddrTable.h
+./sctp-mib/sctpTables_freebsd.lo: util_funcs.h util_funcs/header_generic.h
+./sctp-mib/sctpTables_freebsd.lo: util_funcs/header_simple_table.h struct.h
+./sctp-mib/sctpTables_freebsd.lo: util_funcs/MIB_STATS_CACHE_TIMEOUT.h
 ./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/net-snmp-config.h
 ./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/system/linux.h
 ./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/system/sysv.h
@@ -9596,32 +10979,14 @@
 ./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/net-snmp-includes.h
 ./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/definitions.h
 ./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/types.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/types.h
 ./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/snmp_api.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/asn1.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/snmp_impl.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/snmp.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/snmp-tc.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/varbind_api.h
 ./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/snmp_client.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/system.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/tools.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/int64.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/mt_support.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/snmp_alarm.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/callback.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/data_list.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/oid_stash.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/check_varbind.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/factory.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/snmp_logging.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/container_binary_array.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/container_list_ssll.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/container_iterator.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/container.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/snmp_assert.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/version.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/pdu_api.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/asn1.h
 ./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/session_api.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/callback.h
 ./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/snmp_transport.h
 ./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/snmp_service.h
 ./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -9632,11 +10997,31 @@
 ./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/ucd_compat.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/pdu_api.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/mib.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/mib_api.h
 ./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/parse.h
-./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/varbind_api.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/oid_stash.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/snmp_impl.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/snmp.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/snmp-tc.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/getopt.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/system.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/tools.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/int64.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/mt_support.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/snmp_alarm.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/data_list.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/check_varbind.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/factory.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/snmp_logging.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/container_binary_array.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/container_list_ssll.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/container_iterator.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/snmp_assert.h
+./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/version.h
 ./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/config_api.h
 ./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/read_config.h
 ./sctp-mib/sctpTables_linux.lo: ../../include/net-snmp/library/default_store.h
@@ -9694,7 +11079,119 @@
 ./sctp-mib/sctpTables_linux.lo: ./sctp-mib/sctpTables_common.h
 ./sctp-mib/sctpTables_linux.lo: ./sctp-mib/sctpAssocLocalAddrTable.h
 ./sctp-mib/sctpTables_linux.lo: ./sctp-mib/sctpAssocRemAddrTable.h
-./sctp-mib/sctpTables_linux.lo: util_funcs.h struct.h
+./sctp-mib/sctpTables_linux.lo: ../../agent/mibgroup/util_funcs/get_pid_from_inode.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/net-snmp-config.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/system/linux.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/system/sysv.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/system/generic.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/machine/generic.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/net-snmp-includes.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/definitions.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/types.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/types.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmp_api.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/varbind_api.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmp_client.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/pdu_api.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/asn1.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/session_api.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/callback.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmp_transport.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmp_service.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/ucd_compat.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/mib.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/mib_api.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/parse.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/oid_stash.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmp_impl.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmp.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmp-tc.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/getopt.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/utilities.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/system.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/tools.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/int64.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/mt_support.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmp_alarm.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/data_list.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/check_varbind.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/factory.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmp_logging.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/container_binary_array.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/container_list_ssll.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/container_iterator.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/container.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmp_assert.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/version.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/config_api.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/read_config.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/default_store.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmp_enum.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/vacm.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/output_api.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmp_debug.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/snmpv3_api.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmpv3.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/transform_oids.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/keytools.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/scapi.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/lcd_time.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmp_secmod.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/snmpusm.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/mib_module_config.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/agent_module_config.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/snmp_agent.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/snmp_vars.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/agent_handler.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/var_struct.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/agent_registry.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/library/fd_event_manager.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/ds_agent.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/agent_read_config.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/agent_trap.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/all_helpers.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/instance.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/baby_steps.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/scalar.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/scalar_group.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/watcher.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/multiplexer.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/null.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/debug_handler.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/cache_handler.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/old_api.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/read_only.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/row_merge.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/serialize.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/mode_end_call.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/table.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/table_data.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/table_dataset.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/table_tdata.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/table_iterator.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/table_container.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/table_array.h
+./sctp-mib/sctpTables_solaris2.lo: ../../include/net-snmp/agent/mfd.h
+./sctp-mib/sctpTables_solaris2.lo: ./sctp-mib/sctpAssocTable.h
+./sctp-mib/sctpTables_solaris2.lo: ./sctp-mib/sctpTables_common.h
+./sctp-mib/sctpTables_solaris2.lo: ./sctp-mib/sctpAssocLocalAddrTable.h
+./sctp-mib/sctpTables_solaris2.lo: ./sctp-mib/sctpAssocRemAddrTable.h
+./sctp-mib/sctpTables_solaris2.lo: util_funcs.h util_funcs/header_generic.h
+./sctp-mib/sctpTables_solaris2.lo: util_funcs/header_simple_table.h struct.h
+./sctp-mib/sctpTables_solaris2.lo: util_funcs/MIB_STATS_CACHE_TIMEOUT.h
+./sctp-mib/sctpTables_solaris2.lo: kernel_sunos5.h
 ./smux/smux.lo: ../../include/net-snmp/net-snmp-config.h
 ./smux/smux.lo: ../../include/net-snmp/system/linux.h
 ./smux/smux.lo: ../../include/net-snmp/system/sysv.h
@@ -9703,32 +11200,14 @@
 ./smux/smux.lo: ../../include/net-snmp/net-snmp-includes.h
 ./smux/smux.lo: ../../include/net-snmp/definitions.h
 ./smux/smux.lo: ../../include/net-snmp/types.h
+./smux/smux.lo: ../../include/net-snmp/library/types.h
 ./smux/smux.lo: ../../include/net-snmp/library/snmp_api.h
-./smux/smux.lo: ../../include/net-snmp/library/asn1.h
-./smux/smux.lo: ../../include/net-snmp/library/snmp_impl.h
-./smux/smux.lo: ../../include/net-snmp/library/snmp.h
-./smux/smux.lo: ../../include/net-snmp/library/snmp-tc.h
-./smux/smux.lo: ../../include/net-snmp/utilities.h
+./smux/smux.lo: ../../include/net-snmp/varbind_api.h
 ./smux/smux.lo: ../../include/net-snmp/library/snmp_client.h
-./smux/smux.lo: ../../include/net-snmp/library/system.h
-./smux/smux.lo: ../../include/net-snmp/library/tools.h
-./smux/smux.lo: ../../include/net-snmp/library/int64.h
-./smux/smux.lo: ../../include/net-snmp/library/mt_support.h
-./smux/smux.lo: ../../include/net-snmp/library/snmp_alarm.h
-./smux/smux.lo: ../../include/net-snmp/library/callback.h
-./smux/smux.lo: ../../include/net-snmp/library/data_list.h
-./smux/smux.lo: ../../include/net-snmp/library/oid_stash.h
-./smux/smux.lo: ../../include/net-snmp/library/check_varbind.h
-./smux/smux.lo: ../../include/net-snmp/library/container.h
-./smux/smux.lo: ../../include/net-snmp/library/factory.h
-./smux/smux.lo: ../../include/net-snmp/library/snmp_logging.h
-./smux/smux.lo: ../../include/net-snmp/library/container_binary_array.h
-./smux/smux.lo: ../../include/net-snmp/library/container_list_ssll.h
-./smux/smux.lo: ../../include/net-snmp/library/container_iterator.h
-./smux/smux.lo: ../../include/net-snmp/library/container.h
-./smux/smux.lo: ../../include/net-snmp/library/snmp_assert.h
-./smux/smux.lo: ../../include/net-snmp/version.h
+./smux/smux.lo: ../../include/net-snmp/pdu_api.h
+./smux/smux.lo: ../../include/net-snmp/library/asn1.h
 ./smux/smux.lo: ../../include/net-snmp/session_api.h
+./smux/smux.lo: ../../include/net-snmp/library/callback.h
 ./smux/smux.lo: ../../include/net-snmp/library/snmp_transport.h
 ./smux/smux.lo: ../../include/net-snmp/library/snmp_service.h
 ./smux/smux.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -9739,11 +11218,31 @@
 ./smux/smux.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./smux/smux.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./smux/smux.lo: ../../include/net-snmp/library/ucd_compat.h
-./smux/smux.lo: ../../include/net-snmp/pdu_api.h
-./smux/smux.lo: ../../include/net-snmp/mib_api.h
 ./smux/smux.lo: ../../include/net-snmp/library/mib.h
+./smux/smux.lo: ../../include/net-snmp/mib_api.h
 ./smux/smux.lo: ../../include/net-snmp/library/parse.h
-./smux/smux.lo: ../../include/net-snmp/varbind_api.h
+./smux/smux.lo: ../../include/net-snmp/library/oid_stash.h
+./smux/smux.lo: ../../include/net-snmp/library/snmp_impl.h
+./smux/smux.lo: ../../include/net-snmp/library/snmp.h
+./smux/smux.lo: ../../include/net-snmp/library/snmp-tc.h
+./smux/smux.lo: ../../include/net-snmp/library/getopt.h
+./smux/smux.lo: ../../include/net-snmp/utilities.h
+./smux/smux.lo: ../../include/net-snmp/library/system.h
+./smux/smux.lo: ../../include/net-snmp/library/tools.h
+./smux/smux.lo: ../../include/net-snmp/library/int64.h
+./smux/smux.lo: ../../include/net-snmp/library/mt_support.h
+./smux/smux.lo: ../../include/net-snmp/library/snmp_alarm.h
+./smux/smux.lo: ../../include/net-snmp/library/data_list.h
+./smux/smux.lo: ../../include/net-snmp/library/check_varbind.h
+./smux/smux.lo: ../../include/net-snmp/library/container.h
+./smux/smux.lo: ../../include/net-snmp/library/factory.h
+./smux/smux.lo: ../../include/net-snmp/library/snmp_logging.h
+./smux/smux.lo: ../../include/net-snmp/library/container_binary_array.h
+./smux/smux.lo: ../../include/net-snmp/library/container_list_ssll.h
+./smux/smux.lo: ../../include/net-snmp/library/container_iterator.h
+./smux/smux.lo: ../../include/net-snmp/library/container.h
+./smux/smux.lo: ../../include/net-snmp/library/snmp_assert.h
+./smux/smux.lo: ../../include/net-snmp/version.h
 ./smux/smux.lo: ../../include/net-snmp/config_api.h
 ./smux/smux.lo: ../../include/net-snmp/library/read_config.h
 ./smux/smux.lo: ../../include/net-snmp/library/default_store.h
@@ -9796,8 +11295,8 @@
 ./smux/smux.lo: ../../include/net-snmp/agent/table_iterator.h
 ./smux/smux.lo: ../../include/net-snmp/agent/table_container.h
 ./smux/smux.lo: ../../include/net-snmp/agent/table_array.h
-./smux/smux.lo: ../../include/net-snmp/agent/mfd.h smux.h util_funcs.h
-./smux/smux.lo: struct.h mibdefs.h ../../agent/snmpd.h
+./smux/smux.lo: ../../include/net-snmp/agent/mfd.h smux.h mibdefs.h
+./smux/smux.lo: ../../agent/snmpd.h
 ./smux/snmp_bgp.lo: ../../include/net-snmp/net-snmp-config.h
 ./smux/snmp_bgp.lo: ../../include/net-snmp/system/linux.h
 ./smux/snmp_bgp.lo: ../../include/net-snmp/system/sysv.h
@@ -9806,32 +11305,14 @@
 ./smux/snmp_bgp.lo: ../../include/net-snmp/net-snmp-includes.h
 ./smux/snmp_bgp.lo: ../../include/net-snmp/definitions.h
 ./smux/snmp_bgp.lo: ../../include/net-snmp/types.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/types.h
 ./smux/snmp_bgp.lo: ../../include/net-snmp/library/snmp_api.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/library/asn1.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/library/snmp_impl.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/library/snmp.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/library/snmp-tc.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/utilities.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/varbind_api.h
 ./smux/snmp_bgp.lo: ../../include/net-snmp/library/snmp_client.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/library/system.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/library/tools.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/library/int64.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/library/mt_support.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/library/snmp_alarm.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/library/callback.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/library/data_list.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/library/oid_stash.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/library/check_varbind.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/library/container.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/library/factory.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/library/snmp_logging.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/library/container_binary_array.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/library/container_list_ssll.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/library/container_iterator.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/library/container.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/library/snmp_assert.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/version.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/pdu_api.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/asn1.h
 ./smux/snmp_bgp.lo: ../../include/net-snmp/session_api.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/callback.h
 ./smux/snmp_bgp.lo: ../../include/net-snmp/library/snmp_transport.h
 ./smux/snmp_bgp.lo: ../../include/net-snmp/library/snmp_service.h
 ./smux/snmp_bgp.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -9842,11 +11323,31 @@
 ./smux/snmp_bgp.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./smux/snmp_bgp.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./smux/snmp_bgp.lo: ../../include/net-snmp/library/ucd_compat.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/pdu_api.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/mib_api.h
 ./smux/snmp_bgp.lo: ../../include/net-snmp/library/mib.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/mib_api.h
 ./smux/snmp_bgp.lo: ../../include/net-snmp/library/parse.h
-./smux/snmp_bgp.lo: ../../include/net-snmp/varbind_api.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/oid_stash.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/snmp_impl.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/snmp.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/snmp-tc.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/getopt.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/utilities.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/system.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/tools.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/int64.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/mt_support.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/snmp_alarm.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/data_list.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/check_varbind.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/container.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/factory.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/snmp_logging.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/container_binary_array.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/container_list_ssll.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/container_iterator.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/container.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/library/snmp_assert.h
+./smux/snmp_bgp.lo: ../../include/net-snmp/version.h
 ./smux/snmp_bgp.lo: ../../include/net-snmp/config_api.h
 ./smux/snmp_bgp.lo: ../../include/net-snmp/library/read_config.h
 ./smux/snmp_bgp.lo: ../../include/net-snmp/library/default_store.h
@@ -9909,32 +11410,14 @@
 ./smux/snmp_ospf.lo: ../../include/net-snmp/net-snmp-includes.h
 ./smux/snmp_ospf.lo: ../../include/net-snmp/definitions.h
 ./smux/snmp_ospf.lo: ../../include/net-snmp/types.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/types.h
 ./smux/snmp_ospf.lo: ../../include/net-snmp/library/snmp_api.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/library/asn1.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/library/snmp_impl.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/library/snmp.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/library/snmp-tc.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/utilities.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/varbind_api.h
 ./smux/snmp_ospf.lo: ../../include/net-snmp/library/snmp_client.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/library/system.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/library/tools.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/library/int64.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/library/mt_support.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/library/snmp_alarm.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/library/callback.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/library/data_list.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/library/oid_stash.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/library/check_varbind.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/library/container.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/library/factory.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/library/snmp_logging.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/library/container_binary_array.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/library/container_list_ssll.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/library/container_iterator.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/library/container.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/library/snmp_assert.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/version.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/pdu_api.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/asn1.h
 ./smux/snmp_ospf.lo: ../../include/net-snmp/session_api.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/callback.h
 ./smux/snmp_ospf.lo: ../../include/net-snmp/library/snmp_transport.h
 ./smux/snmp_ospf.lo: ../../include/net-snmp/library/snmp_service.h
 ./smux/snmp_ospf.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -9945,11 +11428,31 @@
 ./smux/snmp_ospf.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./smux/snmp_ospf.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./smux/snmp_ospf.lo: ../../include/net-snmp/library/ucd_compat.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/pdu_api.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/mib_api.h
 ./smux/snmp_ospf.lo: ../../include/net-snmp/library/mib.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/mib_api.h
 ./smux/snmp_ospf.lo: ../../include/net-snmp/library/parse.h
-./smux/snmp_ospf.lo: ../../include/net-snmp/varbind_api.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/oid_stash.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/snmp_impl.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/snmp.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/snmp-tc.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/getopt.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/utilities.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/system.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/tools.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/int64.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/mt_support.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/snmp_alarm.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/data_list.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/check_varbind.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/container.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/factory.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/snmp_logging.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/container_binary_array.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/container_list_ssll.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/container_iterator.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/container.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/library/snmp_assert.h
+./smux/snmp_ospf.lo: ../../include/net-snmp/version.h
 ./smux/snmp_ospf.lo: ../../include/net-snmp/config_api.h
 ./smux/snmp_ospf.lo: ../../include/net-snmp/library/read_config.h
 ./smux/snmp_ospf.lo: ../../include/net-snmp/library/default_store.h
@@ -10012,32 +11515,14 @@
 ./smux/snmp_rip2.lo: ../../include/net-snmp/net-snmp-includes.h
 ./smux/snmp_rip2.lo: ../../include/net-snmp/definitions.h
 ./smux/snmp_rip2.lo: ../../include/net-snmp/types.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/types.h
 ./smux/snmp_rip2.lo: ../../include/net-snmp/library/snmp_api.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/library/asn1.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/library/snmp_impl.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/library/snmp.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/library/snmp-tc.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/utilities.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/varbind_api.h
 ./smux/snmp_rip2.lo: ../../include/net-snmp/library/snmp_client.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/library/system.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/library/tools.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/library/int64.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/library/mt_support.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/library/snmp_alarm.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/library/callback.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/library/data_list.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/library/oid_stash.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/library/check_varbind.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/library/container.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/library/factory.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/library/snmp_logging.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/library/container_binary_array.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/library/container_list_ssll.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/library/container_iterator.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/library/container.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/library/snmp_assert.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/version.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/pdu_api.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/asn1.h
 ./smux/snmp_rip2.lo: ../../include/net-snmp/session_api.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/callback.h
 ./smux/snmp_rip2.lo: ../../include/net-snmp/library/snmp_transport.h
 ./smux/snmp_rip2.lo: ../../include/net-snmp/library/snmp_service.h
 ./smux/snmp_rip2.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -10048,11 +11533,31 @@
 ./smux/snmp_rip2.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./smux/snmp_rip2.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./smux/snmp_rip2.lo: ../../include/net-snmp/library/ucd_compat.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/pdu_api.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/mib_api.h
 ./smux/snmp_rip2.lo: ../../include/net-snmp/library/mib.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/mib_api.h
 ./smux/snmp_rip2.lo: ../../include/net-snmp/library/parse.h
-./smux/snmp_rip2.lo: ../../include/net-snmp/varbind_api.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/oid_stash.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/snmp_impl.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/snmp.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/snmp-tc.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/getopt.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/utilities.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/system.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/tools.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/int64.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/mt_support.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/snmp_alarm.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/data_list.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/check_varbind.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/container.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/factory.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/snmp_logging.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/container_binary_array.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/container_list_ssll.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/container_iterator.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/container.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/library/snmp_assert.h
+./smux/snmp_rip2.lo: ../../include/net-snmp/version.h
 ./smux/snmp_rip2.lo: ../../include/net-snmp/config_api.h
 ./smux/snmp_rip2.lo: ../../include/net-snmp/library/read_config.h
 ./smux/snmp_rip2.lo: ../../include/net-snmp/library/default_store.h
@@ -10115,32 +11620,14 @@
 ./snmpv3/snmpEngine.lo: ../../include/net-snmp/net-snmp-includes.h
 ./snmpv3/snmpEngine.lo: ../../include/net-snmp/definitions.h
 ./snmpv3/snmpEngine.lo: ../../include/net-snmp/types.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/types.h
 ./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/snmp_api.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/asn1.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/snmp_impl.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/snmp.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/snmp-tc.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/utilities.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/varbind_api.h
 ./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/snmp_client.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/system.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/tools.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/int64.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/mt_support.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/snmp_alarm.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/callback.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/data_list.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/oid_stash.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/check_varbind.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/container.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/factory.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/snmp_logging.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/container_binary_array.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/container_list_ssll.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/container_iterator.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/container.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/snmp_assert.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/version.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/pdu_api.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/asn1.h
 ./snmpv3/snmpEngine.lo: ../../include/net-snmp/session_api.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/callback.h
 ./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/snmp_transport.h
 ./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/snmp_service.h
 ./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -10151,11 +11638,31 @@
 ./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/ucd_compat.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/pdu_api.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/mib_api.h
 ./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/mib.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/mib_api.h
 ./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/parse.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/varbind_api.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/oid_stash.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/snmp_impl.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/snmp.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/snmp-tc.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/getopt.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/utilities.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/system.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/tools.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/int64.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/mt_support.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/snmp_alarm.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/data_list.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/check_varbind.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/container.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/factory.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/snmp_logging.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/container_binary_array.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/container_list_ssll.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/container_iterator.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/container.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/snmp_assert.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/version.h
 ./snmpv3/snmpEngine.lo: ../../include/net-snmp/config_api.h
 ./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/read_config.h
 ./snmpv3/snmpEngine.lo: ../../include/net-snmp/library/default_store.h
@@ -10208,8 +11715,118 @@
 ./snmpv3/snmpEngine.lo: ../../include/net-snmp/agent/table_iterator.h
 ./snmpv3/snmpEngine.lo: ../../include/net-snmp/agent/table_container.h
 ./snmpv3/snmpEngine.lo: ../../include/net-snmp/agent/table_array.h
-./snmpv3/snmpEngine.lo: ../../include/net-snmp/agent/mfd.h util_funcs.h
-./snmpv3/snmpEngine.lo: struct.h mibII/sysORTable.h ./snmpv3/snmpEngine.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/agent/mfd.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/agent/sysORTable.h
+./snmpv3/snmpEngine.lo: ../../include/net-snmp/agent/agent_callbacks.h
+./snmpv3/snmpEngine.lo: util_funcs/header_generic.h ./snmpv3/snmpEngine.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/net-snmp-config.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/system/linux.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/system/sysv.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/system/generic.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/machine/generic.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/net-snmp-includes.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/definitions.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/types.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/types.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmp_api.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/varbind_api.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmp_client.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/pdu_api.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/asn1.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/session_api.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/callback.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmp_transport.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmp_service.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/ucd_compat.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/mib.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/mib_api.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/parse.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/oid_stash.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmp_impl.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmp.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmp-tc.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/getopt.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/utilities.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/system.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/tools.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/int64.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/mt_support.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmp_alarm.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/data_list.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/check_varbind.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/container.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/factory.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmp_logging.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/container_binary_array.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/container_list_ssll.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/container_iterator.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/container.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmp_assert.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/version.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/config_api.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/read_config.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/default_store.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmp_enum.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/vacm.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/output_api.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmp_debug.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/snmpv3_api.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmpv3.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/transform_oids.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/keytools.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/scapi.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/lcd_time.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmp_secmod.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/snmpusm.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/mib_module_config.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/agent_module_config.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/snmp_agent.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/snmp_vars.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/agent_handler.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/var_struct.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/agent_registry.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/library/fd_event_manager.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/ds_agent.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/agent_read_config.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/agent_trap.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/all_helpers.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/instance.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/baby_steps.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/scalar.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/scalar_group.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/watcher.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/multiplexer.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/null.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/debug_handler.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/cache_handler.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/old_api.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/read_only.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/row_merge.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/serialize.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/mode_end_call.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/table.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/table_data.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/table_dataset.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/table_tdata.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/table_iterator.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/table_container.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/table_array.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/mfd.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/sysORTable.h
+./snmpv3/snmpMPDStats_5_5.lo: ../../include/net-snmp/agent/agent_callbacks.h
+./snmpv3/snmpMPDStats_5_5.lo: ./snmpv3/snmpMPDStats_5_5.h
+./snmpv3/snmpMPDStats_5_5.lo: ./utilities/snmp_get_statistic.h
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/net-snmp-config.h
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/system/linux.h
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/system/sysv.h
@@ -10218,32 +11835,14 @@
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/net-snmp-includes.h
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/definitions.h
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/types.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/types.h
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/snmp_api.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/asn1.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/snmp_impl.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/snmp.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/snmp-tc.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/utilities.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/varbind_api.h
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/snmp_client.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/system.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/tools.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/int64.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/mt_support.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/snmp_alarm.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/callback.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/data_list.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/oid_stash.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/check_varbind.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/container.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/factory.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/snmp_logging.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/container_binary_array.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/container_list_ssll.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/container_iterator.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/container.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/snmp_assert.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/version.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/pdu_api.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/asn1.h
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/session_api.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/callback.h
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/snmp_transport.h
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/snmp_service.h
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -10254,11 +11853,31 @@
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/ucd_compat.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/pdu_api.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/mib_api.h
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/mib.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/mib_api.h
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/parse.h
-./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/varbind_api.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/oid_stash.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/snmp_impl.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/snmp.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/snmp-tc.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/getopt.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/utilities.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/system.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/tools.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/int64.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/mt_support.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/snmp_alarm.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/data_list.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/check_varbind.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/container.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/factory.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/snmp_logging.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/container_binary_array.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/container_list_ssll.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/container_iterator.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/container.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/snmp_assert.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/version.h
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/config_api.h
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/read_config.h
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/library/default_store.h
@@ -10312,8 +11931,9 @@
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/agent/table_container.h
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/agent/table_array.h
 ./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/agent/mfd.h
-./snmpv3/snmpMPDStats.lo: mibII/sysORTable.h ./snmpv3/snmpMPDStats.h
-./snmpv3/snmpMPDStats.lo: util_funcs.h struct.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/agent/sysORTable.h
+./snmpv3/snmpMPDStats.lo: ../../include/net-snmp/agent/agent_callbacks.h
+./snmpv3/snmpMPDStats.lo: ./snmpv3/snmpMPDStats.h util_funcs/header_generic.h
 ./snmpv3/usmConf.lo: ../../include/net-snmp/net-snmp-config.h
 ./snmpv3/usmConf.lo: ../../include/net-snmp/system/linux.h
 ./snmpv3/usmConf.lo: ../../include/net-snmp/system/sysv.h
@@ -10322,32 +11942,14 @@
 ./snmpv3/usmConf.lo: ../../include/net-snmp/net-snmp-includes.h
 ./snmpv3/usmConf.lo: ../../include/net-snmp/definitions.h
 ./snmpv3/usmConf.lo: ../../include/net-snmp/types.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/types.h
 ./snmpv3/usmConf.lo: ../../include/net-snmp/library/snmp_api.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/library/asn1.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/library/snmp_impl.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/library/snmp.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/library/snmp-tc.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/utilities.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/varbind_api.h
 ./snmpv3/usmConf.lo: ../../include/net-snmp/library/snmp_client.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/library/system.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/library/tools.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/library/int64.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/library/mt_support.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/library/snmp_alarm.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/library/callback.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/library/data_list.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/library/oid_stash.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/library/check_varbind.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/library/container.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/library/factory.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/library/snmp_logging.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/library/container_binary_array.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/library/container_list_ssll.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/library/container_iterator.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/library/container.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/library/snmp_assert.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/version.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/pdu_api.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/asn1.h
 ./snmpv3/usmConf.lo: ../../include/net-snmp/session_api.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/callback.h
 ./snmpv3/usmConf.lo: ../../include/net-snmp/library/snmp_transport.h
 ./snmpv3/usmConf.lo: ../../include/net-snmp/library/snmp_service.h
 ./snmpv3/usmConf.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -10358,11 +11960,31 @@
 ./snmpv3/usmConf.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./snmpv3/usmConf.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./snmpv3/usmConf.lo: ../../include/net-snmp/library/ucd_compat.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/pdu_api.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/mib_api.h
 ./snmpv3/usmConf.lo: ../../include/net-snmp/library/mib.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/mib_api.h
 ./snmpv3/usmConf.lo: ../../include/net-snmp/library/parse.h
-./snmpv3/usmConf.lo: ../../include/net-snmp/varbind_api.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/oid_stash.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/snmp_impl.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/snmp.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/snmp-tc.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/getopt.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/utilities.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/system.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/tools.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/int64.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/mt_support.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/snmp_alarm.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/data_list.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/check_varbind.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/container.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/factory.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/snmp_logging.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/container_binary_array.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/container_list_ssll.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/container_iterator.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/container.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/library/snmp_assert.h
+./snmpv3/usmConf.lo: ../../include/net-snmp/version.h
 ./snmpv3/usmConf.lo: ../../include/net-snmp/config_api.h
 ./snmpv3/usmConf.lo: ../../include/net-snmp/library/read_config.h
 ./snmpv3/usmConf.lo: ../../include/net-snmp/library/default_store.h
@@ -10416,6 +12038,114 @@
 ./snmpv3/usmConf.lo: ../../include/net-snmp/agent/table_container.h
 ./snmpv3/usmConf.lo: ../../include/net-snmp/agent/table_array.h
 ./snmpv3/usmConf.lo: ../../include/net-snmp/agent/mfd.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/net-snmp-config.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/system/linux.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/system/sysv.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/system/generic.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/machine/generic.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/net-snmp-includes.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/definitions.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/types.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/types.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmp_api.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/varbind_api.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmp_client.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/pdu_api.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/asn1.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/session_api.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/callback.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmp_transport.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmp_service.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/ucd_compat.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/mib.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/mib_api.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/parse.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/oid_stash.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmp_impl.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmp.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmp-tc.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/getopt.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/utilities.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/system.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/tools.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/int64.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/mt_support.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmp_alarm.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/data_list.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/check_varbind.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/container.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/factory.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmp_logging.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/container_binary_array.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/container_list_ssll.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/container_iterator.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/container.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmp_assert.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/version.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/config_api.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/read_config.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/default_store.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmp_enum.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/vacm.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/output_api.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmp_debug.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/snmpv3_api.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmpv3.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/transform_oids.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/keytools.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/scapi.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/lcd_time.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmp_secmod.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/snmpusm.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/mib_module_config.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/agent_module_config.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/snmp_agent.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/snmp_vars.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/agent_handler.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/var_struct.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/agent_registry.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/library/fd_event_manager.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/ds_agent.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/agent_read_config.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/agent_trap.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/all_helpers.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/instance.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/baby_steps.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/scalar.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/scalar_group.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/watcher.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/multiplexer.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/null.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/debug_handler.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/cache_handler.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/old_api.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/read_only.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/row_merge.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/serialize.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/mode_end_call.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/table.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/table_data.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/table_dataset.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/table_tdata.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/table_iterator.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/table_container.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/table_array.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/mfd.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/sysORTable.h
+./snmpv3/usmStats_5_5.lo: ../../include/net-snmp/agent/agent_callbacks.h
+./snmpv3/usmStats_5_5.lo: ./snmpv3/usmStats_5_5.h
+./snmpv3/usmStats_5_5.lo: ./utilities/snmp_get_statistic.h
 ./snmpv3/usmStats.lo: ../../include/net-snmp/net-snmp-config.h
 ./snmpv3/usmStats.lo: ../../include/net-snmp/system/linux.h
 ./snmpv3/usmStats.lo: ../../include/net-snmp/system/sysv.h
@@ -10424,32 +12154,14 @@
 ./snmpv3/usmStats.lo: ../../include/net-snmp/net-snmp-includes.h
 ./snmpv3/usmStats.lo: ../../include/net-snmp/definitions.h
 ./snmpv3/usmStats.lo: ../../include/net-snmp/types.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/types.h
 ./snmpv3/usmStats.lo: ../../include/net-snmp/library/snmp_api.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/library/asn1.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/library/snmp_impl.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/library/snmp.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/library/snmp-tc.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/utilities.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/varbind_api.h
 ./snmpv3/usmStats.lo: ../../include/net-snmp/library/snmp_client.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/library/system.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/library/tools.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/library/int64.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/library/mt_support.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/library/snmp_alarm.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/library/callback.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/library/data_list.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/library/oid_stash.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/library/check_varbind.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/library/container.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/library/factory.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/library/snmp_logging.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/library/container_binary_array.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/library/container_list_ssll.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/library/container_iterator.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/library/container.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/library/snmp_assert.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/version.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/pdu_api.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/asn1.h
 ./snmpv3/usmStats.lo: ../../include/net-snmp/session_api.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/callback.h
 ./snmpv3/usmStats.lo: ../../include/net-snmp/library/snmp_transport.h
 ./snmpv3/usmStats.lo: ../../include/net-snmp/library/snmp_service.h
 ./snmpv3/usmStats.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -10460,11 +12172,31 @@
 ./snmpv3/usmStats.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./snmpv3/usmStats.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./snmpv3/usmStats.lo: ../../include/net-snmp/library/ucd_compat.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/pdu_api.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/mib_api.h
 ./snmpv3/usmStats.lo: ../../include/net-snmp/library/mib.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/mib_api.h
 ./snmpv3/usmStats.lo: ../../include/net-snmp/library/parse.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/varbind_api.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/oid_stash.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/snmp_impl.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/snmp.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/snmp-tc.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/getopt.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/utilities.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/system.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/tools.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/int64.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/mt_support.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/snmp_alarm.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/data_list.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/check_varbind.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/container.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/factory.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/snmp_logging.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/container_binary_array.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/container_list_ssll.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/container_iterator.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/container.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/library/snmp_assert.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/version.h
 ./snmpv3/usmStats.lo: ../../include/net-snmp/config_api.h
 ./snmpv3/usmStats.lo: ../../include/net-snmp/library/read_config.h
 ./snmpv3/usmStats.lo: ../../include/net-snmp/library/default_store.h
@@ -10517,8 +12249,10 @@
 ./snmpv3/usmStats.lo: ../../include/net-snmp/agent/table_iterator.h
 ./snmpv3/usmStats.lo: ../../include/net-snmp/agent/table_container.h
 ./snmpv3/usmStats.lo: ../../include/net-snmp/agent/table_array.h
-./snmpv3/usmStats.lo: ../../include/net-snmp/agent/mfd.h util_funcs.h
-./snmpv3/usmStats.lo: struct.h mibII/sysORTable.h ./snmpv3/usmStats.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/agent/mfd.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/agent/sysORTable.h
+./snmpv3/usmStats.lo: ../../include/net-snmp/agent/agent_callbacks.h
+./snmpv3/usmStats.lo: util_funcs/header_generic.h ./snmpv3/usmStats.h
 ./snmpv3/usmUser.lo: ../../include/net-snmp/net-snmp-config.h
 ./snmpv3/usmUser.lo: ../../include/net-snmp/system/linux.h
 ./snmpv3/usmUser.lo: ../../include/net-snmp/system/sysv.h
@@ -10527,32 +12261,14 @@
 ./snmpv3/usmUser.lo: ../../include/net-snmp/net-snmp-includes.h
 ./snmpv3/usmUser.lo: ../../include/net-snmp/definitions.h
 ./snmpv3/usmUser.lo: ../../include/net-snmp/types.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/types.h
 ./snmpv3/usmUser.lo: ../../include/net-snmp/library/snmp_api.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/library/asn1.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/library/snmp_impl.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/library/snmp.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/library/snmp-tc.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/utilities.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/varbind_api.h
 ./snmpv3/usmUser.lo: ../../include/net-snmp/library/snmp_client.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/library/system.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/library/tools.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/library/int64.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/library/mt_support.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/library/snmp_alarm.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/library/callback.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/library/data_list.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/library/oid_stash.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/library/check_varbind.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/library/container.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/library/factory.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/library/snmp_logging.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/library/container_binary_array.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/library/container_list_ssll.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/library/container_iterator.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/library/container.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/library/snmp_assert.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/version.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/pdu_api.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/asn1.h
 ./snmpv3/usmUser.lo: ../../include/net-snmp/session_api.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/callback.h
 ./snmpv3/usmUser.lo: ../../include/net-snmp/library/snmp_transport.h
 ./snmpv3/usmUser.lo: ../../include/net-snmp/library/snmp_service.h
 ./snmpv3/usmUser.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -10563,11 +12279,31 @@
 ./snmpv3/usmUser.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./snmpv3/usmUser.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./snmpv3/usmUser.lo: ../../include/net-snmp/library/ucd_compat.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/pdu_api.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/mib_api.h
 ./snmpv3/usmUser.lo: ../../include/net-snmp/library/mib.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/mib_api.h
 ./snmpv3/usmUser.lo: ../../include/net-snmp/library/parse.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/varbind_api.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/oid_stash.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/snmp_impl.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/snmp.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/snmp-tc.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/getopt.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/utilities.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/system.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/tools.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/int64.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/mt_support.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/snmp_alarm.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/data_list.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/check_varbind.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/container.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/factory.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/snmp_logging.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/container_binary_array.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/container_list_ssll.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/container_iterator.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/container.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/library/snmp_assert.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/version.h
 ./snmpv3/usmUser.lo: ../../include/net-snmp/config_api.h
 ./snmpv3/usmUser.lo: ../../include/net-snmp/library/read_config.h
 ./snmpv3/usmUser.lo: ../../include/net-snmp/library/default_store.h
@@ -10620,8 +12356,8 @@
 ./snmpv3/usmUser.lo: ../../include/net-snmp/agent/table_iterator.h
 ./snmpv3/usmUser.lo: ../../include/net-snmp/agent/table_container.h
 ./snmpv3/usmUser.lo: ../../include/net-snmp/agent/table_array.h
-./snmpv3/usmUser.lo: ../../include/net-snmp/agent/mfd.h util_funcs.h struct.h
-./snmpv3/usmUser.lo: ./snmpv3/usmUser.h
+./snmpv3/usmUser.lo: ../../include/net-snmp/agent/mfd.h
+./snmpv3/usmUser.lo: util_funcs/header_generic.h ./snmpv3/usmUser.h
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/net-snmp-config.h
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/system/linux.h
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/system/sysv.h
@@ -10630,32 +12366,14 @@
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/net-snmp-includes.h
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/definitions.h
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/types.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/types.h
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/snmp_api.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/asn1.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/snmp_impl.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/snmp.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/snmp-tc.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/utilities.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/varbind_api.h
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/snmp_client.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/system.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/tools.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/int64.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/mt_support.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/snmp_alarm.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/callback.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/data_list.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/oid_stash.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/check_varbind.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/container.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/factory.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/snmp_logging.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/container_binary_array.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/container_list_ssll.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/container_iterator.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/container.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/snmp_assert.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/version.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/pdu_api.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/asn1.h
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/session_api.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/callback.h
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/snmp_transport.h
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/snmp_service.h
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -10666,11 +12384,31 @@
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/ucd_compat.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/pdu_api.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/mib_api.h
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/mib.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/mib_api.h
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/parse.h
-./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/varbind_api.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/oid_stash.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/snmp_impl.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/snmp.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/snmp-tc.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/getopt.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/utilities.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/system.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/tools.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/int64.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/mt_support.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/snmp_alarm.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/data_list.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/check_varbind.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/container.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/factory.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/snmp_logging.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/container_binary_array.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/container_list_ssll.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/container_iterator.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/container.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/snmp_assert.h
+./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/version.h
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/config_api.h
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/read_config.h
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/library/default_store.h
@@ -10724,8 +12462,8 @@
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/agent/table_container.h
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/agent/table_array.h
 ./target/snmpTargetAddrEntry.lo: ../../include/net-snmp/agent/mfd.h
-./target/snmpTargetAddrEntry.lo: ./target/snmpTargetAddrEntry.h util_funcs.h
-./target/snmpTargetAddrEntry.lo: struct.h
+./target/snmpTargetAddrEntry.lo: ./target/snmpTargetAddrEntry.h
+./target/snmpTargetAddrEntry.lo: util_funcs/header_generic.h
 ./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/net-snmp-config.h
 ./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/system/linux.h
 ./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/system/sysv.h
@@ -10734,32 +12472,14 @@
 ./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/net-snmp-includes.h
 ./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/definitions.h
 ./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/types.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/types.h
 ./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/snmp_api.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/asn1.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/snmp_impl.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/snmp.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/snmp-tc.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/utilities.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/varbind_api.h
 ./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/snmp_client.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/system.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/tools.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/int64.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/mt_support.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/snmp_alarm.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/callback.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/data_list.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/oid_stash.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/check_varbind.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/container.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/factory.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/snmp_logging.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/container_binary_array.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/container_list_ssll.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/container_iterator.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/container.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/snmp_assert.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/version.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/pdu_api.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/asn1.h
 ./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/session_api.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/callback.h
 ./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/snmp_transport.h
 ./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/snmp_service.h
 ./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -10770,11 +12490,31 @@
 ./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/ucd_compat.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/pdu_api.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/mib_api.h
 ./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/mib.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/mib_api.h
 ./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/parse.h
-./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/varbind_api.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/oid_stash.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/snmp_impl.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/snmp.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/snmp-tc.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/getopt.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/utilities.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/system.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/tools.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/int64.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/mt_support.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/snmp_alarm.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/data_list.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/check_varbind.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/container.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/factory.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/snmp_logging.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/container_binary_array.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/container_list_ssll.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/container_iterator.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/container.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/snmp_assert.h
+./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/version.h
 ./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/config_api.h
 ./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/read_config.h
 ./target/snmpTargetParamsEntry.lo: ../../include/net-snmp/library/default_store.h
@@ -10837,32 +12577,14 @@
 ./target/target.lo: ../../include/net-snmp/net-snmp-includes.h
 ./target/target.lo: ../../include/net-snmp/definitions.h
 ./target/target.lo: ../../include/net-snmp/types.h
+./target/target.lo: ../../include/net-snmp/library/types.h
 ./target/target.lo: ../../include/net-snmp/library/snmp_api.h
-./target/target.lo: ../../include/net-snmp/library/asn1.h
-./target/target.lo: ../../include/net-snmp/library/snmp_impl.h
-./target/target.lo: ../../include/net-snmp/library/snmp.h
-./target/target.lo: ../../include/net-snmp/library/snmp-tc.h
-./target/target.lo: ../../include/net-snmp/utilities.h
+./target/target.lo: ../../include/net-snmp/varbind_api.h
 ./target/target.lo: ../../include/net-snmp/library/snmp_client.h
-./target/target.lo: ../../include/net-snmp/library/system.h
-./target/target.lo: ../../include/net-snmp/library/tools.h
-./target/target.lo: ../../include/net-snmp/library/int64.h
-./target/target.lo: ../../include/net-snmp/library/mt_support.h
-./target/target.lo: ../../include/net-snmp/library/snmp_alarm.h
-./target/target.lo: ../../include/net-snmp/library/callback.h
-./target/target.lo: ../../include/net-snmp/library/data_list.h
-./target/target.lo: ../../include/net-snmp/library/oid_stash.h
-./target/target.lo: ../../include/net-snmp/library/check_varbind.h
-./target/target.lo: ../../include/net-snmp/library/container.h
-./target/target.lo: ../../include/net-snmp/library/factory.h
-./target/target.lo: ../../include/net-snmp/library/snmp_logging.h
-./target/target.lo: ../../include/net-snmp/library/container_binary_array.h
-./target/target.lo: ../../include/net-snmp/library/container_list_ssll.h
-./target/target.lo: ../../include/net-snmp/library/container_iterator.h
-./target/target.lo: ../../include/net-snmp/library/container.h
-./target/target.lo: ../../include/net-snmp/library/snmp_assert.h
-./target/target.lo: ../../include/net-snmp/version.h
+./target/target.lo: ../../include/net-snmp/pdu_api.h
+./target/target.lo: ../../include/net-snmp/library/asn1.h
 ./target/target.lo: ../../include/net-snmp/session_api.h
+./target/target.lo: ../../include/net-snmp/library/callback.h
 ./target/target.lo: ../../include/net-snmp/library/snmp_transport.h
 ./target/target.lo: ../../include/net-snmp/library/snmp_service.h
 ./target/target.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -10873,11 +12595,31 @@
 ./target/target.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./target/target.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./target/target.lo: ../../include/net-snmp/library/ucd_compat.h
-./target/target.lo: ../../include/net-snmp/pdu_api.h
-./target/target.lo: ../../include/net-snmp/mib_api.h
 ./target/target.lo: ../../include/net-snmp/library/mib.h
+./target/target.lo: ../../include/net-snmp/mib_api.h
 ./target/target.lo: ../../include/net-snmp/library/parse.h
-./target/target.lo: ../../include/net-snmp/varbind_api.h
+./target/target.lo: ../../include/net-snmp/library/oid_stash.h
+./target/target.lo: ../../include/net-snmp/library/snmp_impl.h
+./target/target.lo: ../../include/net-snmp/library/snmp.h
+./target/target.lo: ../../include/net-snmp/library/snmp-tc.h
+./target/target.lo: ../../include/net-snmp/library/getopt.h
+./target/target.lo: ../../include/net-snmp/utilities.h
+./target/target.lo: ../../include/net-snmp/library/system.h
+./target/target.lo: ../../include/net-snmp/library/tools.h
+./target/target.lo: ../../include/net-snmp/library/int64.h
+./target/target.lo: ../../include/net-snmp/library/mt_support.h
+./target/target.lo: ../../include/net-snmp/library/snmp_alarm.h
+./target/target.lo: ../../include/net-snmp/library/data_list.h
+./target/target.lo: ../../include/net-snmp/library/check_varbind.h
+./target/target.lo: ../../include/net-snmp/library/container.h
+./target/target.lo: ../../include/net-snmp/library/factory.h
+./target/target.lo: ../../include/net-snmp/library/snmp_logging.h
+./target/target.lo: ../../include/net-snmp/library/container_binary_array.h
+./target/target.lo: ../../include/net-snmp/library/container_list_ssll.h
+./target/target.lo: ../../include/net-snmp/library/container_iterator.h
+./target/target.lo: ../../include/net-snmp/library/container.h
+./target/target.lo: ../../include/net-snmp/library/snmp_assert.h
+./target/target.lo: ../../include/net-snmp/version.h
 ./target/target.lo: ../../include/net-snmp/config_api.h
 ./target/target.lo: ../../include/net-snmp/library/read_config.h
 ./target/target.lo: ../../include/net-snmp/library/default_store.h
@@ -10933,6 +12675,112 @@
 ./target/target.lo: ../../include/net-snmp/agent/mfd.h
 ./target/target.lo: ./target/snmpTargetAddrEntry.h
 ./target/target.lo: ./target/snmpTargetParamsEntry.h target.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/net-snmp-config.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/system/linux.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/system/sysv.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/system/generic.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/machine/generic.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/net-snmp-includes.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/definitions.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/types.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/types.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmp_api.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/varbind_api.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmp_client.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/pdu_api.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/asn1.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/session_api.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/callback.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmp_transport.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmp_service.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/ucd_compat.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/mib.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/mib_api.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/parse.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/oid_stash.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmp_impl.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmp.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmp-tc.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/getopt.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/utilities.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/system.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/tools.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/int64.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/mt_support.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmp_alarm.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/data_list.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/check_varbind.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/container.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/factory.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmp_logging.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/container_binary_array.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/container_list_ssll.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/container_iterator.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/container.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmp_assert.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/version.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/config_api.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/read_config.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/default_store.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmp_enum.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/vacm.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/output_api.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmp_debug.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/snmpv3_api.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmpv3.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/transform_oids.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/keytools.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/scapi.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/lcd_time.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmp_secmod.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/snmpusm.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/mib_module_config.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/agent_module_config.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/snmp_agent.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/snmp_vars.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/agent_handler.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/var_struct.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/agent_registry.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/library/fd_event_manager.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/ds_agent.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/agent_read_config.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/agent_trap.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/all_helpers.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/instance.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/baby_steps.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/scalar.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/scalar_group.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/watcher.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/multiplexer.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/null.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/debug_handler.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/cache_handler.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/old_api.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/read_only.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/row_merge.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/serialize.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/mode_end_call.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/table.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/table_data.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/table_dataset.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/table_tdata.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/table_iterator.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/table_container.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/table_array.h
+./target/target_counters_5_5.lo: ../../include/net-snmp/agent/mfd.h
+./target/target_counters_5_5.lo: ./target/target_counters_5_5.h
+./target/target_counters_5_5.lo: ./utilities/snmp_get_statistic.h
 ./target/target_counters.lo: ../../include/net-snmp/net-snmp-config.h
 ./target/target_counters.lo: ../../include/net-snmp/system/linux.h
 ./target/target_counters.lo: ../../include/net-snmp/system/sysv.h
@@ -10941,32 +12789,14 @@
 ./target/target_counters.lo: ../../include/net-snmp/net-snmp-includes.h
 ./target/target_counters.lo: ../../include/net-snmp/definitions.h
 ./target/target_counters.lo: ../../include/net-snmp/types.h
+./target/target_counters.lo: ../../include/net-snmp/library/types.h
 ./target/target_counters.lo: ../../include/net-snmp/library/snmp_api.h
-./target/target_counters.lo: ../../include/net-snmp/library/asn1.h
-./target/target_counters.lo: ../../include/net-snmp/library/snmp_impl.h
-./target/target_counters.lo: ../../include/net-snmp/library/snmp.h
-./target/target_counters.lo: ../../include/net-snmp/library/snmp-tc.h
-./target/target_counters.lo: ../../include/net-snmp/utilities.h
+./target/target_counters.lo: ../../include/net-snmp/varbind_api.h
 ./target/target_counters.lo: ../../include/net-snmp/library/snmp_client.h
-./target/target_counters.lo: ../../include/net-snmp/library/system.h
-./target/target_counters.lo: ../../include/net-snmp/library/tools.h
-./target/target_counters.lo: ../../include/net-snmp/library/int64.h
-./target/target_counters.lo: ../../include/net-snmp/library/mt_support.h
-./target/target_counters.lo: ../../include/net-snmp/library/snmp_alarm.h
-./target/target_counters.lo: ../../include/net-snmp/library/callback.h
-./target/target_counters.lo: ../../include/net-snmp/library/data_list.h
-./target/target_counters.lo: ../../include/net-snmp/library/oid_stash.h
-./target/target_counters.lo: ../../include/net-snmp/library/check_varbind.h
-./target/target_counters.lo: ../../include/net-snmp/library/container.h
-./target/target_counters.lo: ../../include/net-snmp/library/factory.h
-./target/target_counters.lo: ../../include/net-snmp/library/snmp_logging.h
-./target/target_counters.lo: ../../include/net-snmp/library/container_binary_array.h
-./target/target_counters.lo: ../../include/net-snmp/library/container_list_ssll.h
-./target/target_counters.lo: ../../include/net-snmp/library/container_iterator.h
-./target/target_counters.lo: ../../include/net-snmp/library/container.h
-./target/target_counters.lo: ../../include/net-snmp/library/snmp_assert.h
-./target/target_counters.lo: ../../include/net-snmp/version.h
+./target/target_counters.lo: ../../include/net-snmp/pdu_api.h
+./target/target_counters.lo: ../../include/net-snmp/library/asn1.h
 ./target/target_counters.lo: ../../include/net-snmp/session_api.h
+./target/target_counters.lo: ../../include/net-snmp/library/callback.h
 ./target/target_counters.lo: ../../include/net-snmp/library/snmp_transport.h
 ./target/target_counters.lo: ../../include/net-snmp/library/snmp_service.h
 ./target/target_counters.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -10977,11 +12807,31 @@
 ./target/target_counters.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./target/target_counters.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./target/target_counters.lo: ../../include/net-snmp/library/ucd_compat.h
-./target/target_counters.lo: ../../include/net-snmp/pdu_api.h
-./target/target_counters.lo: ../../include/net-snmp/mib_api.h
 ./target/target_counters.lo: ../../include/net-snmp/library/mib.h
+./target/target_counters.lo: ../../include/net-snmp/mib_api.h
 ./target/target_counters.lo: ../../include/net-snmp/library/parse.h
-./target/target_counters.lo: ../../include/net-snmp/varbind_api.h
+./target/target_counters.lo: ../../include/net-snmp/library/oid_stash.h
+./target/target_counters.lo: ../../include/net-snmp/library/snmp_impl.h
+./target/target_counters.lo: ../../include/net-snmp/library/snmp.h
+./target/target_counters.lo: ../../include/net-snmp/library/snmp-tc.h
+./target/target_counters.lo: ../../include/net-snmp/library/getopt.h
+./target/target_counters.lo: ../../include/net-snmp/utilities.h
+./target/target_counters.lo: ../../include/net-snmp/library/system.h
+./target/target_counters.lo: ../../include/net-snmp/library/tools.h
+./target/target_counters.lo: ../../include/net-snmp/library/int64.h
+./target/target_counters.lo: ../../include/net-snmp/library/mt_support.h
+./target/target_counters.lo: ../../include/net-snmp/library/snmp_alarm.h
+./target/target_counters.lo: ../../include/net-snmp/library/data_list.h
+./target/target_counters.lo: ../../include/net-snmp/library/check_varbind.h
+./target/target_counters.lo: ../../include/net-snmp/library/container.h
+./target/target_counters.lo: ../../include/net-snmp/library/factory.h
+./target/target_counters.lo: ../../include/net-snmp/library/snmp_logging.h
+./target/target_counters.lo: ../../include/net-snmp/library/container_binary_array.h
+./target/target_counters.lo: ../../include/net-snmp/library/container_list_ssll.h
+./target/target_counters.lo: ../../include/net-snmp/library/container_iterator.h
+./target/target_counters.lo: ../../include/net-snmp/library/container.h
+./target/target_counters.lo: ../../include/net-snmp/library/snmp_assert.h
+./target/target_counters.lo: ../../include/net-snmp/version.h
 ./target/target_counters.lo: ../../include/net-snmp/config_api.h
 ./target/target_counters.lo: ../../include/net-snmp/library/read_config.h
 ./target/target_counters.lo: ../../include/net-snmp/library/default_store.h
@@ -11044,32 +12894,14 @@
 ./tunnel/tunnel.lo: ../../include/net-snmp/net-snmp-includes.h
 ./tunnel/tunnel.lo: ../../include/net-snmp/definitions.h
 ./tunnel/tunnel.lo: ../../include/net-snmp/types.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/types.h
 ./tunnel/tunnel.lo: ../../include/net-snmp/library/snmp_api.h
-./tunnel/tunnel.lo: ../../include/net-snmp/library/asn1.h
-./tunnel/tunnel.lo: ../../include/net-snmp/library/snmp_impl.h
-./tunnel/tunnel.lo: ../../include/net-snmp/library/snmp.h
-./tunnel/tunnel.lo: ../../include/net-snmp/library/snmp-tc.h
-./tunnel/tunnel.lo: ../../include/net-snmp/utilities.h
+./tunnel/tunnel.lo: ../../include/net-snmp/varbind_api.h
 ./tunnel/tunnel.lo: ../../include/net-snmp/library/snmp_client.h
-./tunnel/tunnel.lo: ../../include/net-snmp/library/system.h
-./tunnel/tunnel.lo: ../../include/net-snmp/library/tools.h
-./tunnel/tunnel.lo: ../../include/net-snmp/library/int64.h
-./tunnel/tunnel.lo: ../../include/net-snmp/library/mt_support.h
-./tunnel/tunnel.lo: ../../include/net-snmp/library/snmp_alarm.h
-./tunnel/tunnel.lo: ../../include/net-snmp/library/callback.h
-./tunnel/tunnel.lo: ../../include/net-snmp/library/data_list.h
-./tunnel/tunnel.lo: ../../include/net-snmp/library/oid_stash.h
-./tunnel/tunnel.lo: ../../include/net-snmp/library/check_varbind.h
-./tunnel/tunnel.lo: ../../include/net-snmp/library/container.h
-./tunnel/tunnel.lo: ../../include/net-snmp/library/factory.h
-./tunnel/tunnel.lo: ../../include/net-snmp/library/snmp_logging.h
-./tunnel/tunnel.lo: ../../include/net-snmp/library/container_binary_array.h
-./tunnel/tunnel.lo: ../../include/net-snmp/library/container_list_ssll.h
-./tunnel/tunnel.lo: ../../include/net-snmp/library/container_iterator.h
-./tunnel/tunnel.lo: ../../include/net-snmp/library/container.h
-./tunnel/tunnel.lo: ../../include/net-snmp/library/snmp_assert.h
-./tunnel/tunnel.lo: ../../include/net-snmp/version.h
+./tunnel/tunnel.lo: ../../include/net-snmp/pdu_api.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/asn1.h
 ./tunnel/tunnel.lo: ../../include/net-snmp/session_api.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/callback.h
 ./tunnel/tunnel.lo: ../../include/net-snmp/library/snmp_transport.h
 ./tunnel/tunnel.lo: ../../include/net-snmp/library/snmp_service.h
 ./tunnel/tunnel.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -11080,11 +12912,31 @@
 ./tunnel/tunnel.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./tunnel/tunnel.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./tunnel/tunnel.lo: ../../include/net-snmp/library/ucd_compat.h
-./tunnel/tunnel.lo: ../../include/net-snmp/pdu_api.h
-./tunnel/tunnel.lo: ../../include/net-snmp/mib_api.h
 ./tunnel/tunnel.lo: ../../include/net-snmp/library/mib.h
+./tunnel/tunnel.lo: ../../include/net-snmp/mib_api.h
 ./tunnel/tunnel.lo: ../../include/net-snmp/library/parse.h
-./tunnel/tunnel.lo: ../../include/net-snmp/varbind_api.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/oid_stash.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/snmp_impl.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/snmp.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/snmp-tc.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/getopt.h
+./tunnel/tunnel.lo: ../../include/net-snmp/utilities.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/system.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/tools.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/int64.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/mt_support.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/snmp_alarm.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/data_list.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/check_varbind.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/container.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/factory.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/snmp_logging.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/container_binary_array.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/container_list_ssll.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/container_iterator.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/container.h
+./tunnel/tunnel.lo: ../../include/net-snmp/library/snmp_assert.h
+./tunnel/tunnel.lo: ../../include/net-snmp/version.h
 ./tunnel/tunnel.lo: ../../include/net-snmp/config_api.h
 ./tunnel/tunnel.lo: ../../include/net-snmp/library/read_config.h
 ./tunnel/tunnel.lo: ../../include/net-snmp/library/default_store.h
@@ -11137,8 +12989,10 @@
 ./tunnel/tunnel.lo: ../../include/net-snmp/agent/table_iterator.h
 ./tunnel/tunnel.lo: ../../include/net-snmp/agent/table_container.h
 ./tunnel/tunnel.lo: ../../include/net-snmp/agent/table_array.h
-./tunnel/tunnel.lo: ../../include/net-snmp/agent/mfd.h util_funcs.h struct.h
-./tunnel/tunnel.lo: tunnel.h if-mib/ifTable/ifTable.h
+./tunnel/tunnel.lo: ../../include/net-snmp/agent/mfd.h
+./tunnel/tunnel.lo: ../../include/net-snmp/agent/sysORTable.h
+./tunnel/tunnel.lo: ../../include/net-snmp/agent/agent_callbacks.h tunnel.h
+./tunnel/tunnel.lo: if-mib/ifTable/ifTable.h
 ./tunnel/tunnel.lo: ../../include/net-snmp/data_access/interface.h
 ./tunnel/tunnel.lo: if-mib/ifTable/ifTable_constants.h
 ./tunnel/tunnel.lo: if-mib/ifTable/ifTable_interface.h
@@ -11153,32 +13007,14 @@
 ./ucd-snmp/disk.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/disk.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/disk.lo: ../../include/net-snmp/types.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/disk.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/disk.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/version.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/disk.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/disk.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/disk.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/disk.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -11189,11 +13025,31 @@
 ./ucd-snmp/disk.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/disk.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/disk.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/disk.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/disk.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/disk.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/disk.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/disk.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/disk.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/disk.lo: ../../include/net-snmp/library/default_store.h
@@ -11248,8 +13104,8 @@
 ./ucd-snmp/disk.lo: ../../include/net-snmp/agent/table_array.h
 ./ucd-snmp/disk.lo: ../../include/net-snmp/agent/mfd.h
 ./ucd-snmp/disk.lo: ../../include/net-snmp/agent/auto_nlist.h struct.h
-./ucd-snmp/disk.lo: ./ucd-snmp/disk.h mibdefs.h util_funcs.h
-./ucd-snmp/disk.lo: ./ucd-snmp/errormib.h
+./ucd-snmp/disk.lo: ./ucd-snmp/disk.h mibdefs.h
+./ucd-snmp/disk.lo: util_funcs/header_simple_table.h ./ucd-snmp/errormib.h
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/system/linux.h
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/system/sysv.h
@@ -11258,32 +13114,14 @@
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/types.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/version.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -11294,11 +13132,31 @@
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/library/default_store.h
@@ -11351,8 +13209,8 @@
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/agent/table_iterator.h
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/agent/table_container.h
 ./ucd-snmp/diskio.lo: ../../include/net-snmp/agent/table_array.h
-./ucd-snmp/diskio.lo: ../../include/net-snmp/agent/mfd.h util_funcs.h
-./ucd-snmp/diskio.lo: struct.h ./ucd-snmp/diskio.h
+./ucd-snmp/diskio.lo: ../../include/net-snmp/agent/mfd.h
+./ucd-snmp/diskio.lo: util_funcs/header_simple_table.h ./ucd-snmp/diskio.h
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/system/linux.h
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/system/sysv.h
@@ -11361,32 +13219,14 @@
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/types.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/version.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -11397,11 +13237,31 @@
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/dlmod.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/dlmod.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/library/default_store.h
@@ -11455,6 +13315,9 @@
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/agent/table_container.h
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/agent/table_array.h
 ./ucd-snmp/dlmod.lo: ../../include/net-snmp/agent/mfd.h struct.h util_funcs.h
+./ucd-snmp/dlmod.lo: util_funcs/header_generic.h
+./ucd-snmp/dlmod.lo: util_funcs/header_simple_table.h
+./ucd-snmp/dlmod.lo: util_funcs/MIB_STATS_CACHE_TIMEOUT.h
 ./ucd-snmp/dlmod.lo: ./ucd-snmp/dlmod.h
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/system/linux.h
@@ -11464,32 +13327,14 @@
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/types.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/version.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -11500,11 +13345,31 @@
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/errormib.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/errormib.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/library/default_store.h
@@ -11559,7 +13424,8 @@
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/agent/table_array.h
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/agent/mfd.h
 ./ucd-snmp/errormib.lo: ../../include/net-snmp/agent/auto_nlist.h struct.h
-./ucd-snmp/errormib.lo: ./ucd-snmp/errormib.h mibdefs.h util_funcs.h
+./ucd-snmp/errormib.lo: ./ucd-snmp/errormib.h mibdefs.h
+./ucd-snmp/errormib.lo: util_funcs/header_generic.h
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/system/linux.h
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/system/sysv.h
@@ -11568,32 +13434,14 @@
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/types.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/version.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -11604,11 +13452,31 @@
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/extensible.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/extensible.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/library/default_store.h
@@ -11665,7 +13533,8 @@
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/agent/auto_nlist.h
 ./ucd-snmp/extensible.lo: ../../include/net-snmp/agent/agent_callbacks.h
 ./ucd-snmp/extensible.lo: struct.h ./ucd-snmp/extensible.h mibdefs.h
-./ucd-snmp/extensible.lo: utilities/execute.h util_funcs.h
+./ucd-snmp/extensible.lo: utilities/execute.h
+./ucd-snmp/extensible.lo: util_funcs/header_simple_table.h
 ./ucd-snmp/file.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/file.lo: ../../include/net-snmp/system/linux.h
 ./ucd-snmp/file.lo: ../../include/net-snmp/system/sysv.h
@@ -11674,32 +13543,14 @@
 ./ucd-snmp/file.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/file.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/file.lo: ../../include/net-snmp/types.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/file.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/file.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/file.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/file.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/file.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/file.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/file.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/file.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/file.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/file.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/file.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/file.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/file.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/file.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/file.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/file.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/file.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/file.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/file.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/file.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/file.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/file.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/file.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/file.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/file.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/file.lo: ../../include/net-snmp/version.h
+./ucd-snmp/file.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/file.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/file.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/file.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/file.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -11710,11 +13561,31 @@
 ./ucd-snmp/file.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/file.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/file.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/file.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/file.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/file.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/file.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/file.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/file.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/file.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/file.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/file.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/file.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/file.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/file.lo: ../../include/net-snmp/library/default_store.h
@@ -11768,7 +13639,8 @@
 ./ucd-snmp/file.lo: ../../include/net-snmp/agent/table_container.h
 ./ucd-snmp/file.lo: ../../include/net-snmp/agent/table_array.h
 ./ucd-snmp/file.lo: ../../include/net-snmp/agent/mfd.h struct.h
-./ucd-snmp/file.lo: ./ucd-snmp/file.h mibdefs.h util_funcs.h
+./ucd-snmp/file.lo: ./ucd-snmp/file.h mibdefs.h
+./ucd-snmp/file.lo: util_funcs/header_simple_table.h
 ./ucd-snmp/hpux.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/hpux.lo: ../../include/net-snmp/system/linux.h
 ./ucd-snmp/hpux.lo: ../../include/net-snmp/system/sysv.h
@@ -11777,32 +13649,14 @@
 ./ucd-snmp/hpux.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/hpux.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/hpux.lo: ../../include/net-snmp/types.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/hpux.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/hpux.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/version.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/hpux.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/hpux.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/hpux.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/hpux.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -11813,11 +13667,31 @@
 ./ucd-snmp/hpux.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/hpux.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/hpux.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/hpux.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/hpux.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/hpux.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/hpux.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/hpux.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/hpux.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/hpux.lo: ../../include/net-snmp/library/default_store.h
@@ -11880,32 +13754,14 @@
 ./ucd-snmp/lmSensors.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/lmSensors.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/lmSensors.lo: ../../include/net-snmp/types.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/version.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/lmSensors.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -11916,11 +13772,31 @@
 ./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/lmSensors.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/lmSensors.lo: ../../include/net-snmp/library/default_store.h
@@ -11973,9 +13849,115 @@
 ./ucd-snmp/lmSensors.lo: ../../include/net-snmp/agent/table_iterator.h
 ./ucd-snmp/lmSensors.lo: ../../include/net-snmp/agent/table_container.h
 ./ucd-snmp/lmSensors.lo: ../../include/net-snmp/agent/table_array.h
-./ucd-snmp/lmSensors.lo: ../../include/net-snmp/agent/mfd.h util_funcs.h
-./ucd-snmp/lmSensors.lo: struct.h
+./ucd-snmp/lmSensors.lo: ../../include/net-snmp/agent/mfd.h
+./ucd-snmp/lmSensors.lo: util_funcs/header_simple_table.h
 ./ucd-snmp/lmSensors.lo: ./ucd-snmp/lmSensors.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/net-snmp-config.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/system/linux.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/system/sysv.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/system/generic.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/machine/generic.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/net-snmp-includes.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/definitions.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/types.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/types.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmp_api.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmp_client.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/asn1.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/callback.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmp_transport.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmp_service.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/ucd_compat.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/mib_api.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/parse.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/version.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/config_api.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/read_config.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/default_store.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmp_enum.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/vacm.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/output_api.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmp_debug.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/snmpv3_api.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmpv3.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/transform_oids.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/keytools.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/scapi.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/lcd_time.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmp_secmod.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/snmpusm.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/mib_module_config.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/agent_module_config.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/snmp_agent.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/snmp_vars.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/agent_handler.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/var_struct.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/agent_registry.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/library/fd_event_manager.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/ds_agent.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/agent_read_config.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/agent_trap.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/all_helpers.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/instance.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/baby_steps.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/scalar.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/scalar_group.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/watcher.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/multiplexer.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/null.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/debug_handler.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/cache_handler.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/old_api.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/read_only.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/row_merge.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/serialize.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/mode_end_call.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/table.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/table_data.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/table_dataset.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/table_tdata.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/table_iterator.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/table_container.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/table_array.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/mfd.h
+./ucd-snmp/lmsensorsMib.lo: ../../include/net-snmp/agent/hardware/sensors.h
+./ucd-snmp/lmsensorsMib.lo: ucd-snmp/lmsensorsMib.h
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/system/linux.h
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/system/sysv.h
@@ -11984,32 +13966,14 @@
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/types.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/version.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -12020,11 +13984,31 @@
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/loadave.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/loadave.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/library/default_store.h
@@ -12079,8 +14063,8 @@
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/agent/table_array.h
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/agent/mfd.h
 ./ucd-snmp/loadave.lo: ../../include/net-snmp/agent/auto_nlist.h struct.h
-./ucd-snmp/loadave.lo: ./ucd-snmp/loadave.h mibdefs.h util_funcs.h
-./ucd-snmp/loadave.lo: ../../agent/kernel.h
+./ucd-snmp/loadave.lo: ./ucd-snmp/loadave.h mibdefs.h
+./ucd-snmp/loadave.lo: util_funcs/header_simple_table.h ../../agent/kernel.h
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/system/linux.h
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/system/sysv.h
@@ -12089,32 +14073,14 @@
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/types.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/version.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -12125,11 +14091,31 @@
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/logmatch.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/logmatch.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/library/default_store.h
@@ -12183,7 +14169,116 @@
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/agent/table_container.h
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/agent/table_array.h
 ./ucd-snmp/logmatch.lo: ../../include/net-snmp/agent/mfd.h struct.h
-./ucd-snmp/logmatch.lo: util_funcs.h ./ucd-snmp/logmatch.h mibdefs.h
+./ucd-snmp/logmatch.lo: ./ucd-snmp/logmatch.h mibdefs.h
+./ucd-snmp/logmatch.lo: util_funcs/header_generic.h
+./ucd-snmp/logmatch.lo: util_funcs/header_simple_table.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/net-snmp-config.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/system/linux.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/system/sysv.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/system/generic.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/machine/generic.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/net-snmp-includes.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/definitions.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/types.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/types.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_api.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_client.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/asn1.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/callback.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_transport.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_service.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/ucd_compat.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/mib_api.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/parse.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/version.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/config_api.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/read_config.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/default_store.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_enum.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/vacm.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/output_api.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_debug.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/snmpv3_api.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmpv3.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/transform_oids.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/keytools.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/scapi.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/lcd_time.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_secmod.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmpusm.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/mib_module_config.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/agent_module_config.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/snmp_agent.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/snmp_vars.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/agent_handler.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/var_struct.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/agent_registry.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/fd_event_manager.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/ds_agent.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/agent_read_config.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/agent_trap.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/all_helpers.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/instance.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/baby_steps.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/scalar.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/scalar_group.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/watcher.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/multiplexer.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/null.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/debug_handler.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/cache_handler.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/old_api.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/read_only.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/row_merge.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/serialize.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/mode_end_call.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/table.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/table_data.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/table_dataset.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/table_tdata.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/table_iterator.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/table_container.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/table_array.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/mfd.h
+./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/auto_nlist.h
+./ucd-snmp/memory_aix4.lo: util_funcs/header_generic.h ./ucd-snmp/memory.h
+./ucd-snmp/memory_aix4.lo: ./ucd-snmp/memory_aix4.h mibdefs.h
 ./ucd-snmp/memory.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/memory.lo: ../../include/net-snmp/system/linux.h
 ./ucd-snmp/memory.lo: ../../include/net-snmp/system/sysv.h
@@ -12192,32 +14287,14 @@
 ./ucd-snmp/memory.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/memory.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/memory.lo: ../../include/net-snmp/types.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/memory.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/memory.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/version.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/memory.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/memory.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/memory.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/memory.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -12228,11 +14305,31 @@
 ./ucd-snmp/memory.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/memory.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/memory.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/memory.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/memory.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/memory.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/memory.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/memory.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/memory.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/memory.lo: ../../include/net-snmp/library/default_store.h
@@ -12288,111 +14385,6 @@
 ./ucd-snmp/memory.lo: ../../include/net-snmp/agent/mfd.h
 ./ucd-snmp/memory.lo: ../../include/net-snmp/agent/hardware/memory.h
 ./ucd-snmp/memory.lo: ./ucd-snmp/memory.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/net-snmp-config.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/system/linux.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/system/sysv.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/system/generic.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/machine/generic.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/net-snmp-includes.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/definitions.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/types.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/utilities.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/version.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/session_api.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_transport.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_service.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmpUnixDomain.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmpUDPDomain.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmpTCPDomain.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmpIPXDomain.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/mib_api.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/mib.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/varbind_api.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/config_api.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/read_config.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/default_store.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_parse_args.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_enum.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/vacm.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/output_api.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_debug.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/snmpv3_api.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmpv3.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/transform_oids.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/keytools.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/scapi.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/lcd_time.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmp_secmod.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/snmpusm.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/mib_module_config.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/agent_module_config.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/snmp_agent.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/snmp_vars.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/agent_handler.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/var_struct.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/agent_registry.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/library/fd_event_manager.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/ds_agent.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/agent_read_config.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/agent_trap.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/all_helpers.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/instance.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/baby_steps.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/scalar.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/scalar_group.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/watcher.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/multiplexer.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/null.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/debug_handler.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/cache_handler.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/old_api.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/read_only.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/row_merge.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/serialize.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/bulk_to_next.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/mode_end_call.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/table.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/table_data.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/table_dataset.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/table_tdata.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/table_iterator.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/table_container.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/table_array.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/mfd.h
-./ucd-snmp/memory_aix4.lo: ../../include/net-snmp/agent/auto_nlist.h
-./ucd-snmp/memory_aix4.lo: util_funcs.h struct.h ./ucd-snmp/memory.h
-./ucd-snmp/memory_aix4.lo: ./ucd-snmp/memory_aix4.h mibdefs.h
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/system/linux.h
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/system/sysv.h
@@ -12401,32 +14393,14 @@
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/types.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/version.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -12437,11 +14411,31 @@
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/library/default_store.h
@@ -12496,7 +14490,7 @@
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/agent/table_array.h
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/agent/mfd.h
 ./ucd-snmp/memory_darwin7.lo: ../../include/net-snmp/agent/auto_nlist.h
-./ucd-snmp/memory_darwin7.lo: util_funcs.h struct.h ./ucd-snmp/memory.h
+./ucd-snmp/memory_darwin7.lo: util_funcs/header_generic.h ./ucd-snmp/memory.h
 ./ucd-snmp/memory_darwin7.lo: ./ucd-snmp/memory_darwin7.h mibdefs.h
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/system/linux.h
@@ -12506,32 +14500,14 @@
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/types.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/version.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -12542,11 +14518,31 @@
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/library/default_store.h
@@ -12601,7 +14597,7 @@
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/agent/table_array.h
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/agent/mfd.h
 ./ucd-snmp/memory_dynix.lo: ../../include/net-snmp/agent/auto_nlist.h
-./ucd-snmp/memory_dynix.lo: util_funcs.h struct.h ./ucd-snmp/memory.h
+./ucd-snmp/memory_dynix.lo: util_funcs/header_generic.h ./ucd-snmp/memory.h
 ./ucd-snmp/memory_dynix.lo: ./ucd-snmp/memory_dynix.h mibdefs.h
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/system/linux.h
@@ -12611,32 +14607,14 @@
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/types.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/version.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -12647,11 +14625,31 @@
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/library/default_store.h
@@ -12706,7 +14704,10 @@
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/agent/table_array.h
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/agent/mfd.h
 ./ucd-snmp/memory_freebsd2.lo: ../../include/net-snmp/agent/auto_nlist.h
-./ucd-snmp/memory_freebsd2.lo: util_funcs.h struct.h ./ucd-snmp/memory.h
+./ucd-snmp/memory_freebsd2.lo: util_funcs.h util_funcs/header_generic.h
+./ucd-snmp/memory_freebsd2.lo: util_funcs/header_simple_table.h struct.h
+./ucd-snmp/memory_freebsd2.lo: util_funcs/MIB_STATS_CACHE_TIMEOUT.h
+./ucd-snmp/memory_freebsd2.lo: ./ucd-snmp/memory.h
 ./ucd-snmp/memory_freebsd2.lo: ./ucd-snmp/memory_freebsd2.h mibdefs.h
 ./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/system/linux.h
@@ -12716,32 +14717,14 @@
 ./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/types.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/version.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -12752,11 +14735,31 @@
 ./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/memory_hpux.lo: ../../include/net-snmp/library/default_store.h
@@ -12821,32 +14824,14 @@
 ./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/types.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/version.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -12857,11 +14842,31 @@
 ./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/library/default_store.h
@@ -12916,7 +14921,7 @@
 ./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/agent/table_array.h
 ./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/agent/mfd.h
 ./ucd-snmp/memory_netbsd1.lo: ../../include/net-snmp/agent/auto_nlist.h
-./ucd-snmp/memory_netbsd1.lo: util_funcs.h struct.h ./ucd-snmp/memory.h
+./ucd-snmp/memory_netbsd1.lo: util_funcs/header_generic.h ./ucd-snmp/memory.h
 ./ucd-snmp/memory_netbsd1.lo: ./ucd-snmp/memory_netbsd1.h mibdefs.h
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/system/linux.h
@@ -12926,32 +14931,14 @@
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/types.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/version.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -12962,11 +14949,31 @@
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/library/default_store.h
@@ -13021,7 +15028,8 @@
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/agent/table_array.h
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/agent/mfd.h
 ./ucd-snmp/memory_solaris2.lo: ../../include/net-snmp/agent/auto_nlist.h
-./ucd-snmp/memory_solaris2.lo: util_funcs.h struct.h ./ucd-snmp/memory.h
+./ucd-snmp/memory_solaris2.lo: util_funcs/header_generic.h
+./ucd-snmp/memory_solaris2.lo: ./ucd-snmp/memory.h
 ./ucd-snmp/memory_solaris2.lo: ./ucd-snmp/memory_solaris2.h mibdefs.h
 ./ucd-snmp/pass.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/pass.lo: ../../include/net-snmp/system/linux.h
@@ -13031,32 +15039,14 @@
 ./ucd-snmp/pass.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/pass.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/pass.lo: ../../include/net-snmp/types.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/pass.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/pass.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/version.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/pass.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/pass.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/pass.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/pass.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -13067,11 +15057,31 @@
 ./ucd-snmp/pass.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/pass.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/pass.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/pass.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/pass.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/pass.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/pass.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/pass.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/pass.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/pass.lo: ../../include/net-snmp/library/default_store.h
@@ -13127,6 +15137,9 @@
 ./ucd-snmp/pass.lo: ../../include/net-snmp/agent/mfd.h struct.h
 ./ucd-snmp/pass.lo: ./ucd-snmp/pass.h mibdefs.h ./ucd-snmp/pass_common.h
 ./ucd-snmp/pass.lo: ./ucd-snmp/extensible.h util_funcs.h
+./ucd-snmp/pass.lo: util_funcs/header_generic.h
+./ucd-snmp/pass.lo: util_funcs/header_simple_table.h
+./ucd-snmp/pass.lo: util_funcs/MIB_STATS_CACHE_TIMEOUT.h
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/system/linux.h
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/system/sysv.h
@@ -13135,32 +15148,14 @@
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/types.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/version.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -13171,11 +15166,31 @@
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/pass_common.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/pass_common.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/library/default_store.h
@@ -13229,7 +15244,10 @@
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/agent/table_container.h
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/agent/table_array.h
 ./ucd-snmp/pass_common.lo: ../../include/net-snmp/agent/mfd.h
-./ucd-snmp/pass_common.lo: ../../agent/mibgroup/util_funcs.h struct.h
+./ucd-snmp/pass_common.lo: ../../agent/mibgroup/util_funcs.h
+./ucd-snmp/pass_common.lo: util_funcs/header_generic.h
+./ucd-snmp/pass_common.lo: util_funcs/header_simple_table.h struct.h
+./ucd-snmp/pass_common.lo: util_funcs/MIB_STATS_CACHE_TIMEOUT.h
 ./ucd-snmp/pass_common.lo: ./ucd-snmp/pass_common.h
 ./ucd-snmp/pass_persist.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/pass_persist.lo: ../../include/net-snmp/system/linux.h
@@ -13239,32 +15257,14 @@
 ./ucd-snmp/pass_persist.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/pass_persist.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/pass_persist.lo: ../../include/net-snmp/types.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/version.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/pass_persist.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -13275,11 +15275,31 @@
 ./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/pass_persist.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/pass_persist.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/pass_persist.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/pass_persist.lo: ../../include/net-snmp/library/default_store.h
@@ -13335,7 +15355,9 @@
 ./ucd-snmp/pass_persist.lo: ../../include/net-snmp/agent/mfd.h struct.h
 ./ucd-snmp/pass_persist.lo: ./ucd-snmp/pass_persist.h mibdefs.h
 ./ucd-snmp/pass_persist.lo: ./ucd-snmp/pass_common.h ./ucd-snmp/extensible.h
-./ucd-snmp/pass_persist.lo: util_funcs.h
+./ucd-snmp/pass_persist.lo: util_funcs.h util_funcs/header_generic.h
+./ucd-snmp/pass_persist.lo: util_funcs/header_simple_table.h
+./ucd-snmp/pass_persist.lo: util_funcs/MIB_STATS_CACHE_TIMEOUT.h
 ./ucd-snmp/proc.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/proc.lo: ../../include/net-snmp/system/linux.h
 ./ucd-snmp/proc.lo: ../../include/net-snmp/system/sysv.h
@@ -13344,32 +15366,14 @@
 ./ucd-snmp/proc.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/proc.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/proc.lo: ../../include/net-snmp/types.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/proc.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/proc.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/version.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/proc.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/proc.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/proc.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/proc.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -13380,11 +15384,31 @@
 ./ucd-snmp/proc.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/proc.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/proc.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/proc.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/proc.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/proc.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/proc.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/proc.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/proc.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/proc.lo: ../../include/net-snmp/library/default_store.h
@@ -13439,7 +15463,9 @@
 ./ucd-snmp/proc.lo: ../../include/net-snmp/agent/table_array.h
 ./ucd-snmp/proc.lo: ../../include/net-snmp/agent/mfd.h struct.h
 ./ucd-snmp/proc.lo: ./ucd-snmp/proc.h mibdefs.h ./ucd-snmp/errormib.h
-./ucd-snmp/proc.lo: util_funcs.h ../../agent/kernel.h
+./ucd-snmp/proc.lo: util_funcs.h util_funcs/header_generic.h
+./ucd-snmp/proc.lo: util_funcs/header_simple_table.h
+./ucd-snmp/proc.lo: util_funcs/MIB_STATS_CACHE_TIMEOUT.h ../../agent/kernel.h
 ./ucd-snmp/proxy.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/proxy.lo: ../../include/net-snmp/system/linux.h
 ./ucd-snmp/proxy.lo: ../../include/net-snmp/system/sysv.h
@@ -13448,32 +15474,14 @@
 ./ucd-snmp/proxy.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/proxy.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/proxy.lo: ../../include/net-snmp/types.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/proxy.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/proxy.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/version.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/proxy.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/proxy.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/proxy.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/proxy.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -13484,11 +15492,31 @@
 ./ucd-snmp/proxy.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/proxy.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/proxy.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/proxy.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/proxy.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/proxy.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/proxy.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/proxy.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/proxy.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/proxy.lo: ../../include/net-snmp/library/default_store.h
@@ -13550,32 +15578,14 @@
 ./ucd-snmp/versioninfo.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/versioninfo.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/versioninfo.lo: ../../include/net-snmp/types.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/version.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/versioninfo.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -13586,11 +15596,31 @@
 ./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/versioninfo.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/versioninfo.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/versioninfo.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/versioninfo.lo: ../../include/net-snmp/library/default_store.h
@@ -13645,6 +15675,222 @@
 ./ucd-snmp/versioninfo.lo: ../../include/net-snmp/agent/table_array.h
 ./ucd-snmp/versioninfo.lo: ../../include/net-snmp/agent/mfd.h struct.h
 ./ucd-snmp/versioninfo.lo: ./ucd-snmp/versioninfo.h mibdefs.h util_funcs.h
+./ucd-snmp/versioninfo.lo: util_funcs/header_generic.h
+./ucd-snmp/versioninfo.lo: util_funcs/header_simple_table.h
+./ucd-snmp/versioninfo.lo: util_funcs/MIB_STATS_CACHE_TIMEOUT.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/net-snmp-config.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/system/linux.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/system/sysv.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/system/generic.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/machine/generic.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/net-snmp-includes.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/definitions.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/types.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/types.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_api.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_client.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/asn1.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/callback.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_transport.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_service.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/ucd_compat.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/mib_api.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/parse.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/version.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/config_api.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/read_config.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/default_store.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_enum.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/vacm.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/output_api.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_debug.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/snmpv3_api.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmpv3.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/transform_oids.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/keytools.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/scapi.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/lcd_time.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_secmod.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmpusm.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/mib_module_config.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/agent_module_config.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/snmp_agent.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/snmp_vars.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/agent_handler.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/var_struct.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/agent_registry.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/fd_event_manager.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/ds_agent.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/agent_read_config.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/agent_trap.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/all_helpers.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/instance.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/baby_steps.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/scalar.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/scalar_group.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/watcher.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/multiplexer.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/null.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/debug_handler.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/cache_handler.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/old_api.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/read_only.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/row_merge.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/serialize.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/mode_end_call.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/table.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/table_data.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/table_dataset.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/table_tdata.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/table_iterator.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/table_container.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/table_array.h
+./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/mfd.h mibdefs.h
+./ucd-snmp/vmstat_aix4.lo: util_funcs/header_generic.h ./ucd-snmp/vmstat.h
+./ucd-snmp/vmstat_aix4.lo: ./ucd-snmp/vmstat_aix4.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/net-snmp-config.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/system/linux.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/system/sysv.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/system/generic.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/machine/generic.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/net-snmp-includes.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/definitions.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/types.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/types.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_api.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_client.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/asn1.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/callback.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_transport.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_service.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/ucd_compat.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/mib_api.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/parse.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/version.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/config_api.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/read_config.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/default_store.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_enum.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/vacm.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/output_api.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_debug.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/snmpv3_api.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmpv3.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/transform_oids.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/keytools.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/scapi.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/lcd_time.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_secmod.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmpusm.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/mib_module_config.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/agent_module_config.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/snmp_agent.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/snmp_vars.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/agent_handler.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/var_struct.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/agent_registry.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/fd_event_manager.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/ds_agent.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/agent_read_config.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/agent_trap.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/all_helpers.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/instance.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/baby_steps.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/scalar.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/scalar_group.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/watcher.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/multiplexer.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/null.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/debug_handler.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/cache_handler.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/old_api.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/read_only.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/row_merge.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/serialize.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/mode_end_call.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/table.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/table_data.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/table_dataset.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/table_tdata.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/table_iterator.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/table_container.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/table_array.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/mfd.h
+./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/auto_nlist.h
+./ucd-snmp/vmstat_bsdi4.lo: util_funcs/header_generic.h ./ucd-snmp/vmstat.h
+./ucd-snmp/vmstat_bsdi4.lo: mibdefs.h
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/system/linux.h
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/system/sysv.h
@@ -13653,32 +15899,14 @@
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/types.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/version.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -13689,11 +15917,31 @@
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/vmstat.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/vmstat.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/library/default_store.h
@@ -13750,215 +15998,6 @@
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/agent/auto_nlist.h
 ./ucd-snmp/vmstat.lo: ../../include/net-snmp/agent/hardware/cpu.h
 ./ucd-snmp/vmstat.lo: ./ucd-snmp/vmstat.h mibdefs.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/net-snmp-config.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/system/linux.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/system/sysv.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/system/generic.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/machine/generic.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/net-snmp-includes.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/definitions.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/types.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/utilities.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/version.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/session_api.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_transport.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_service.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmpUnixDomain.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmpUDPDomain.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmpTCPDomain.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmpIPXDomain.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/mib_api.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/mib.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/varbind_api.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/config_api.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/read_config.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/default_store.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_parse_args.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_enum.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/vacm.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/output_api.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_debug.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/snmpv3_api.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmpv3.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/transform_oids.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/keytools.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/scapi.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/lcd_time.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmp_secmod.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/snmpusm.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/mib_module_config.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/agent_module_config.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/snmp_agent.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/snmp_vars.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/agent_handler.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/var_struct.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/agent_registry.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/library/fd_event_manager.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/ds_agent.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/agent_read_config.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/agent_trap.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/all_helpers.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/instance.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/baby_steps.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/scalar.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/scalar_group.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/watcher.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/multiplexer.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/null.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/debug_handler.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/cache_handler.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/old_api.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/read_only.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/row_merge.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/serialize.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/bulk_to_next.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/mode_end_call.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/table.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/table_data.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/table_dataset.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/table_tdata.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/table_iterator.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/table_container.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/table_array.h
-./ucd-snmp/vmstat_aix4.lo: ../../include/net-snmp/agent/mfd.h mibdefs.h
-./ucd-snmp/vmstat_aix4.lo: util_funcs.h struct.h ./ucd-snmp/vmstat.h
-./ucd-snmp/vmstat_aix4.lo: ./ucd-snmp/vmstat_aix4.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/net-snmp-config.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/system/linux.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/system/sysv.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/system/generic.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/machine/generic.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/net-snmp-includes.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/definitions.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/types.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/utilities.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/version.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/session_api.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_transport.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_service.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmpUnixDomain.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmpUDPDomain.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmpTCPDomain.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmpIPXDomain.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/mib_api.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/mib.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/varbind_api.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/config_api.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/read_config.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/default_store.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_parse_args.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_enum.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/vacm.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/output_api.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_debug.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/snmpv3_api.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmpv3.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/transform_oids.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/keytools.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/scapi.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/lcd_time.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmp_secmod.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/snmpusm.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/mib_module_config.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/agent_module_config.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/snmp_agent.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/snmp_vars.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/agent_handler.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/var_struct.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/agent_registry.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/library/fd_event_manager.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/ds_agent.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/agent_read_config.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/agent_trap.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/all_helpers.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/instance.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/baby_steps.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/scalar.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/scalar_group.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/watcher.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/multiplexer.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/null.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/debug_handler.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/cache_handler.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/old_api.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/read_only.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/row_merge.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/serialize.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/bulk_to_next.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/mode_end_call.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/table.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/table_data.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/table_dataset.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/table_tdata.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/table_iterator.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/table_container.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/table_array.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/mfd.h
-./ucd-snmp/vmstat_bsdi4.lo: ../../include/net-snmp/agent/auto_nlist.h
-./ucd-snmp/vmstat_bsdi4.lo: util_funcs.h struct.h ./ucd-snmp/vmstat.h
-./ucd-snmp/vmstat_bsdi4.lo: mibdefs.h
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/system/linux.h
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/system/sysv.h
@@ -13967,32 +16006,14 @@
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/types.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/version.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -14003,11 +16024,31 @@
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/library/default_store.h
@@ -14062,7 +16103,7 @@
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/agent/table_array.h
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/agent/mfd.h
 ./ucd-snmp/vmstat_darwin7.lo: ../../include/net-snmp/agent/auto_nlist.h
-./ucd-snmp/vmstat_darwin7.lo: util_funcs.h struct.h ./ucd-snmp/vmstat.h
+./ucd-snmp/vmstat_darwin7.lo: util_funcs/header_generic.h ./ucd-snmp/vmstat.h
 ./ucd-snmp/vmstat_darwin7.lo: mibdefs.h ./ucd-snmp/vmstat_darwin7.h
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/system/linux.h
@@ -14072,32 +16113,14 @@
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/types.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/version.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -14108,11 +16131,31 @@
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/library/default_store.h
@@ -14166,7 +16209,7 @@
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/agent/table_container.h
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/agent/table_array.h
 ./ucd-snmp/vmstat_dynix.lo: ../../include/net-snmp/agent/mfd.h mibdefs.h
-./ucd-snmp/vmstat_dynix.lo: util_funcs.h struct.h ./ucd-snmp/vmstat.h
+./ucd-snmp/vmstat_dynix.lo: util_funcs/header_generic.h ./ucd-snmp/vmstat.h
 ./ucd-snmp/vmstat_dynix.lo: ./ucd-snmp/vmstat_dynix.h
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/system/linux.h
@@ -14176,32 +16219,14 @@
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/types.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/version.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -14212,11 +16237,31 @@
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/library/default_store.h
@@ -14271,8 +16316,9 @@
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/agent/table_array.h
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/agent/mfd.h
 ./ucd-snmp/vmstat_freebsd2.lo: ../../include/net-snmp/agent/auto_nlist.h
-./ucd-snmp/vmstat_freebsd2.lo: util_funcs.h struct.h ./ucd-snmp/vmstat.h
-./ucd-snmp/vmstat_freebsd2.lo: mibdefs.h ./ucd-snmp/vmstat_freebsd2.h
+./ucd-snmp/vmstat_freebsd2.lo: util_funcs/header_generic.h
+./ucd-snmp/vmstat_freebsd2.lo: ./ucd-snmp/vmstat.h mibdefs.h
+./ucd-snmp/vmstat_freebsd2.lo: ./ucd-snmp/vmstat_freebsd2.h
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/system/linux.h
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/system/sysv.h
@@ -14281,32 +16327,14 @@
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/types.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/version.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -14317,11 +16345,31 @@
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/library/default_store.h
@@ -14375,7 +16423,7 @@
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/agent/table_container.h
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/agent/table_array.h
 ./ucd-snmp/vmstat_hpux.lo: ../../include/net-snmp/agent/mfd.h mibdefs.h
-./ucd-snmp/vmstat_hpux.lo: util_funcs.h struct.h ./ucd-snmp/vmstat.h
+./ucd-snmp/vmstat_hpux.lo: util_funcs/header_generic.h ./ucd-snmp/vmstat.h
 ./ucd-snmp/vmstat_hpux.lo: ./ucd-snmp/vmstat_hpux.h
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/system/linux.h
@@ -14385,32 +16433,14 @@
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/types.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/version.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -14421,11 +16451,31 @@
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/library/default_store.h
@@ -14481,7 +16531,7 @@
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/agent/mfd.h
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/agent/auto_nlist.h
 ./ucd-snmp/vmstat_linux.lo: ../../include/net-snmp/agent/hardware/cpu.h
-./ucd-snmp/vmstat_linux.lo: mibdefs.h struct.h util_funcs.h
+./ucd-snmp/vmstat_linux.lo: mibdefs.h struct.h util_funcs/header_generic.h
 ./ucd-snmp/vmstat_linux.lo: ./ucd-snmp/vmstat.h
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/system/linux.h
@@ -14491,32 +16541,14 @@
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/types.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/version.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -14527,11 +16559,31 @@
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/library/default_store.h
@@ -14586,7 +16638,7 @@
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/agent/table_array.h
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/agent/mfd.h
 ./ucd-snmp/vmstat_netbsd1.lo: ../../include/net-snmp/agent/auto_nlist.h
-./ucd-snmp/vmstat_netbsd1.lo: util_funcs.h struct.h ./ucd-snmp/vmstat.h
+./ucd-snmp/vmstat_netbsd1.lo: util_funcs/header_generic.h ./ucd-snmp/vmstat.h
 ./ucd-snmp/vmstat_netbsd1.lo: mibdefs.h
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/net-snmp-config.h
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/system/linux.h
@@ -14596,32 +16648,14 @@
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/net-snmp-includes.h
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/definitions.h
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/types.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/types.h
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/snmp_api.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/asn1.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/snmp_impl.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/snmp.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/snmp-tc.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/varbind_api.h
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/snmp_client.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/system.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/tools.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/int64.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/mt_support.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/snmp_alarm.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/callback.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/data_list.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/oid_stash.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/check_varbind.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/factory.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/snmp_logging.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/container_binary_array.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/container_list_ssll.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/container_iterator.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/container.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/snmp_assert.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/version.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/pdu_api.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/asn1.h
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/session_api.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/callback.h
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/snmp_transport.h
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/snmp_service.h
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -14632,11 +16666,31 @@
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/ucd_compat.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/pdu_api.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/mib.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/mib_api.h
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/parse.h
-./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/varbind_api.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/oid_stash.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/snmp_impl.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/snmp.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/snmp-tc.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/getopt.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/utilities.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/system.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/tools.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/int64.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/mt_support.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/snmp_alarm.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/data_list.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/check_varbind.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/factory.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/snmp_logging.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/container_binary_array.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/container_list_ssll.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/container_iterator.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/container.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/snmp_assert.h
+./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/version.h
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/config_api.h
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/read_config.h
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/library/default_store.h
@@ -14690,8 +16744,255 @@
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/agent/table_container.h
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/agent/table_array.h
 ./ucd-snmp/vmstat_solaris2.lo: ../../include/net-snmp/agent/mfd.h mibdefs.h
-./ucd-snmp/vmstat_solaris2.lo: util_funcs.h struct.h ./ucd-snmp/vmstat.h
+./ucd-snmp/vmstat_solaris2.lo: util_funcs/header_generic.h
+./ucd-snmp/vmstat_solaris2.lo: ./ucd-snmp/vmstat.h
 ./ucd-snmp/vmstat_solaris2.lo: ./ucd-snmp/vmstat_solaris2.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/net-snmp-config.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/system/linux.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/system/sysv.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/system/generic.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/machine/generic.h
+./util_funcs/get_pid_from_inode.lo: ./util_funcs/get_pid_from_inode.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/output_api.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/types.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/types.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/definitions.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/snmp_api.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/varbind_api.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/snmp_client.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/pdu_api.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/asn1.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/session_api.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/callback.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/snmp_transport.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/snmp_service.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/ucd_compat.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/mib.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/mib_api.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/parse.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/oid_stash.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/snmp_impl.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/snmp.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/snmp-tc.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/snmp_debug.h
+./util_funcs/get_pid_from_inode.lo: ../../include/net-snmp/library/snmp_logging.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/net-snmp-config.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/system/linux.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/system/sysv.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/system/generic.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/machine/generic.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/net-snmp-includes.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/definitions.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/types.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/types.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmp_api.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/varbind_api.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmp_client.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/pdu_api.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/asn1.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/session_api.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/callback.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmp_transport.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmp_service.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/ucd_compat.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/mib.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/mib_api.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/parse.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/oid_stash.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmp_impl.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmp.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmp-tc.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/getopt.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/utilities.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/system.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/tools.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/int64.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/mt_support.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmp_alarm.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/data_list.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/check_varbind.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/container.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/factory.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmp_logging.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/container_binary_array.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/container_list_ssll.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/container_iterator.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/container.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmp_assert.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/version.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/config_api.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/read_config.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/default_store.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmp_enum.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/vacm.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/output_api.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmp_debug.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/snmpv3_api.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmpv3.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/transform_oids.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/keytools.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/scapi.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/lcd_time.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmp_secmod.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/snmpusm.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/mib_module_config.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/agent_module_config.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/snmp_agent.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/snmp_vars.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/agent_handler.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/var_struct.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/agent_registry.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/library/fd_event_manager.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/ds_agent.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/agent_read_config.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/agent_trap.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/all_helpers.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/instance.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/baby_steps.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/scalar.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/scalar_group.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/watcher.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/multiplexer.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/null.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/debug_handler.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/cache_handler.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/old_api.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/read_only.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/row_merge.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/serialize.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/mode_end_call.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/table.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/table_data.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/table_dataset.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/table_tdata.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/table_iterator.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/table_container.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/table_array.h
+./util_funcs/header_generic.lo: ../../include/net-snmp/agent/mfd.h
+./util_funcs/header_generic.lo: ./util_funcs/header_generic.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/net-snmp-config.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/system/linux.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/system/sysv.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/system/generic.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/machine/generic.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/net-snmp-includes.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/definitions.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/types.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/types.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmp_api.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/varbind_api.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmp_client.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/pdu_api.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/asn1.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/session_api.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/callback.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmp_transport.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmp_service.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/ucd_compat.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/mib.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/mib_api.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/parse.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/oid_stash.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmp_impl.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmp.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmp-tc.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/getopt.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/utilities.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/system.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/tools.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/int64.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/mt_support.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmp_alarm.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/data_list.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/check_varbind.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/container.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/factory.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmp_logging.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/container_binary_array.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/container_list_ssll.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/container_iterator.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/container.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmp_assert.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/version.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/config_api.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/read_config.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/default_store.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmp_enum.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/vacm.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/output_api.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmp_debug.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/snmpv3_api.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmpv3.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/transform_oids.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/keytools.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/scapi.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/lcd_time.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmp_secmod.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/snmpusm.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/mib_module_config.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/agent_module_config.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/snmp_agent.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/snmp_vars.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/agent_handler.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/var_struct.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/agent_registry.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/library/fd_event_manager.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/ds_agent.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/agent_read_config.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/agent_trap.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/all_helpers.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/instance.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/baby_steps.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/scalar.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/scalar_group.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/watcher.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/multiplexer.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/null.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/debug_handler.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/cache_handler.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/old_api.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/read_only.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/row_merge.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/serialize.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/mode_end_call.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/table.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/table_data.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/table_dataset.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/table_tdata.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/table_iterator.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/table_container.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/table_array.h
+./util_funcs/header_simple_table.lo: ../../include/net-snmp/agent/mfd.h
+./util_funcs/header_simple_table.lo: ./util_funcs/header_simple_table.h
 ./utilities/execute.lo: ../../include/net-snmp/net-snmp-config.h
 ./utilities/execute.lo: ../../include/net-snmp/system/linux.h
 ./utilities/execute.lo: ../../include/net-snmp/system/sysv.h
@@ -14700,32 +17001,14 @@
 ./utilities/execute.lo: ../../include/net-snmp/net-snmp-includes.h
 ./utilities/execute.lo: ../../include/net-snmp/definitions.h
 ./utilities/execute.lo: ../../include/net-snmp/types.h
+./utilities/execute.lo: ../../include/net-snmp/library/types.h
 ./utilities/execute.lo: ../../include/net-snmp/library/snmp_api.h
-./utilities/execute.lo: ../../include/net-snmp/library/asn1.h
-./utilities/execute.lo: ../../include/net-snmp/library/snmp_impl.h
-./utilities/execute.lo: ../../include/net-snmp/library/snmp.h
-./utilities/execute.lo: ../../include/net-snmp/library/snmp-tc.h
-./utilities/execute.lo: ../../include/net-snmp/utilities.h
+./utilities/execute.lo: ../../include/net-snmp/varbind_api.h
 ./utilities/execute.lo: ../../include/net-snmp/library/snmp_client.h
-./utilities/execute.lo: ../../include/net-snmp/library/system.h
-./utilities/execute.lo: ../../include/net-snmp/library/tools.h
-./utilities/execute.lo: ../../include/net-snmp/library/int64.h
-./utilities/execute.lo: ../../include/net-snmp/library/mt_support.h
-./utilities/execute.lo: ../../include/net-snmp/library/snmp_alarm.h
-./utilities/execute.lo: ../../include/net-snmp/library/callback.h
-./utilities/execute.lo: ../../include/net-snmp/library/data_list.h
-./utilities/execute.lo: ../../include/net-snmp/library/oid_stash.h
-./utilities/execute.lo: ../../include/net-snmp/library/check_varbind.h
-./utilities/execute.lo: ../../include/net-snmp/library/container.h
-./utilities/execute.lo: ../../include/net-snmp/library/factory.h
-./utilities/execute.lo: ../../include/net-snmp/library/snmp_logging.h
-./utilities/execute.lo: ../../include/net-snmp/library/container_binary_array.h
-./utilities/execute.lo: ../../include/net-snmp/library/container_list_ssll.h
-./utilities/execute.lo: ../../include/net-snmp/library/container_iterator.h
-./utilities/execute.lo: ../../include/net-snmp/library/container.h
-./utilities/execute.lo: ../../include/net-snmp/library/snmp_assert.h
-./utilities/execute.lo: ../../include/net-snmp/version.h
+./utilities/execute.lo: ../../include/net-snmp/pdu_api.h
+./utilities/execute.lo: ../../include/net-snmp/library/asn1.h
 ./utilities/execute.lo: ../../include/net-snmp/session_api.h
+./utilities/execute.lo: ../../include/net-snmp/library/callback.h
 ./utilities/execute.lo: ../../include/net-snmp/library/snmp_transport.h
 ./utilities/execute.lo: ../../include/net-snmp/library/snmp_service.h
 ./utilities/execute.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -14736,11 +17019,31 @@
 ./utilities/execute.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./utilities/execute.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./utilities/execute.lo: ../../include/net-snmp/library/ucd_compat.h
-./utilities/execute.lo: ../../include/net-snmp/pdu_api.h
-./utilities/execute.lo: ../../include/net-snmp/mib_api.h
 ./utilities/execute.lo: ../../include/net-snmp/library/mib.h
+./utilities/execute.lo: ../../include/net-snmp/mib_api.h
 ./utilities/execute.lo: ../../include/net-snmp/library/parse.h
-./utilities/execute.lo: ../../include/net-snmp/varbind_api.h
+./utilities/execute.lo: ../../include/net-snmp/library/oid_stash.h
+./utilities/execute.lo: ../../include/net-snmp/library/snmp_impl.h
+./utilities/execute.lo: ../../include/net-snmp/library/snmp.h
+./utilities/execute.lo: ../../include/net-snmp/library/snmp-tc.h
+./utilities/execute.lo: ../../include/net-snmp/library/getopt.h
+./utilities/execute.lo: ../../include/net-snmp/utilities.h
+./utilities/execute.lo: ../../include/net-snmp/library/system.h
+./utilities/execute.lo: ../../include/net-snmp/library/tools.h
+./utilities/execute.lo: ../../include/net-snmp/library/int64.h
+./utilities/execute.lo: ../../include/net-snmp/library/mt_support.h
+./utilities/execute.lo: ../../include/net-snmp/library/snmp_alarm.h
+./utilities/execute.lo: ../../include/net-snmp/library/data_list.h
+./utilities/execute.lo: ../../include/net-snmp/library/check_varbind.h
+./utilities/execute.lo: ../../include/net-snmp/library/container.h
+./utilities/execute.lo: ../../include/net-snmp/library/factory.h
+./utilities/execute.lo: ../../include/net-snmp/library/snmp_logging.h
+./utilities/execute.lo: ../../include/net-snmp/library/container_binary_array.h
+./utilities/execute.lo: ../../include/net-snmp/library/container_list_ssll.h
+./utilities/execute.lo: ../../include/net-snmp/library/container_iterator.h
+./utilities/execute.lo: ../../include/net-snmp/library/container.h
+./utilities/execute.lo: ../../include/net-snmp/library/snmp_assert.h
+./utilities/execute.lo: ../../include/net-snmp/version.h
 ./utilities/execute.lo: ../../include/net-snmp/config_api.h
 ./utilities/execute.lo: ../../include/net-snmp/library/read_config.h
 ./utilities/execute.lo: ../../include/net-snmp/library/default_store.h
@@ -14794,7 +17097,10 @@
 ./utilities/execute.lo: ../../include/net-snmp/agent/table_container.h
 ./utilities/execute.lo: ../../include/net-snmp/agent/table_array.h
 ./utilities/execute.lo: ../../include/net-snmp/agent/mfd.h
-./utilities/execute.lo: ucd-snmp/errormib.h mibdefs.h util_funcs.h struct.h
+./utilities/execute.lo: ucd-snmp/errormib.h mibdefs.h util_funcs.h
+./utilities/execute.lo: util_funcs/header_generic.h
+./utilities/execute.lo: util_funcs/header_simple_table.h struct.h
+./utilities/execute.lo: util_funcs/MIB_STATS_CACHE_TIMEOUT.h
 ./utilities/execute.lo: ./utilities/execute.h
 ./utilities/iquery.lo: ../../include/net-snmp/net-snmp-config.h
 ./utilities/iquery.lo: ../../include/net-snmp/system/linux.h
@@ -14804,32 +17110,14 @@
 ./utilities/iquery.lo: ../../include/net-snmp/net-snmp-includes.h
 ./utilities/iquery.lo: ../../include/net-snmp/definitions.h
 ./utilities/iquery.lo: ../../include/net-snmp/types.h
+./utilities/iquery.lo: ../../include/net-snmp/library/types.h
 ./utilities/iquery.lo: ../../include/net-snmp/library/snmp_api.h
-./utilities/iquery.lo: ../../include/net-snmp/library/asn1.h
-./utilities/iquery.lo: ../../include/net-snmp/library/snmp_impl.h
-./utilities/iquery.lo: ../../include/net-snmp/library/snmp.h
-./utilities/iquery.lo: ../../include/net-snmp/library/snmp-tc.h
-./utilities/iquery.lo: ../../include/net-snmp/utilities.h
+./utilities/iquery.lo: ../../include/net-snmp/varbind_api.h
 ./utilities/iquery.lo: ../../include/net-snmp/library/snmp_client.h
-./utilities/iquery.lo: ../../include/net-snmp/library/system.h
-./utilities/iquery.lo: ../../include/net-snmp/library/tools.h
-./utilities/iquery.lo: ../../include/net-snmp/library/int64.h
-./utilities/iquery.lo: ../../include/net-snmp/library/mt_support.h
-./utilities/iquery.lo: ../../include/net-snmp/library/snmp_alarm.h
-./utilities/iquery.lo: ../../include/net-snmp/library/callback.h
-./utilities/iquery.lo: ../../include/net-snmp/library/data_list.h
-./utilities/iquery.lo: ../../include/net-snmp/library/oid_stash.h
-./utilities/iquery.lo: ../../include/net-snmp/library/check_varbind.h
-./utilities/iquery.lo: ../../include/net-snmp/library/container.h
-./utilities/iquery.lo: ../../include/net-snmp/library/factory.h
-./utilities/iquery.lo: ../../include/net-snmp/library/snmp_logging.h
-./utilities/iquery.lo: ../../include/net-snmp/library/container_binary_array.h
-./utilities/iquery.lo: ../../include/net-snmp/library/container_list_ssll.h
-./utilities/iquery.lo: ../../include/net-snmp/library/container_iterator.h
-./utilities/iquery.lo: ../../include/net-snmp/library/container.h
-./utilities/iquery.lo: ../../include/net-snmp/library/snmp_assert.h
-./utilities/iquery.lo: ../../include/net-snmp/version.h
+./utilities/iquery.lo: ../../include/net-snmp/pdu_api.h
+./utilities/iquery.lo: ../../include/net-snmp/library/asn1.h
 ./utilities/iquery.lo: ../../include/net-snmp/session_api.h
+./utilities/iquery.lo: ../../include/net-snmp/library/callback.h
 ./utilities/iquery.lo: ../../include/net-snmp/library/snmp_transport.h
 ./utilities/iquery.lo: ../../include/net-snmp/library/snmp_service.h
 ./utilities/iquery.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -14840,11 +17128,31 @@
 ./utilities/iquery.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./utilities/iquery.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./utilities/iquery.lo: ../../include/net-snmp/library/ucd_compat.h
-./utilities/iquery.lo: ../../include/net-snmp/pdu_api.h
-./utilities/iquery.lo: ../../include/net-snmp/mib_api.h
 ./utilities/iquery.lo: ../../include/net-snmp/library/mib.h
+./utilities/iquery.lo: ../../include/net-snmp/mib_api.h
 ./utilities/iquery.lo: ../../include/net-snmp/library/parse.h
-./utilities/iquery.lo: ../../include/net-snmp/varbind_api.h
+./utilities/iquery.lo: ../../include/net-snmp/library/oid_stash.h
+./utilities/iquery.lo: ../../include/net-snmp/library/snmp_impl.h
+./utilities/iquery.lo: ../../include/net-snmp/library/snmp.h
+./utilities/iquery.lo: ../../include/net-snmp/library/snmp-tc.h
+./utilities/iquery.lo: ../../include/net-snmp/library/getopt.h
+./utilities/iquery.lo: ../../include/net-snmp/utilities.h
+./utilities/iquery.lo: ../../include/net-snmp/library/system.h
+./utilities/iquery.lo: ../../include/net-snmp/library/tools.h
+./utilities/iquery.lo: ../../include/net-snmp/library/int64.h
+./utilities/iquery.lo: ../../include/net-snmp/library/mt_support.h
+./utilities/iquery.lo: ../../include/net-snmp/library/snmp_alarm.h
+./utilities/iquery.lo: ../../include/net-snmp/library/data_list.h
+./utilities/iquery.lo: ../../include/net-snmp/library/check_varbind.h
+./utilities/iquery.lo: ../../include/net-snmp/library/container.h
+./utilities/iquery.lo: ../../include/net-snmp/library/factory.h
+./utilities/iquery.lo: ../../include/net-snmp/library/snmp_logging.h
+./utilities/iquery.lo: ../../include/net-snmp/library/container_binary_array.h
+./utilities/iquery.lo: ../../include/net-snmp/library/container_list_ssll.h
+./utilities/iquery.lo: ../../include/net-snmp/library/container_iterator.h
+./utilities/iquery.lo: ../../include/net-snmp/library/container.h
+./utilities/iquery.lo: ../../include/net-snmp/library/snmp_assert.h
+./utilities/iquery.lo: ../../include/net-snmp/version.h
 ./utilities/iquery.lo: ../../include/net-snmp/config_api.h
 ./utilities/iquery.lo: ../../include/net-snmp/library/read_config.h
 ./utilities/iquery.lo: ../../include/net-snmp/library/default_store.h
@@ -14906,32 +17214,14 @@
 ./utilities/override.lo: ../../include/net-snmp/net-snmp-includes.h
 ./utilities/override.lo: ../../include/net-snmp/definitions.h
 ./utilities/override.lo: ../../include/net-snmp/types.h
+./utilities/override.lo: ../../include/net-snmp/library/types.h
 ./utilities/override.lo: ../../include/net-snmp/library/snmp_api.h
-./utilities/override.lo: ../../include/net-snmp/library/asn1.h
-./utilities/override.lo: ../../include/net-snmp/library/snmp_impl.h
-./utilities/override.lo: ../../include/net-snmp/library/snmp.h
-./utilities/override.lo: ../../include/net-snmp/library/snmp-tc.h
-./utilities/override.lo: ../../include/net-snmp/utilities.h
+./utilities/override.lo: ../../include/net-snmp/varbind_api.h
 ./utilities/override.lo: ../../include/net-snmp/library/snmp_client.h
-./utilities/override.lo: ../../include/net-snmp/library/system.h
-./utilities/override.lo: ../../include/net-snmp/library/tools.h
-./utilities/override.lo: ../../include/net-snmp/library/int64.h
-./utilities/override.lo: ../../include/net-snmp/library/mt_support.h
-./utilities/override.lo: ../../include/net-snmp/library/snmp_alarm.h
-./utilities/override.lo: ../../include/net-snmp/library/callback.h
-./utilities/override.lo: ../../include/net-snmp/library/data_list.h
-./utilities/override.lo: ../../include/net-snmp/library/oid_stash.h
-./utilities/override.lo: ../../include/net-snmp/library/check_varbind.h
-./utilities/override.lo: ../../include/net-snmp/library/container.h
-./utilities/override.lo: ../../include/net-snmp/library/factory.h
-./utilities/override.lo: ../../include/net-snmp/library/snmp_logging.h
-./utilities/override.lo: ../../include/net-snmp/library/container_binary_array.h
-./utilities/override.lo: ../../include/net-snmp/library/container_list_ssll.h
-./utilities/override.lo: ../../include/net-snmp/library/container_iterator.h
-./utilities/override.lo: ../../include/net-snmp/library/container.h
-./utilities/override.lo: ../../include/net-snmp/library/snmp_assert.h
-./utilities/override.lo: ../../include/net-snmp/version.h
+./utilities/override.lo: ../../include/net-snmp/pdu_api.h
+./utilities/override.lo: ../../include/net-snmp/library/asn1.h
 ./utilities/override.lo: ../../include/net-snmp/session_api.h
+./utilities/override.lo: ../../include/net-snmp/library/callback.h
 ./utilities/override.lo: ../../include/net-snmp/library/snmp_transport.h
 ./utilities/override.lo: ../../include/net-snmp/library/snmp_service.h
 ./utilities/override.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
@@ -14942,11 +17232,31 @@
 ./utilities/override.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
 ./utilities/override.lo: ../../include/net-snmp/library/snmpIPXDomain.h
 ./utilities/override.lo: ../../include/net-snmp/library/ucd_compat.h
-./utilities/override.lo: ../../include/net-snmp/pdu_api.h
-./utilities/override.lo: ../../include/net-snmp/mib_api.h
 ./utilities/override.lo: ../../include/net-snmp/library/mib.h
+./utilities/override.lo: ../../include/net-snmp/mib_api.h
 ./utilities/override.lo: ../../include/net-snmp/library/parse.h
-./utilities/override.lo: ../../include/net-snmp/varbind_api.h
+./utilities/override.lo: ../../include/net-snmp/library/oid_stash.h
+./utilities/override.lo: ../../include/net-snmp/library/snmp_impl.h
+./utilities/override.lo: ../../include/net-snmp/library/snmp.h
+./utilities/override.lo: ../../include/net-snmp/library/snmp-tc.h
+./utilities/override.lo: ../../include/net-snmp/library/getopt.h
+./utilities/override.lo: ../../include/net-snmp/utilities.h
+./utilities/override.lo: ../../include/net-snmp/library/system.h
+./utilities/override.lo: ../../include/net-snmp/library/tools.h
+./utilities/override.lo: ../../include/net-snmp/library/int64.h
+./utilities/override.lo: ../../include/net-snmp/library/mt_support.h
+./utilities/override.lo: ../../include/net-snmp/library/snmp_alarm.h
+./utilities/override.lo: ../../include/net-snmp/library/data_list.h
+./utilities/override.lo: ../../include/net-snmp/library/check_varbind.h
+./utilities/override.lo: ../../include/net-snmp/library/container.h
+./utilities/override.lo: ../../include/net-snmp/library/factory.h
+./utilities/override.lo: ../../include/net-snmp/library/snmp_logging.h
+./utilities/override.lo: ../../include/net-snmp/library/container_binary_array.h
+./utilities/override.lo: ../../include/net-snmp/library/container_list_ssll.h
+./utilities/override.lo: ../../include/net-snmp/library/container_iterator.h
+./utilities/override.lo: ../../include/net-snmp/library/container.h
+./utilities/override.lo: ../../include/net-snmp/library/snmp_assert.h
+./utilities/override.lo: ../../include/net-snmp/version.h
 ./utilities/override.lo: ../../include/net-snmp/config_api.h
 ./utilities/override.lo: ../../include/net-snmp/library/read_config.h
 ./utilities/override.lo: ../../include/net-snmp/library/default_store.h
@@ -14999,5 +17309,109 @@
 ./utilities/override.lo: ../../include/net-snmp/agent/table_iterator.h
 ./utilities/override.lo: ../../include/net-snmp/agent/table_container.h
 ./utilities/override.lo: ../../include/net-snmp/agent/table_array.h
-./utilities/override.lo: ../../include/net-snmp/agent/mfd.h util_funcs.h
-./utilities/override.lo: struct.h
+./utilities/override.lo: ../../include/net-snmp/agent/mfd.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/net-snmp-config.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/system/linux.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/system/sysv.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/system/generic.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/machine/generic.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/net-snmp-includes.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/definitions.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/types.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/types.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmp_api.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/varbind_api.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmp_client.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/pdu_api.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/asn1.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/session_api.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/callback.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmp_transport.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmp_service.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmpCallbackDomain.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmpUnixDomain.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmpUDPDomain.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmpTCPDomain.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmpUDPIPv6Domain.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmpTCPIPv6Domain.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmpIPXDomain.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/ucd_compat.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/mib.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/mib_api.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/parse.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/oid_stash.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmp_impl.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmp.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmp-tc.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/getopt.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/utilities.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/system.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/tools.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/int64.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/mt_support.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmp_alarm.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/data_list.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/check_varbind.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/container.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/factory.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmp_logging.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/container_binary_array.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/container_list_ssll.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/container_iterator.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/container.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmp_assert.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/version.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/config_api.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/read_config.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/default_store.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmp_parse_args.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmp_enum.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/vacm.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/output_api.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmp_debug.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/snmpv3_api.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmpv3.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/transform_oids.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/keytools.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/scapi.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/lcd_time.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmp_secmod.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmpv3-security-includes.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/snmpusm.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/net-snmp-agent-includes.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/mib_module_config.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/agent_module_config.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/snmp_agent.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/snmp_vars.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/agent_handler.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/var_struct.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/agent_registry.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/library/fd_event_manager.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/ds_agent.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/agent_read_config.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/agent_trap.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/all_helpers.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/instance.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/baby_steps.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/scalar.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/scalar_group.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/watcher.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/multiplexer.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/null.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/debug_handler.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/cache_handler.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/old_api.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/read_only.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/row_merge.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/serialize.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/bulk_to_next.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/mode_end_call.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/table.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/table_data.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/table_dataset.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/table_tdata.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/table_iterator.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/table_container.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/table_array.h
+./utilities/snmp_get_statistic.lo: ../../include/net-snmp/agent/mfd.h
+./utilities/snmp_get_statistic.lo: ./utilities/snmp_get_statistic.h
diff --git a/agent/mibgroup/Rmon.h b/agent/mibgroup/Rmon.h
index 847eaa9..3a7d3a4 100644
--- a/agent/mibgroup/Rmon.h
+++ b/agent/mibgroup/Rmon.h
@@ -47,7 +47,9 @@
 config_require(Rmon/rows)
 config_require(Rmon/agutil)
 config_require(Rmon/statistics)
-config_require(Rmon/alarm)
+/* older implementation: */
+/* config_require(Rmon/alarm) */
+config_require(Rmon/alarmTable)
 config_require(Rmon/history)
 config_require(Rmon/event)
 config_add_mib(RMON-MIB)
diff --git a/agent/mibgroup/Rmon/agutil.c b/agent/mibgroup/Rmon/agutil.c
index 3b0c87a..26ba173 100644
--- a/agent/mibgroup/Rmon/agutil.c
+++ b/agent/mibgroup/Rmon/agutil.c
@@ -22,8 +22,6 @@
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 
-#include "util_funcs.h"
-
 #include "agutil.h"
 #include "agutil_api.h"
 
diff --git a/agent/mibgroup/Rmon/alarm.c b/agent/mibgroup/Rmon/alarm.c
index a04d415..aac5b42 100644
--- a/agent/mibgroup/Rmon/alarm.c
+++ b/agent/mibgroup/Rmon/alarm.c
@@ -43,7 +43,6 @@
 
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
-#include "util_funcs.h"
 #include "alarm.h"
     /*
      * Implementation headers 
@@ -684,23 +683,30 @@
 oid             oidalarmVariablesOid[] = { 1, 3, 6, 1, 2, 1, 16, 3 };
 
 struct variable7 oidalarmVariables[] = {
-    {IDalarmIndex, ASN_INTEGER, RONLY, var_alarmEntry, 3, {1, 1, 1}},
-    {IDalarmInterval, ASN_INTEGER, RWRITE, var_alarmEntry, 3, {1, 1, 2}},
-    {IDalarmVariable, ASN_OBJECT_ID, RWRITE, var_alarmEntry, 3, {1, 1, 3}},
-    {IDalarmSampleType, ASN_INTEGER, RWRITE, var_alarmEntry, 3, {1, 1, 4}},
-    {IDalarmValue, ASN_INTEGER, RONLY, var_alarmEntry, 3, {1, 1, 5}},
-    {IDalarmStartupAlarm, ASN_INTEGER, RWRITE, var_alarmEntry, 3,
-     {1, 1, 6}},
-    {IDalarmRisingThreshold, ASN_INTEGER, RWRITE, var_alarmEntry, 3,
-     {1, 1, 7}},
-    {IDalarmFallingThreshold, ASN_INTEGER, RWRITE, var_alarmEntry, 3,
-     {1, 1, 8}},
-    {IDalarmRisingEventIndex, ASN_INTEGER, RWRITE, var_alarmEntry, 3,
-     {1, 1, 9}},
-    {IDalarmFallingEventIndex, ASN_INTEGER, RWRITE, var_alarmEntry, 3,
-     {1, 1, 10}},
-    {IDalarmOwner, ASN_OCTET_STR, RWRITE, var_alarmEntry, 3, {1, 1, 11}},
-    {IDalarmStatus, ASN_INTEGER, RWRITE, var_alarmEntry, 3, {1, 1, 12}}
+    {IDalarmIndex, ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_alarmEntry, 3, {1, 1, 1}},
+    {IDalarmInterval, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_alarmEntry, 3, {1, 1, 2}},
+    {IDalarmVariable, ASN_OBJECT_ID, NETSNMP_OLDAPI_RWRITE,
+     var_alarmEntry, 3, {1, 1, 3}},
+    {IDalarmSampleType, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_alarmEntry, 3, {1, 1, 4}},
+    {IDalarmValue, ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_alarmEntry, 3, {1, 1, 5}},
+    {IDalarmStartupAlarm, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_alarmEntry, 3, {1, 1, 6}},
+    {IDalarmRisingThreshold, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_alarmEntry, 3, {1, 1, 7}},
+    {IDalarmFallingThreshold, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_alarmEntry, 3, {1, 1, 8}},
+    {IDalarmRisingEventIndex, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_alarmEntry, 3, {1, 1, 9}},
+    {IDalarmFallingEventIndex, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_alarmEntry, 3, {1, 1, 10}},
+    {IDalarmOwner, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_alarmEntry, 3, {1, 1, 11}},
+    {IDalarmStatus, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_alarmEntry, 3, {1, 1, 12}}
 };
 
 void
diff --git a/agent/mibgroup/Rmon/alarm.h b/agent/mibgroup/Rmon/alarm.h
index ae48c2d..05f2152 100644
--- a/agent/mibgroup/Rmon/alarm.h
+++ b/agent/mibgroup/Rmon/alarm.h
@@ -21,8 +21,6 @@
 #ifndef _MIBGROUP_ALARM_H
 #define _MIBGROUP_ALARM_H
 
-config_require(util_funcs)
-
     /*
      * function prototypes 
      */
diff --git a/agent/mibgroup/Rmon/alarmTable.c b/agent/mibgroup/Rmon/alarmTable.c
new file mode 100644
index 0000000..c9c2aea
--- /dev/null
+++ b/agent/mibgroup/Rmon/alarmTable.c
@@ -0,0 +1,831 @@
+/*--------------------------------------------------------------------------+
+| Edition History:                                                          |
+| #   Date     Comments                                                 By  |
+| --- -------- -------------------------------------------------------- --- |
+|   1 07/05/18 Created.                                                 emi |
++--------------------------------------------------------------------------*/
+/*
+ * Note: this file originally auto-generated by mib2c using
+ *  : mib2c.table_data.conf,v 1.11.2.1 2006/01/11 15:17:47 dts12 Exp $
+ */
+
+#include <net-snmp/net-snmp-config.h>
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+#include "utilities/iquery.h"
+#include "alarmTable.h"
+
+/** Initializes the alarmTable module */
+void
+init_alarmTable(void)
+{
+    /*
+     * here we initialize all the tables we're planning on supporting 
+     */
+    initialize_table_alarmTable();
+}
+
+/** Initialize the alarmTable table by defining its contents and how it's structured */
+void
+initialize_table_alarmTable(void)
+{
+    static oid      alarmTable_oid[] = { 1, 3, 6, 1, 2, 1, 16, 3, 1 };
+    size_t          alarmTable_oid_len = OID_LENGTH(alarmTable_oid);
+    netsnmp_handler_registration *reg;
+    netsnmp_tdata  *table_data;
+    netsnmp_table_registration_info *table_info;
+
+    DEBUGMSGTL(( "rmon:alarmTable", "initialize_table_alarmTable called.\n"));
+    reg =
+        netsnmp_create_handler_registration("alarmTable",
+                                            alarmTable_handler,
+                                            alarmTable_oid,
+                                            alarmTable_oid_len,
+                                            HANDLER_CAN_RWRITE);
+
+    table_data = netsnmp_tdata_create_table("alarmTable", 0);
+    table_info = SNMP_MALLOC_TYPEDEF(netsnmp_table_registration_info);
+    netsnmp_table_helper_add_indexes(table_info, ASN_INTEGER,   /* index: alarmIndex */
+                                     0);
+
+    table_info->min_column = COLUMN_ALARMINDEX;
+    table_info->max_column = COLUMN_ALARMSTATUS;
+
+    netsnmp_tdata_register(reg, table_data, table_info);
+
+    /*
+     * Initialise the contents of the table here 
+     */
+}
+
+extern int
+event_api_send_alarm(u_char is_rising,
+                     u_long alarm_index,
+                     u_long event_index,
+                     oid * alarmed_var,
+                     size_t alarmed_var_length,
+                     u_long sample_type,
+                     u_long value,
+                     u_long the_threshold, char *alarm_descr);
+
+#define ALARM_STR1_LEN	32
+typedef enum {
+    RMON1_ENTRY_VALID = 1,
+    RMON1_ENTRY_CREATE_REQUEST,
+    RMON1_ENTRY_UNDER_CREATION,
+    RMON1_ENTRY_INVALID
+} RMON1_ENTRY_STATUS_T;
+
+typedef enum {
+    SAMPLE_TYPE_ABSOLUTE =
+    1,
+    SAMPLE_TYPE_DELTE
+} SAMPLE_TYPE_T;
+
+typedef enum {
+    ALARM_NOTHING =
+    0,
+    ALARM_RISING,
+    ALARM_FALLING,
+    ALARM_BOTH
+} ALARM_TYPE_T;
+    /*
+     * Typical data structure for a row entry 
+     */
+struct alarmTable_entry {
+    /*
+     * Index values 
+     */
+    long            alarmIndex;
+
+    /*
+     * Column values 
+     */
+    long            alarmInterval;
+    long            old_alarmInterval;
+    oid             alarmVariable[ALARM_STR1_LEN];
+    size_t          alarmVariable_len;
+    oid             old_alarmVariable[ALARM_STR1_LEN];
+    size_t          old_alarmVariable_len;
+    long            alarmSampleType;
+    long            old_alarmSampleType;
+    long            alarmValue;
+    long            alarmStartupAlarm;
+    long            old_alarmStartupAlarm;
+    long            alarmRisingThreshold;
+    long            old_alarmRisingThreshold;
+    long            alarmFallingThreshold;
+    long            old_alarmFallingThreshold;
+    long            alarmRisingEventIndex;
+    long            old_alarmRisingEventIndex;
+    long            alarmFallingEventIndex;
+    long            old_alarmFallingEventIndex;
+    char            alarmOwner[ALARM_STR1_LEN];
+    size_t          alarmOwner_len;
+    char            old_alarmOwner[ALARM_STR1_LEN];
+    size_t          old_alarmOwner_len;
+    long            alarmStatus;
+    long            old_alarmStatus;
+
+    int             valid;
+    unsigned int    alarm_reg;
+    netsnmp_session *session;
+    u_long          last_abs_value;
+    ALARM_TYPE_T    prev_alarm;        /* NOTHING | RISING | FALLING */
+};
+
+
+void
+alarmTable_run( unsigned int reg, void *clientarg)
+{
+    struct alarmTable_entry *entry = (struct alarmTable_entry *)clientarg;
+    netsnmp_variable_list *var;
+    u_long new_value;
+    int rc;
+
+    if (!entry) {
+        snmp_alarm_unregister( reg );
+        return;
+    }
+    /*
+     * Retrieve the requested MIB value(s)...
+     */
+    DEBUGMSGTL(( "rmon:alarmTable", "alarmTable_run called\n"));
+    var = (netsnmp_variable_list *)SNMP_MALLOC_TYPEDEF( netsnmp_variable_list );
+    if (!var) {
+        snmp_log(LOG_ERR,"failed to create alarmTable query varbind");
+        return;
+    }
+    snmp_set_var_objid( var, entry->alarmVariable,
+                             entry->alarmVariable_len );
+    
+    rc = netsnmp_query_get(  var, entry->session );
+    if ( rc != SNMP_ERR_NOERROR ) {
+        DEBUGMSGTL(( "rmon:alarmTable", "alarmVariable query failed (%d)\n", rc));
+        snmp_free_varbind(var);
+        return;
+    }
+
+	switch (var->type) {
+    case ASN_INTEGER:
+    case ASN_COUNTER:
+    case ASN_TIMETICKS:
+    case ASN_GAUGE:
+    case ASN_COUNTER64:
+        new_value = *var->val.integer;
+        break;
+    default:
+        DEBUGMSGTL(("rmon:alarmTable", "invalid type (%d)\n", var->type));
+        snmp_free_varbind(var);
+        return ;
+    }
+
+    DEBUGMSGTL(("rmon:alarmTable", "alarmIndex.%d last value (%d)\n", entry->alarmIndex, entry->last_abs_value));
+    DEBUGMSGTL(("rmon:alarmTable", "alarmIndex.%d new_value (%d)\n", entry->alarmIndex, new_value));
+
+    entry->alarmValue = (SAMPLE_TYPE_ABSOLUTE == entry->alarmSampleType) ?
+        new_value : new_value - entry->last_abs_value;
+    entry->last_abs_value = new_value;
+
+    if (ALARM_RISING != entry->prev_alarm &&
+        entry->alarmValue >= entry->alarmRisingThreshold) {
+        if (SNMP_ERR_NOERROR == event_api_send_alarm(1, entry->alarmIndex,
+                                                 entry->alarmRisingEventIndex,
+                                                 entry->alarmVariable,
+                                                 entry->alarmVariable_len,
+                                                 entry->alarmSampleType, 
+                                                 entry->alarmValue,
+                                                 entry->alarmRisingThreshold,
+                                                 "Rising"))
+            entry->prev_alarm = ALARM_RISING;
+        else 
+            snmp_log(LOG_ERR,"failed to send rising alarm\n");
+    }
+    else if (ALARM_FALLING != entry->prev_alarm &&
+             entry->alarmValue <= entry->alarmFallingThreshold) {
+        if (SNMP_ERR_NOERROR == event_api_send_alarm(0, entry->alarmIndex,
+                                                      entry->alarmFallingEventIndex,
+                                                      entry->alarmVariable,
+                                                      entry->alarmVariable_len, 
+                                                      entry->alarmSampleType,
+                                                      entry->alarmValue,
+                                                      entry->alarmFallingThreshold,
+                                                      "Falling"))
+            entry->prev_alarm = ALARM_FALLING;
+        else 
+            snmp_log(LOG_ERR,"failed to send falling alarm\n");
+    }
+    else
+        DEBUGMSGTL(("rmon:alarmTable", "no alarm sent\n"));
+
+    snmp_free_varbind(var);
+}
+
+void
+alarmTable_enable( struct alarmTable_entry *entry )
+{
+    if (!entry)
+        return;
+
+    DEBUGMSGTL(( "rmon:alarmTable", "alarmTable_enable called.\n"));
+    if (entry->alarm_reg) {
+        snmp_alarm_unregister( entry->alarm_reg );
+        entry->alarm_reg = 0;
+    }
+
+    if (entry->alarmInterval) {
+        /*
+         * register once to run ASAP, and another to run
+         * at the trigger frequency
+         */
+        snmp_alarm_register(0, 0, alarmTable_run, entry );
+        entry->alarm_reg = snmp_alarm_register(
+                           entry->alarmInterval, SA_REPEAT,
+                           alarmTable_run, entry );
+    }
+}
+
+void
+alarmTable_disable( struct alarmTable_entry *entry )
+{
+    if (!entry)
+        return;
+
+    DEBUGMSGTL(( "rmon:alarmTable", "alarmTable_disable called.\n"));
+    if (entry->alarm_reg) {
+        snmp_alarm_unregister( entry->alarm_reg );
+        entry->alarm_reg = 0;
+        /* XXX - perhaps release any previous results */
+    }
+}
+
+/*
+ * create a new row in the table 
+ */
+netsnmp_tdata_row *
+alarmTable_createEntry(netsnmp_tdata * table_data, long alarmIndex)
+{
+    struct alarmTable_entry *entry;
+    netsnmp_tdata_row *row;
+
+    DEBUGMSGTL(( "rmon:alarmTable", "alarmTable_createEntry called.\n"));
+    entry = SNMP_MALLOC_TYPEDEF(struct alarmTable_entry);
+    if (!entry)
+        return NULL;
+
+    row = netsnmp_tdata_create_row();
+    if (!row) {
+        SNMP_FREE(entry);
+        return NULL;
+    }
+    row->data = entry;
+    entry->alarmIndex = alarmIndex;
+    entry->alarmInterval = 1;
+    entry->alarmSampleType = SAMPLE_TYPE_ABSOLUTE;
+    entry->alarmStartupAlarm = ALARM_BOTH;
+    entry->alarmRisingThreshold = 10;
+    entry->alarmFallingThreshold = 5;
+    entry->alarmRisingEventIndex = alarmIndex;
+    entry->alarmFallingEventIndex = alarmIndex;
+    entry->prev_alarm = ALARM_NOTHING;
+    netsnmp_tdata_row_add_index(row, ASN_INTEGER,
+                                &(entry->alarmIndex),
+                                sizeof(entry->alarmIndex));
+    netsnmp_tdata_add_row(table_data, row);
+    return row;
+}
+
+/*
+ * remove a row from the table 
+ */
+void
+alarmTable_removeEntry(netsnmp_tdata * table_data, netsnmp_tdata_row * row)
+{
+    struct alarmTable_entry *entry;
+
+    DEBUGMSGTL(( "rmon:alarmTable", "alarmTable_removeEntry called.\n"));
+    if (!row)
+        return;                 /* Nothing to remove */
+    entry = (struct alarmTable_entry *)
+        netsnmp_tdata_remove_and_delete_row(table_data, row);
+    if (entry) {
+        alarmTable_disable(entry);
+        SNMP_FREE(entry);       /* XXX - release any other internal resources */
+    }
+}
+
+
+/** handles requests for the alarmTable table */
+int
+alarmTable_handler(netsnmp_mib_handler *handler,
+                   netsnmp_handler_registration *reginfo,
+                   netsnmp_agent_request_info *reqinfo,
+                   netsnmp_request_info *requests)
+{
+    netsnmp_request_info *request;
+    netsnmp_table_request_info *table_info;
+    netsnmp_tdata  *table_data;
+    netsnmp_tdata_row *table_row;
+    struct alarmTable_entry *table_entry;
+    int             ret;
+    netsnmp_session *sess = NULL;
+    char           *secName;
+
+    DEBUGMSGTL(( "rmon:alarmTable", "alarmTable_handler called.\n"));
+    switch (reqinfo->mode) {
+        /*
+         * Read-support (also covers GetNext requests)
+         */
+    case MODE_GET:
+        for (request = requests; request; request = request->next) {
+            table_entry = (struct alarmTable_entry *)
+                netsnmp_tdata_extract_entry(request);
+            table_info = netsnmp_extract_table_info(request);
+
+            switch (table_info->colnum) {
+            case COLUMN_ALARMINDEX:
+                snmp_set_var_typed_integer(request->requestvb, ASN_INTEGER,
+                                           table_entry->alarmIndex);
+                break;
+            case COLUMN_ALARMINTERVAL:
+                snmp_set_var_typed_integer(request->requestvb, ASN_INTEGER,
+                                           table_entry->alarmInterval);
+                break;
+            case COLUMN_ALARMVARIABLE:
+                snmp_set_var_typed_value(request->requestvb, ASN_OBJECT_ID,
+                                         (u_char *) table_entry->
+                                         alarmVariable,
+                                         table_entry->alarmVariable_len *
+                                         sizeof(oid));
+                break;
+            case COLUMN_ALARMSAMPLETYPE:
+                snmp_set_var_typed_integer(request->requestvb, ASN_INTEGER,
+                                           table_entry->alarmSampleType);
+                break;
+            case COLUMN_ALARMVALUE:
+                snmp_set_var_typed_integer(request->requestvb, ASN_INTEGER,
+                                           table_entry->alarmValue);
+                break;
+            case COLUMN_ALARMSTARTUPALARM:
+                snmp_set_var_typed_integer(request->requestvb, ASN_INTEGER,
+                                           table_entry->alarmStartupAlarm);
+                break;
+            case COLUMN_ALARMRISINGTHRESHOLD:
+                snmp_set_var_typed_integer(request->requestvb, ASN_INTEGER,
+                                           table_entry->
+                                           alarmRisingThreshold);
+                break;
+            case COLUMN_ALARMFALLINGTHRESHOLD:
+                snmp_set_var_typed_integer(request->requestvb, ASN_INTEGER,
+                                           table_entry->
+                                           alarmFallingThreshold);
+                break;
+            case COLUMN_ALARMRISINGEVENTINDEX:
+                snmp_set_var_typed_integer(request->requestvb, ASN_INTEGER,
+                                           table_entry->
+                                           alarmRisingEventIndex);
+                break;
+            case COLUMN_ALARMFALLINGEVENTINDEX:
+                snmp_set_var_typed_integer(request->requestvb, ASN_INTEGER,
+                                           table_entry->
+                                           alarmFallingEventIndex);
+                break;
+            case COLUMN_ALARMOWNER:
+                snmp_set_var_typed_value(request->requestvb, ASN_OCTET_STR,
+                                         (u_char *) table_entry->
+                                         alarmOwner,
+                                         table_entry->alarmOwner_len);
+                break;
+            case COLUMN_ALARMSTATUS:
+                snmp_set_var_typed_integer(request->requestvb, ASN_INTEGER,
+                                           table_entry->alarmStatus);
+                break;
+            }
+        }
+        break;
+
+        /*
+         * Write-support
+         */
+    case MODE_SET_RESERVE1:
+        for (request = requests; request; request = request->next) {
+            table_entry = (struct alarmTable_entry *)
+                netsnmp_tdata_extract_entry(request);
+            table_info = netsnmp_extract_table_info(request);
+
+            switch (table_info->colnum) {
+            case COLUMN_ALARMINTERVAL:
+                /*
+                 * or possibly 'netsnmp_check_vb_int_range' 
+                 */
+                ret = netsnmp_check_vb_int(request->requestvb);
+                if (ret != SNMP_ERR_NOERROR) {
+                    netsnmp_set_request_error(reqinfo, request, ret);
+                    return SNMP_ERR_NOERROR;
+                }
+                break;
+            case COLUMN_ALARMVARIABLE:
+                /*
+                 * or possibly 'netsnmp_check_vb_type_and_max_size' 
+                 */
+                break;
+            case COLUMN_ALARMSAMPLETYPE:
+                /*
+                 * or possibly 'netsnmp_check_vb_int_range' 
+                 */
+                ret = netsnmp_check_vb_int(request->requestvb);
+                if (ret != SNMP_ERR_NOERROR) {
+                    netsnmp_set_request_error(reqinfo, request, ret);
+                    return SNMP_ERR_NOERROR;
+                }
+                break;
+            case COLUMN_ALARMSTARTUPALARM:
+                /*
+                 * or possibly 'netsnmp_check_vb_int_range' 
+                 */
+                ret = netsnmp_check_vb_int(request->requestvb);
+                if (ret != SNMP_ERR_NOERROR) {
+                    netsnmp_set_request_error(reqinfo, request, ret);
+                    return SNMP_ERR_NOERROR;
+                }
+                break;
+            case COLUMN_ALARMRISINGTHRESHOLD:
+                /*
+                 * or possibly 'netsnmp_check_vb_int_range' 
+                 */
+                ret = netsnmp_check_vb_int(request->requestvb);
+                if (ret != SNMP_ERR_NOERROR) {
+                    netsnmp_set_request_error(reqinfo, request, ret);
+                    return SNMP_ERR_NOERROR;
+                }
+                break;
+            case COLUMN_ALARMFALLINGTHRESHOLD:
+                /*
+                 * or possibly 'netsnmp_check_vb_int_range' 
+                 */
+                ret = netsnmp_check_vb_int(request->requestvb);
+                if (ret != SNMP_ERR_NOERROR) {
+                    netsnmp_set_request_error(reqinfo, request, ret);
+                    return SNMP_ERR_NOERROR;
+                }
+                break;
+            case COLUMN_ALARMRISINGEVENTINDEX:
+                /*
+                 * or possibly 'netsnmp_check_vb_int_range' 
+                 */
+                ret = netsnmp_check_vb_int(request->requestvb);
+                if (ret != SNMP_ERR_NOERROR) {
+                    netsnmp_set_request_error(reqinfo, request, ret);
+                    return SNMP_ERR_NOERROR;
+                }
+                break;
+            case COLUMN_ALARMFALLINGEVENTINDEX:
+                /*
+                 * or possibly 'netsnmp_check_vb_int_range' 
+                 */
+                ret = netsnmp_check_vb_int(request->requestvb);
+                if (ret != SNMP_ERR_NOERROR) {
+                    netsnmp_set_request_error(reqinfo, request, ret);
+                    return SNMP_ERR_NOERROR;
+                }
+                break;
+            case COLUMN_ALARMOWNER:
+                /*
+                 * or possibly 'netsnmp_check_vb_type_and_max_size' 
+                 */
+                break;
+            case COLUMN_ALARMSTATUS:
+                /*
+                 * or possibly 'netsnmp_check_vb_int_range' 
+                 */
+                ret = netsnmp_check_vb_int(request->requestvb);
+                if (ret != SNMP_ERR_NOERROR) {
+                    netsnmp_set_request_error(reqinfo, request, ret);
+                    return SNMP_ERR_NOERROR;
+                }
+                break;
+            default:
+                netsnmp_set_request_error(reqinfo, request,
+                                          SNMP_ERR_NOTWRITABLE);
+                return SNMP_ERR_NOERROR;
+            }
+        }
+        break;
+
+    case MODE_SET_RESERVE2:
+        for (request = requests; request; request = request->next) {
+            table_row = netsnmp_tdata_extract_row(request);
+            table_data = netsnmp_tdata_extract_table(request);
+            table_info = netsnmp_extract_table_info(request);
+
+            switch (table_info->colnum) {
+            case COLUMN_ALARMINTERVAL:
+            case COLUMN_ALARMVARIABLE:
+            case COLUMN_ALARMSAMPLETYPE:
+            case COLUMN_ALARMSTARTUPALARM:
+            case COLUMN_ALARMRISINGTHRESHOLD:
+            case COLUMN_ALARMFALLINGTHRESHOLD:
+            case COLUMN_ALARMRISINGEVENTINDEX:
+            case COLUMN_ALARMFALLINGEVENTINDEX:
+            case COLUMN_ALARMOWNER:
+            case COLUMN_ALARMSTATUS:
+                if (!table_row) {
+                    table_row =
+                        alarmTable_createEntry(table_data,
+                                               *table_info->indexes->val.
+                                               integer);
+                    if (table_row) {
+                        netsnmp_insert_tdata_row(request, table_row);
+                    } else {
+                        netsnmp_set_request_error(reqinfo, request,
+                                                  SNMP_ERR_RESOURCEUNAVAILABLE);
+                        return SNMP_ERR_NOERROR;
+                    }
+                }
+                break;
+            }
+        }
+        break;
+
+    case MODE_SET_FREE:
+        for (request = requests; request; request = request->next) {
+            table_entry = (struct alarmTable_entry *)
+                netsnmp_tdata_extract_entry(request);
+            table_row = netsnmp_tdata_extract_row(request);
+            table_data = netsnmp_tdata_extract_table(request);
+            table_info = netsnmp_extract_table_info(request);
+
+            switch (table_info->colnum) {
+            case COLUMN_ALARMINTERVAL:
+            case COLUMN_ALARMVARIABLE:
+            case COLUMN_ALARMSAMPLETYPE:
+            case COLUMN_ALARMSTARTUPALARM:
+            case COLUMN_ALARMRISINGTHRESHOLD:
+            case COLUMN_ALARMFALLINGTHRESHOLD:
+            case COLUMN_ALARMRISINGEVENTINDEX:
+            case COLUMN_ALARMFALLINGEVENTINDEX:
+            case COLUMN_ALARMOWNER:
+            case COLUMN_ALARMSTATUS:
+                if (table_entry && !table_entry->valid) {
+                    alarmTable_removeEntry(table_data, table_row);
+                }
+                break;
+            }
+        }
+        break;
+
+    case MODE_SET_ACTION:
+        for (request = requests; request; request = request->next) {
+            table_entry = (struct alarmTable_entry *)
+                netsnmp_tdata_extract_entry(request);
+            table_info = netsnmp_extract_table_info(request);
+
+            switch (table_info->colnum) {
+            case COLUMN_ALARMINTERVAL:
+                table_entry->old_alarmInterval =
+                    table_entry->alarmInterval;
+                table_entry->alarmInterval =
+                    *request->requestvb->val.integer;
+                break;
+            case COLUMN_ALARMVARIABLE:
+                table_entry->alarmVariable_len =
+                    request->requestvb->val_len / sizeof(oid);
+                memset(table_entry->alarmVariable, 0,
+                       sizeof(table_entry->alarmVariable));
+                memcpy(table_entry->alarmVariable,
+                       request->requestvb->val.objid,
+                       request->requestvb->val_len);
+                break;
+            case COLUMN_ALARMSAMPLETYPE:
+                table_entry->old_alarmSampleType =
+                    table_entry->alarmSampleType;
+                table_entry->alarmSampleType =
+                    *request->requestvb->val.integer;
+                break;
+            case COLUMN_ALARMSTARTUPALARM:
+                table_entry->old_alarmStartupAlarm =
+                    table_entry->alarmStartupAlarm;
+                table_entry->alarmStartupAlarm =
+                    *request->requestvb->val.integer;
+                break;
+            case COLUMN_ALARMRISINGTHRESHOLD:
+                table_entry->old_alarmRisingThreshold =
+                    table_entry->alarmRisingThreshold;
+                table_entry->alarmRisingThreshold =
+                    *request->requestvb->val.integer;
+                break;
+            case COLUMN_ALARMFALLINGTHRESHOLD:
+                table_entry->old_alarmFallingThreshold =
+                    table_entry->alarmFallingThreshold;
+                table_entry->alarmFallingThreshold =
+                    *request->requestvb->val.integer;
+                break;
+            case COLUMN_ALARMRISINGEVENTINDEX:
+                table_entry->old_alarmRisingEventIndex =
+                    table_entry->alarmRisingEventIndex;
+                table_entry->alarmRisingEventIndex =
+                    *request->requestvb->val.integer;
+                break;
+            case COLUMN_ALARMFALLINGEVENTINDEX:
+                table_entry->old_alarmFallingEventIndex =
+                    table_entry->alarmFallingEventIndex;
+                table_entry->alarmFallingEventIndex =
+                    *request->requestvb->val.integer;
+                break;
+            case COLUMN_ALARMOWNER:
+                memcpy(table_entry->old_alarmOwner,
+                       table_entry->alarmOwner,
+                       sizeof(table_entry->alarmOwner));
+                table_entry->old_alarmOwner_len =
+                    table_entry->alarmOwner_len;
+                memset(table_entry->alarmOwner, 0,
+                       sizeof(table_entry->alarmOwner));
+                memcpy(table_entry->alarmOwner,
+                       request->requestvb->val.string,
+                       request->requestvb->val_len);
+                table_entry->alarmOwner_len = request->requestvb->val_len;
+                break;
+            case COLUMN_ALARMSTATUS:
+                table_entry->old_alarmStatus = table_entry->alarmStatus;
+                table_entry->alarmStatus =
+                    *request->requestvb->val.integer;
+                break;
+            }
+        }
+        break;
+
+    case MODE_SET_UNDO:
+        for (request = requests; request; request = request->next) {
+            table_entry = (struct alarmTable_entry *)
+                netsnmp_tdata_extract_entry(request);
+            table_row = netsnmp_tdata_extract_row(request);
+            table_data = netsnmp_tdata_extract_table(request);
+            table_info = netsnmp_extract_table_info(request);
+
+            switch (table_info->colnum) {
+            case COLUMN_ALARMINTERVAL:
+                if (table_entry && !table_entry->valid) {
+                    alarmTable_removeEntry(table_data, table_row);
+                } else {
+                    table_entry->alarmInterval =
+                        table_entry->old_alarmInterval;
+                    table_entry->old_alarmInterval = 0;
+                }
+                break;
+            case COLUMN_ALARMVARIABLE:
+                if (table_entry && !table_entry->valid) {
+                    alarmTable_removeEntry(table_data, table_row);
+                } else {
+                    memcpy(table_entry->alarmVariable,
+                           table_entry->old_alarmVariable,
+                           sizeof(table_entry->alarmVariable));
+                    memset(table_entry->old_alarmVariable, 0,
+                           sizeof(table_entry->alarmVariable));
+                    table_entry->alarmVariable_len =
+                        table_entry->old_alarmVariable_len;
+                }
+                break;
+            case COLUMN_ALARMSAMPLETYPE:
+                if (table_entry && !table_entry->valid) {
+                    alarmTable_removeEntry(table_data, table_row);
+                } else {
+                    table_entry->alarmSampleType =
+                        table_entry->old_alarmSampleType;
+                    table_entry->old_alarmSampleType = 0;
+                }
+                break;
+            case COLUMN_ALARMSTARTUPALARM:
+                if (table_entry && !table_entry->valid) {
+                    alarmTable_removeEntry(table_data, table_row);
+                } else {
+                    table_entry->alarmStartupAlarm =
+                        table_entry->old_alarmStartupAlarm;
+                    table_entry->old_alarmStartupAlarm = 0;
+                }
+                break;
+            case COLUMN_ALARMRISINGTHRESHOLD:
+                if (table_entry && !table_entry->valid) {
+                    alarmTable_removeEntry(table_data, table_row);
+                } else {
+                    table_entry->alarmRisingThreshold =
+                        table_entry->old_alarmRisingThreshold;
+                    table_entry->old_alarmRisingThreshold = 0;
+                }
+                break;
+            case COLUMN_ALARMFALLINGTHRESHOLD:
+                if (table_entry && !table_entry->valid) {
+                    alarmTable_removeEntry(table_data, table_row);
+                } else {
+                    table_entry->alarmFallingThreshold =
+                        table_entry->old_alarmFallingThreshold;
+                    table_entry->old_alarmFallingThreshold = 0;
+                }
+                break;
+            case COLUMN_ALARMRISINGEVENTINDEX:
+                if (table_entry && !table_entry->valid) {
+                    alarmTable_removeEntry(table_data, table_row);
+                } else {
+                    table_entry->alarmRisingEventIndex =
+                        table_entry->old_alarmRisingEventIndex;
+                    table_entry->old_alarmRisingEventIndex = 0;
+                }
+                break;
+            case COLUMN_ALARMFALLINGEVENTINDEX:
+                if (table_entry && !table_entry->valid) {
+                    alarmTable_removeEntry(table_data, table_row);
+                } else {
+                    table_entry->alarmFallingEventIndex =
+                        table_entry->old_alarmFallingEventIndex;
+                    table_entry->old_alarmFallingEventIndex = 0;
+                }
+                break;
+            case COLUMN_ALARMOWNER:
+                if (table_entry && !table_entry->valid) {
+                    alarmTable_removeEntry(table_data, table_row);
+                } else {
+                    memcpy(table_entry->alarmOwner,
+                           table_entry->old_alarmOwner,
+                           sizeof(table_entry->alarmOwner));
+                    memset(table_entry->old_alarmOwner, 0,
+                           sizeof(table_entry->alarmOwner));
+                    table_entry->alarmOwner_len =
+                        table_entry->old_alarmOwner_len;
+                }
+                break;
+            case COLUMN_ALARMSTATUS:
+                if (table_entry && !table_entry->valid) {
+                    alarmTable_removeEntry(table_data, table_row);
+                } else {
+                    table_entry->alarmStatus =
+                        table_entry->old_alarmStatus;
+                    table_entry->old_alarmStatus = 0;
+                }
+                break;
+            }
+        }
+        break;
+
+    case MODE_SET_COMMIT:
+        for (request = requests; request; request = request->next) {
+            table_entry = (struct alarmTable_entry *)
+                netsnmp_tdata_extract_entry(request);
+            table_info = netsnmp_extract_table_info(request);
+
+            switch (table_info->colnum) {
+            case COLUMN_ALARMINTERVAL:
+            case COLUMN_ALARMVARIABLE:
+            case COLUMN_ALARMSAMPLETYPE:
+            case COLUMN_ALARMSTARTUPALARM:
+            case COLUMN_ALARMRISINGTHRESHOLD:
+            case COLUMN_ALARMFALLINGTHRESHOLD:
+            case COLUMN_ALARMRISINGEVENTINDEX:
+            case COLUMN_ALARMFALLINGEVENTINDEX:
+            case COLUMN_ALARMOWNER:
+                if (table_entry && !table_entry->valid) {
+                    table_entry->valid = 1;
+                }
+                break;
+            case COLUMN_ALARMSTATUS:
+                switch (*request->requestvb->val.integer) {
+                case RMON1_ENTRY_VALID:
+                    alarmTable_enable( table_entry );
+                    break;
+                case RMON1_ENTRY_UNDER_CREATION:
+                    alarmTable_disable( table_entry );
+#if 0
+                    table_entry->session = (netsnmp_session *)
+                        netsnmp_iquery_pdu_session(reqinfo->asp->pdu);
+#else
+                    secName = netsnmp_ds_get_string(NETSNMP_DS_APPLICATION_ID,
+                                                    NETSNMP_DS_AGENT_INTERNAL_SECNAME);
+                    if (secName) {
+                        sess   = netsnmp_iquery_user_session(secName);
+                        netsnmp_query_set_default_session(sess);
+                        DEBUGMSGTL(("rmon:alarmTable", "user name %s\n", secName));
+                    } else { 
+                        snmp_log(LOG_ERR, "user name %s not found\n", secName);
+                        config_perror("Unknown user name\n");
+                    }
+
+                    if (NULL == sess) {
+                        sess = netsnmp_query_get_default_session();
+                        if (NULL == sess) {
+                            config_perror
+                                ("You must specify a default user name using the agentSecName token\n");
+                            return SNMP_ERR_NOERROR;
+                        }
+                    }
+#endif
+                    break;
+                case RMON1_ENTRY_INVALID:
+                    table_row = netsnmp_tdata_extract_row(request);
+                    table_data = netsnmp_tdata_extract_table(request);
+                    alarmTable_removeEntry(table_data, table_row);
+                }
+                break;
+            }
+        }
+        break;
+    }
+    return SNMP_ERR_NOERROR;
+}
diff --git a/agent/mibgroup/Rmon/alarmTable.h b/agent/mibgroup/Rmon/alarmTable.h
new file mode 100644
index 0000000..1a070b2
--- /dev/null
+++ b/agent/mibgroup/Rmon/alarmTable.h
@@ -0,0 +1,41 @@
+/*--------------------------------------------------------------------------+
+| Edition History:                                                          |
+| #   Date     Comments                                                 By  |
+| --- -------- -------------------------------------------------------- --- |
+|   1 07/05/18 Created.                                                 emi |
++--------------------------------------------------------------------------*/
+/*
+ * Note: this file originally auto-generated by mib2c using
+ *  : mib2c.table_data.conf,v 1.11.2.1 2006/01/11 15:17:47 dts12 Exp $
+ */
+#ifndef ALARMTABLE_H
+#define ALARMTABLE_H
+
+config_require(utilities/iquery)
+config_require(Rmon/agutil)
+config_require(Rmon/rows)
+config_require(Rmon/event)
+
+/*
+ * function declarations 
+ */
+void            init_alarmTable(void);
+void            initialize_table_alarmTable(void);
+Netsnmp_Node_Handler alarmTable_handler;
+
+/*
+ * column number definitions for table alarmTable 
+ */
+#define COLUMN_ALARMINDEX		1
+#define COLUMN_ALARMINTERVAL		2
+#define COLUMN_ALARMVARIABLE		3
+#define COLUMN_ALARMSAMPLETYPE		4
+#define COLUMN_ALARMVALUE		5
+#define COLUMN_ALARMSTARTUPALARM		6
+#define COLUMN_ALARMRISINGTHRESHOLD		7
+#define COLUMN_ALARMFALLINGTHRESHOLD		8
+#define COLUMN_ALARMRISINGEVENTINDEX		9
+#define COLUMN_ALARMFALLINGEVENTINDEX		10
+#define COLUMN_ALARMOWNER		11
+#define COLUMN_ALARMSTATUS		12
+#endif                          /* ALARMTABLE_H */
diff --git a/agent/mibgroup/Rmon/event.c b/agent/mibgroup/Rmon/event.c
index cab1d8b..127cf3f 100644
--- a/agent/mibgroup/Rmon/event.c
+++ b/agent/mibgroup/Rmon/event.c
@@ -45,8 +45,6 @@
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 
-#include "util_funcs.h"
-
 #include "event.h"
 
 /*
@@ -772,23 +770,34 @@
     /*
      * magic number        , variable type, ro/rw , callback fn  ,           L, oidsuffix 
      */
-    {EVENTINDEX, ASN_INTEGER, RONLY, var_eventTable, 2, {1, 1}},
-    {EVENTDESCRIPTION, ASN_OCTET_STR, RWRITE, var_eventTable, 2, {1, 2}},
-    {EVENTTYPE, ASN_INTEGER, RWRITE, var_eventTable, 2, {1, 3}},
-    {EVENTCOMMUNITY, ASN_OCTET_STR, RWRITE, var_eventTable, 2, {1, 4}},
-    {EVENTLASTTIMESENT, ASN_TIMETICKS, RONLY, var_eventTable, 2, {1, 5}},
-    {EVENTOWNER, ASN_OCTET_STR, RWRITE, var_eventTable, 2, {1, 6}},
-    {EVENTSTATUS, ASN_INTEGER, RWRITE, var_eventTable, 2, {1, 7}}
+    {EVENTINDEX, ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_eventTable, 2, {1, 1}},
+    {EVENTDESCRIPTION, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_eventTable, 2, {1, 2}},
+    {EVENTTYPE, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_eventTable, 2, {1, 3}},
+    {EVENTCOMMUNITY, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_eventTable, 2, {1, 4}},
+    {EVENTLASTTIMESENT, ASN_TIMETICKS, NETSNMP_OLDAPI_RONLY,
+     var_eventTable, 2, {1, 5}},
+    {EVENTOWNER, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_eventTable, 2, {1, 6}},
+    {EVENTSTATUS, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_eventTable, 2, {1, 7}}
 };
 
 struct variable2 logTable_variables[] = {
     /*
      * magic number        , variable type, ro/rw , callback fn  ,           L, oidsuffix 
      */
-    {LOGEVENTINDEX, ASN_INTEGER, RONLY, var_logTable, 2, {1, 1}},
-    {LOGINDEX, ASN_INTEGER, RONLY, var_logTable, 2, {1, 2}},
-    {LOGTIME, ASN_TIMETICKS, RONLY, var_logTable, 2, {1, 3}},
-    {LOGDESCRIPTION, ASN_OCTET_STR, RONLY, var_logTable, 2, {1, 4}}
+    {LOGEVENTINDEX, ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_logTable, 2, {1, 1}},
+    {LOGINDEX, ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_logTable, 2, {1, 2}},
+    {LOGTIME, ASN_TIMETICKS, NETSNMP_OLDAPI_RONLY,
+     var_logTable, 2, {1, 3}},
+    {LOGDESCRIPTION, ASN_OCTET_STR, NETSNMP_OLDAPI_RONLY,
+     var_logTable, 2, {1, 4}}
 
 };
 
diff --git a/agent/mibgroup/Rmon/event.h b/agent/mibgroup/Rmon/event.h
index dfcace7..b03e162 100644
--- a/agent/mibgroup/Rmon/event.h
+++ b/agent/mibgroup/Rmon/event.h
@@ -21,14 +21,13 @@
 #ifndef _MIBGROUP_EVENT_H
 #define _MIBGROUP_EVENT_H
 
-config_require(util_funcs)
-
-config_require(Rmon/agutil)
-config_require(Rmon/rows)
-
     /*
      * function prototypes 
      */
      void            init_event(void);
 
+config_require(util_funcs)
+
+config_require(Rmon/agutil)
+config_require(Rmon/rows)
 #endif                          /* _MIBGROUP_EVENT_H */
diff --git a/agent/mibgroup/Rmon/history.c b/agent/mibgroup/Rmon/history.c
index 9c6856f..ad03eef 100644
--- a/agent/mibgroup/Rmon/history.c
+++ b/agent/mibgroup/Rmon/history.c
@@ -44,8 +44,6 @@
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 
-#include "util_funcs.h"
-
 #include "history.h"
 
 /*
@@ -656,18 +654,20 @@
     /*
      * magic number        , variable type, ro/rw , callback fn  ,           L, oidsuffix 
      */
-    {CTRL_INDEX, ASN_INTEGER, RONLY, var_historyControlTable, 2, {1, 1}},
-    {CTRL_DATASOURCE, ASN_OBJECT_ID, RWRITE, var_historyControlTable, 2,
-     {1, 2}},
-    {CTRL_BUCKETSREQUESTED, ASN_INTEGER, RWRITE, var_historyControlTable,
-     2, {1, 3}},
-    {CTRL_BUCKETSGRANTED, ASN_INTEGER, RONLY, var_historyControlTable, 2,
-     {1, 4}},
-    {CTRL_INTERVAL, ASN_INTEGER, RWRITE, var_historyControlTable, 2,
-     {1, 5}},
-    {CTRL_OWNER, ASN_OCTET_STR, RWRITE, var_historyControlTable, 2,
-     {1, 6}},
-    {CTRL_STATUS, ASN_INTEGER, RWRITE, var_historyControlTable, 2, {1, 7}},
+    {CTRL_INDEX, ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_historyControlTable, 2, {1, 1}},
+    {CTRL_DATASOURCE, ASN_OBJECT_ID, NETSNMP_OLDAPI_RWRITE,
+     var_historyControlTable, 2, {1, 2}},
+    {CTRL_BUCKETSREQUESTED, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_historyControlTable, 2, {1, 3}},
+    {CTRL_BUCKETSGRANTED, ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_historyControlTable, 2, {1, 4}},
+    {CTRL_INTERVAL, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_historyControlTable, 2, {1, 5}},
+    {CTRL_OWNER, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_historyControlTable, 2, {1, 6}},
+    {CTRL_STATUS, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_historyControlTable, 2, {1, 7}},
 
 };
 
@@ -678,32 +678,36 @@
     /*
      * magic number     , variable type , ro/rw , callback fn  ,        L, oidsuffix 
      */
-    {DATA_INDEX, ASN_INTEGER, RONLY, var_etherHistoryTable, 2, {1, 1}},
-    {DATA_SAMPLEINDEX, ASN_INTEGER, RONLY, var_etherHistoryTable, 2,
-     {1, 2}},
-    {DATA_INTERVALSTART, ASN_TIMETICKS, RONLY, var_etherHistoryTable, 2,
-     {1, 3}},
-    {DATA_DROPEVENTS, ASN_COUNTER, RONLY, var_etherHistoryTable, 2,
-     {1, 4}},
-    {DATA_OCTETS, ASN_COUNTER, RONLY, var_etherHistoryTable, 2, {1, 5}},
-    {DATA_PKTS, ASN_COUNTER, RONLY, var_etherHistoryTable, 2, {1, 6}},
-    {DATA_BROADCASTPKTS, ASN_COUNTER, RONLY, var_etherHistoryTable, 2,
-     {1, 7}},
-    {DATA_MULTICASTPKTS, ASN_COUNTER, RONLY, var_etherHistoryTable, 2,
-     {1, 8}},
-    {DATA_CRCALIGNERRORS, ASN_COUNTER, RONLY, var_etherHistoryTable, 2,
-     {1, 9}},
-    {DATA_UNDERSIZEPKTS, ASN_COUNTER, RONLY, var_etherHistoryTable, 2,
-     {1, 10}},
-    {DATA_OVERSIZEPKTS, ASN_COUNTER, RONLY, var_etherHistoryTable, 2,
-     {1, 11}},
-    {DATA_FRAGMENTS, ASN_COUNTER, RONLY, var_etherHistoryTable, 2,
-     {1, 12}},
-    {DATA_JABBERS, ASN_COUNTER, RONLY, var_etherHistoryTable, 2, {1, 13}},
-    {DATA_COLLISIONS, ASN_COUNTER, RONLY, var_etherHistoryTable, 2,
-     {1, 14}},
-    {DATA_UTILIZATION, ASN_INTEGER, RONLY, var_etherHistoryTable, 2,
-     {1, 15}},
+    {DATA_INDEX, ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_etherHistoryTable, 2, {1, 1}},
+    {DATA_SAMPLEINDEX, ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_etherHistoryTable, 2, {1, 2}},
+    {DATA_INTERVALSTART, ASN_TIMETICKS, NETSNMP_OLDAPI_RONLY,
+     var_etherHistoryTable, 2, {1, 3}},
+    {DATA_DROPEVENTS, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherHistoryTable, 2, {1, 4}},
+    {DATA_OCTETS, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherHistoryTable, 2, {1, 5}},
+    {DATA_PKTS, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherHistoryTable, 2, {1, 6}},
+    {DATA_BROADCASTPKTS, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherHistoryTable, 2, {1, 7}},
+    {DATA_MULTICASTPKTS, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherHistoryTable, 2, {1, 8}},
+    {DATA_CRCALIGNERRORS, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherHistoryTable, 2, {1, 9}},
+    {DATA_UNDERSIZEPKTS, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherHistoryTable, 2, {1, 10}},
+    {DATA_OVERSIZEPKTS, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherHistoryTable, 2, {1, 11}},
+    {DATA_FRAGMENTS, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherHistoryTable, 2, {1, 12}},
+    {DATA_JABBERS, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherHistoryTable, 2, {1, 13}},
+    {DATA_COLLISIONS, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherHistoryTable, 2, {1, 14}},
+    {DATA_UTILIZATION, ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_etherHistoryTable, 2, {1, 15}},
 
 };
 
diff --git a/agent/mibgroup/Rmon/history.h b/agent/mibgroup/Rmon/history.h
index 094bee4..d2c401d 100644
--- a/agent/mibgroup/Rmon/history.h
+++ b/agent/mibgroup/Rmon/history.h
@@ -21,8 +21,6 @@
 #ifndef _MIBGROUP_HISTORY_H
 #define _MIBGROUP_HISTORY_H
 
-config_require(util_funcs)
-
     /*
      * function prototypes 
      */
diff --git a/agent/mibgroup/Rmon/rows.c b/agent/mibgroup/Rmon/rows.c
index d8c3cc1..d67c567 100644
--- a/agent/mibgroup/Rmon/rows.c
+++ b/agent/mibgroup/Rmon/rows.c
@@ -26,8 +26,6 @@
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 
-#include "util_funcs.h"
-
 #include "agutil_api.h"
 #include "rows.h"
 #include "row_api.h"
@@ -756,7 +754,7 @@
         scrlr->first_data_ptr = bptr->next;
         scrlr->last_data_ptr->next = bptr;
         scrlr->last_data_ptr = (NEXTED_PTR_T *) bptr;
-        bptr->next = 0;
+        bptr->next = NULL;
     } else {
         bptr = scrlr->current_data_ptr;
         scrlr->current_data_ptr = bptr->next;
diff --git a/agent/mibgroup/Rmon/statistics.c b/agent/mibgroup/Rmon/statistics.c
index fb4f5f5..6ccb844 100644
--- a/agent/mibgroup/Rmon/statistics.c
+++ b/agent/mibgroup/Rmon/statistics.c
@@ -43,7 +43,6 @@
 
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
-#include "util_funcs.h"
 #include "statistics.h"
         /*
          * Implementation headers 
@@ -468,52 +467,52 @@
 oid             oidstatisticsVariablesOid[] = { 1, 3, 6, 1, 2, 1, 16, 1 };
 
 struct variable7 oidstatisticsVariables[] = {
-    {IDetherStatsIndex, ASN_INTEGER, RONLY, var_etherStatsEntry, 3,
-     {1, 1, 1}},
-    {IDetherStatsDataSource, ASN_OBJECT_ID, RWRITE, var_etherStatsEntry, 3,
-     {1, 1, 2}},
-    {IDetherStatsDropEvents, ASN_COUNTER, RONLY, var_etherStatsEntry, 3,
-     {1, 1, 3}},
-    {IDetherStatsOctets, ASN_COUNTER, RONLY, var_etherStatsEntry, 3,
-     {1, 1, 4}},
-    {IDetherStatsPkts, ASN_COUNTER, RONLY, var_etherStatsEntry, 3,
-     {1, 1, 5}},
-    {IDetherStatsBroadcastPkts, ASN_COUNTER, RONLY, var_etherStatsEntry, 3,
-     {1, 1, 6}},
-    {IDetherStatsMulticastPkts, ASN_COUNTER, RONLY, var_etherStatsEntry, 3,
-     {1, 1, 7}},
-    {IDetherStatsCRCAlignErrors, ASN_COUNTER, RONLY, var_etherStatsEntry,
-     3, {1, 1, 8}},
-    {IDetherStatsUndersizePkts, ASN_COUNTER, RONLY, var_etherStatsEntry, 3,
-     {1, 1, 9}},
-    {IDetherStatsOversizePkts, ASN_COUNTER, RONLY, var_etherStatsEntry, 3,
-     {1, 1, 10}},
-    {IDetherStatsFragments, ASN_COUNTER, RONLY, var_etherStatsEntry, 3,
-     {1, 1, 11}},
-    {IDetherStatsJabbers, ASN_COUNTER, RONLY, var_etherStatsEntry, 3,
-     {1, 1, 12}},
-    {IDetherStatsCollisions, ASN_COUNTER, RONLY, var_etherStatsEntry, 3,
-     {1, 1, 13}},
-    {IDetherStatsPkts64Octets, ASN_COUNTER, RONLY, var_etherStatsEntry, 3,
-     {1, 1, 14}},
-    {IDetherStatsPkts65to127Octets, ASN_COUNTER, RONLY,
+    {IDetherStatsIndex, ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_etherStatsEntry, 3, {1, 1, 1}},
+    {IDetherStatsDataSource, ASN_OBJECT_ID, NETSNMP_OLDAPI_RWRITE,
+     var_etherStatsEntry, 3, {1, 1, 2}},
+    {IDetherStatsDropEvents, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherStatsEntry, 3, {1, 1, 3}},
+    {IDetherStatsOctets, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherStatsEntry, 3, {1, 1, 4}},
+    {IDetherStatsPkts, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherStatsEntry, 3, {1, 1, 5}},
+    {IDetherStatsBroadcastPkts, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherStatsEntry, 3, {1, 1, 6}},
+    {IDetherStatsMulticastPkts, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherStatsEntry, 3, {1, 1, 7}},
+    {IDetherStatsCRCAlignErrors, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherStatsEntry, 3, {1, 1, 8}},
+    {IDetherStatsUndersizePkts, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherStatsEntry, 3, {1, 1, 9}},
+    {IDetherStatsOversizePkts, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherStatsEntry, 3, {1, 1, 10}},
+    {IDetherStatsFragments, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherStatsEntry, 3, {1, 1, 11}},
+    {IDetherStatsJabbers, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherStatsEntry, 3, {1, 1, 12}},
+    {IDetherStatsCollisions, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherStatsEntry, 3, {1, 1, 13}},
+    {IDetherStatsPkts64Octets, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherStatsEntry, 3, {1, 1, 14}},
+    {IDetherStatsPkts65to127Octets, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
      var_etherStatsEntry, 3, {1, 1, 15}},
-    {IDetherStatsPkts128to255Octets, ASN_COUNTER, RONLY,
+    {IDetherStatsPkts128to255Octets, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
      var_etherStatsEntry, 3, {1, 1, 16}},
-    {IDetherStatsPkts256to511Octets, ASN_COUNTER, RONLY,
+    {IDetherStatsPkts256to511Octets, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
      var_etherStatsEntry, 3, {1, 1, 17}},
-    {IDetherStatsPkts512to1023Octets, ASN_COUNTER, RONLY,
+    {IDetherStatsPkts512to1023Octets, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
      var_etherStatsEntry, 3, {1, 1, 18}},
-    {IDetherStatsPkts1024to1518Octets, ASN_COUNTER, RONLY,
+    {IDetherStatsPkts1024to1518Octets, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
      var_etherStatsEntry, 3, {1, 1, 19}},
-    {IDetherStatsOwner, ASN_OCTET_STR, RWRITE, var_etherStatsEntry, 3,
-     {1, 1, 20}},
-    {IDetherStatsStatus, ASN_INTEGER, RWRITE, var_etherStatsEntry, 3,
-     {1, 1, 21}},
-    {IDetherStatsDroppedFrames, ASN_COUNTER, RONLY, var_etherStats2Entry,
-     3, {4, 1, 1}},
-    {IDetherStatsCreateTime, ASN_TIMETICKS, RONLY, var_etherStats2Entry, 3,
-     {4, 1, 2}},
+    {IDetherStatsOwner, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_etherStatsEntry, 3, {1, 1, 20}},
+    {IDetherStatsStatus, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_etherStatsEntry, 3, {1, 1, 21}},
+    {IDetherStatsDroppedFrames, ASN_COUNTER, NETSNMP_OLDAPI_RONLY,
+     var_etherStats2Entry, 3, {4, 1, 1}},
+    {IDetherStatsCreateTime, ASN_TIMETICKS, NETSNMP_OLDAPI_RONLY,
+     var_etherStats2Entry, 3, {4, 1, 2}},
 };
 
 /***************************************************
diff --git a/agent/mibgroup/Rmon/statistics.h b/agent/mibgroup/Rmon/statistics.h
index 8c6d91d..9b622a7 100644
--- a/agent/mibgroup/Rmon/statistics.h
+++ b/agent/mibgroup/Rmon/statistics.h
@@ -21,7 +21,6 @@
 #ifndef _statistics_h_included__
 #define _statistics_h_included__
 
-config_require(util_funcs)
      void            init_statistics(void);
 
 #endif                          /* _statistics_h_included__ */
diff --git a/agent/mibgroup/agent/extend.c b/agent/mibgroup/agent/extend.c
index 1f8586a..7004ea5 100644
--- a/agent/mibgroup/agent/extend.c
+++ b/agent/mibgroup/agent/extend.c
@@ -10,7 +10,7 @@
 #include "struct.h"
 
 #ifndef USING_UCD_SNMP_EXTENSIBLE_MODULE
-#include "util_funcs.h"
+#include "util_funcs/header_simple_table.h"
 #include "mibdefs.h"
 #define SHELLCOMMAND 3
 #endif
@@ -44,17 +44,27 @@
 unsigned int             max_compatability_entries = 50;
 netsnmp_old_extend *compatability_entries;
 
+char           *cmdlinebuf;
+size_t          cmdlinesize;
+
 WriteMethod fixExec2Error;
 FindVarMethod var_extensible_old;
 oid  old_extensible_variables_oid[] = { NETSNMP_UCDAVIS_MIB, NETSNMP_SHELLMIBNUM, 1 };
 struct variable2 old_extensible_variables[] = {
-    {MIBINDEX,     ASN_INTEGER,   RONLY, var_extensible_old, 1, {MIBINDEX}},
-    {ERRORNAME,    ASN_OCTET_STR, RONLY, var_extensible_old, 1, {ERRORNAME}},
-    {SHELLCOMMAND, ASN_OCTET_STR, RONLY, var_extensible_old, 1, {SHELLCOMMAND}},
-    {ERRORFLAG,    ASN_INTEGER,   RONLY, var_extensible_old, 1, {ERRORFLAG}},
-    {ERRORMSG,     ASN_OCTET_STR, RONLY, var_extensible_old, 1, {ERRORMSG}},
-    {ERRORFIX,     ASN_INTEGER,  RWRITE, var_extensible_old, 1, {ERRORFIX}},
-    {ERRORFIXCMD,  ASN_OCTET_STR, RONLY, var_extensible_old, 1, {ERRORFIXCMD}}
+    {MIBINDEX,     ASN_INTEGER,   NETSNMP_OLDAPI_RONLY,
+     var_extensible_old, 1, {MIBINDEX}},
+    {ERRORNAME,    ASN_OCTET_STR, NETSNMP_OLDAPI_RONLY,
+     var_extensible_old, 1, {ERRORNAME}},
+    {SHELLCOMMAND, ASN_OCTET_STR, NETSNMP_OLDAPI_RONLY,
+     var_extensible_old, 1, {SHELLCOMMAND}},
+    {ERRORFLAG,    ASN_INTEGER,   NETSNMP_OLDAPI_RONLY,
+     var_extensible_old, 1, {ERRORFLAG}},
+    {ERRORMSG,     ASN_OCTET_STR, NETSNMP_OLDAPI_RONLY,
+     var_extensible_old, 1, {ERRORMSG}},
+    {ERRORFIX,     ASN_INTEGER,  NETSNMP_OLDAPI_RWRITE,
+     var_extensible_old, 1, {ERRORFIX}},
+    {ERRORFIXCMD,  ASN_OCTET_STR, NETSNMP_OLDAPI_RONLY,
+     var_extensible_old, 1, {ERRORFIXCMD}}
 };
 #endif
 
@@ -478,10 +488,21 @@
             
     } else if (!strcmp( token, "sh"   ) ||
                !strcmp( token, "exec" )) {
-        if ( num_compatability_entries == max_compatability_entries )
+        if ( num_compatability_entries == max_compatability_entries ) {
             /* XXX - should really use dynamic allocation */
-            config_perror("No further UCD-compatible entries" );
-        else
+            netsnmp_old_extend *new_compatability_entries;
+            new_compatability_entries = realloc(compatability_entries,
+                             max_compatability_entries*2*sizeof(netsnmp_old_extend));
+            if (!new_compatability_entries)
+                config_perror("No further UCD-compatible entries" );
+            else {
+                memset(new_compatability_entries+num_compatability_entries, 0,
+                        sizeof(netsnmp_old_extend)*max_compatability_entries);
+                max_compatability_entries *= 2;
+                compatability_entries = new_compatability_entries;
+            }
+        }
+        if (num_compatability_entries != max_compatability_entries)
             compatability_entries[
                 num_compatability_entries++ ].exec_entry = extension;
     }
@@ -1106,7 +1127,7 @@
      *  GET handling - find the exact entry being requested
      ***/
     if ( mode == MODE_GET ) {
-        DEBUGMSGTL(( "nsExtendTable:output2", "GET: %s / %d\n ",
+        DEBUGMSGTL(( "nsExtendTable:output2", "GET: %s / %ld\n ",
                       table_info->indexes->val.string,
                      *table_info->indexes->next_variable->val.integer));
         for ( eptr = ereg->ehead; eptr; eptr = eptr->next ) {
@@ -1129,7 +1150,6 @@
             if (line_idx < 1 || line_idx > eptr->numlines)
                 return NULL;
         }
-        return eptr;
     }
 
         /***
@@ -1246,9 +1266,8 @@
             snmp_set_var_value( table_info->indexes->next_variable,
                                 (const u_char*)&line_idx, sizeof(line_idx));
         }
-        return eptr;  /* Finally, signal success */
     }
-    return NULL;
+    return eptr;  /* Finally, signal success */
 }
 
 /*
@@ -1338,6 +1357,32 @@
          *
          *************************/
 
+char * _get_cmdline(netsnmp_extend *extend)
+{
+    size_t          size;
+    char           *newbuf;
+    const char     *args = extend->args;
+
+    if (args == NULL)
+        /* Use empty string for processes without arguments. */
+        args = "";
+
+    size = strlen(extend->command) + strlen(args) + 2;
+    if (size > cmdlinesize) {
+        newbuf = realloc(cmdlinebuf, size);
+        if (!newbuf) {
+            free(cmdlinebuf);
+            cmdlinebuf = NULL;
+            cmdlinesize = 0;
+            return NULL;
+        }
+        cmdlinebuf = newbuf;
+        cmdlinesize = size;
+    }
+    sprintf(cmdlinebuf, "%s %s", extend->command, args);
+    return cmdlinebuf;
+}
+
 u_char *
 var_extensible_old(struct variable * vp,
                      oid * name,
@@ -1348,6 +1393,7 @@
     netsnmp_old_extend *exten = NULL;
     static long     long_ret;
     unsigned int idx;
+    char         *cmdline;
 
     if (header_simple_table
         (vp, name, length, exact, var_len, write_method, num_compatability_entries))
@@ -1366,8 +1412,10 @@
             *var_len = strlen(exten->exec_entry->token);
             return ((u_char *) (exten->exec_entry->token));
         case SHELLCOMMAND:
-            *var_len = strlen(exten->exec_entry->command);
-            return ((u_char *) (exten->exec_entry->command));
+            cmdline = _get_cmdline(exten->exec_entry);
+            if (cmdline)
+                *var_len = strlen(cmdline);
+            return ((u_char *) cmdline);
         case ERRORFLAG:        /* return code from the process */
             netsnmp_cache_check_and_reload( exten->exec_entry->cache );
             long_ret = exten->exec_entry->result;
@@ -1390,8 +1438,10 @@
 
         case ERRORFIXCMD:
             if (exten->efix_entry) {
-                *var_len = strlen(exten->efix_entry->command);
-                return ((u_char *) exten->efix_entry->command);
+                cmdline = _get_cmdline(exten->efix_entry);
+		if (cmdline)
+                    *var_len = strlen(cmdline);
+                return ((u_char *) cmdline);
             } else {
                 *var_len = 0;
                 return ((u_char *) &long_return);  /* Just needs to be non-null! */
diff --git a/agent/mibgroup/agent/extend.h b/agent/mibgroup/agent/extend.h
index 8f19db3..4b181f9 100644
--- a/agent/mibgroup/agent/extend.h
+++ b/agent/mibgroup/agent/extend.h
@@ -1,7 +1,7 @@
 #ifndef NETSNMP_EXTEND_H
 #define NETSNMP_EXTEND_H
 
-config_require( util_funcs )
+config_require( util_funcs/header_simple_table )
 config_require( utilities/execute )
 config_add_mib(NET-SNMP-EXTEND-MIB)
 
diff --git a/agent/mibgroup/agent/nsCache.c b/agent/mibgroup/agent/nsCache.c
index f8e73f0..a773aeb 100644
--- a/agent/mibgroup/agent/nsCache.c
+++ b/agent/mibgroup/agent/nsCache.c
@@ -11,8 +11,6 @@
 
 #include <net-snmp/agent/cache_handler.h>
 #include "agent/nsCache.h"
-#include "util_funcs.h"
-
 
 /*
  * use unadvertised function to get cache head. You really should not
@@ -21,6 +19,8 @@
 extern netsnmp_cache *netsnmp_cache_get_head(void);
 
 
+#define nsCache 1, 3, 6, 1, 4, 1, 8072, 1, 5
+
 /*
  * OIDs for the cacheging control scalar objects
  *
@@ -28,8 +28,6 @@
  *  than the (sole) valid instance in each case, in order
  *  to handle requests for invalid instances properly.
  */
-oid nsCacheTimeout_oid[]    = { 1, 3, 6, 1, 4, 1, 8072, 1, 5, 1};
-oid nsCacheEnabled_oid[]    = { 1, 3, 6, 1, 4, 1, 8072, 1, 5, 2};
 
 /*
  * ... and for the cache table.
@@ -44,8 +42,6 @@
 #define NSCACHE_STATUS_ACTIVE   4
 #define NSCACHE_STATUS_EXPIRED  5
 
-oid nsCacheTable_oid[]      = { 1, 3, 6, 1, 4, 1, 8072, 1, 5, 3};
-
 extern struct snmp_alarm *
 sa_find_specific(unsigned int clientreg);
 
@@ -53,6 +49,10 @@
 void
 init_nsCache(void)
 {
+    const oid nsCacheTimeout_oid[]    = { nsCache, 1 };
+    const oid nsCacheEnabled_oid[]    = { nsCache, 2 };
+    const oid nsCacheTable_oid[]      = { nsCache, 3 };
+
     netsnmp_table_registration_info *table_info;
     netsnmp_iterator_info           *iinfo;
 
@@ -361,7 +361,6 @@
             default:
                 netsnmp_set_request_error(reqinfo, request, SNMP_ERR_NOCREATION);
                 return SNMP_ERR_NOCREATION;	/* XXX - is this right ? */
-                continue;
 	    }
 	}
 	break;
diff --git a/agent/mibgroup/agent/nsDebug.c b/agent/mibgroup/agent/nsDebug.c
index 40d55d4..534d18c 100644
--- a/agent/mibgroup/agent/nsDebug.c
+++ b/agent/mibgroup/agent/nsDebug.c
@@ -10,34 +10,32 @@
 #endif
 
 #include "agent/nsDebug.h"
-#include "util_funcs.h"
 
-
-
-/*
- * OIDs for the debugging control scalar objects
- *
- * Note that these we're registering the full object rather
- *  than the (sole) valid instance in each case, in order
- *  to handle requests for invalid instances properly.
- */
-oid nsDebugEnabled_oid[]    = { 1, 3, 6, 1, 4, 1, 8072, 1, 7, 1, 1};
-oid nsDebugOutputAll_oid[]  = { 1, 3, 6, 1, 4, 1, 8072, 1, 7, 1, 2};
-oid nsDebugDumpPdu_oid[]    = { 1, 3, 6, 1, 4, 1, 8072, 1, 7, 1, 3};
-
-/*
- * ... and for the token table.
- */
-
-#define  DBGTOKEN_PREFIX	2
-#define  DBGTOKEN_ENABLED	3
-#define  DBGTOKEN_STATUS	4
-oid nsDebugTokenTable_oid[] = { 1, 3, 6, 1, 4, 1, 8072, 1, 7, 1, 4};
-
+#define nsConfigDebug 1, 3, 6, 1, 4, 1, 8072, 1, 7, 1
 
 void
 init_nsDebug(void)
 {
+    /*
+     * OIDs for the debugging control scalar objects
+     *
+     * Note that these we're registering the full object rather
+     *  than the (sole) valid instance in each case, in order
+     *  to handle requests for invalid instances properly.
+     */
+    const oid nsDebugEnabled_oid[]    = { nsConfigDebug, 1};
+    const oid nsDebugOutputAll_oid[]  = { nsConfigDebug, 2};
+    const oid nsDebugDumpPdu_oid[]    = { nsConfigDebug, 3};
+
+    /*
+     * ... and for the token table.
+     */
+
+#define  DBGTOKEN_PREFIX	2
+#define  DBGTOKEN_ENABLED	3
+#define  DBGTOKEN_STATUS	4
+    const oid nsDebugTokenTable_oid[] = { nsConfigDebug, 4};
+
     netsnmp_table_registration_info *table_info;
     netsnmp_iterator_info           *iinfo;
 
diff --git a/agent/mibgroup/agent/nsLogging.c b/agent/mibgroup/agent/nsLogging.c
index 3e5b02f..7a21fa8 100644
--- a/agent/mibgroup/agent/nsLogging.c
+++ b/agent/mibgroup/agent/nsLogging.c
@@ -11,9 +11,6 @@
 
 #include <net-snmp/library/snmp_logging.h>
 #include "agent/nsLogging.h"
-#include "util_funcs.h"
-
-
 
 /*
  * OID and columns for the logging table.
@@ -23,15 +20,14 @@
 #define  NSLOGGING_MAXLEVEL	4
 #define  NSLOGGING_STATUS	5
 
-oid nsLoggingTable_oid[]      = { 1, 3, 6, 1, 4, 1, 8072, 1, 7, 2, 1};
-
-
 void
 init_nsLogging(void)
 {
     netsnmp_table_registration_info *table_info;
     netsnmp_iterator_info           *iinfo;
 
+    const oid nsLoggingTable_oid[] = { 1, 3, 6, 1, 4, 1, 8072, 1, 7, 2, 1};
+
     /*
      * Register the table.
      * We need to define the column structure and indexing....
@@ -308,7 +304,6 @@
             default:
                 netsnmp_set_request_error(reqinfo, request, SNMP_NOSUCHOBJECT);
                 return SNMP_NOSUCHOBJECT;
-                continue;
 	    }
 	}
 	break;
diff --git a/agent/mibgroup/agent/nsModuleTable.c b/agent/mibgroup/agent/nsModuleTable.c
index 4f4ea00..bc45691 100644
--- a/agent/mibgroup/agent/nsModuleTable.c
+++ b/agent/mibgroup/agent/nsModuleTable.c
@@ -18,8 +18,7 @@
 void
 initialize_table_nsModuleTable(void)
 {
-    static oid      nsModuleTable_oid[] =
-        { 1, 3, 6, 1, 4, 1, 8072, 1, 2, 1 };
+    const oid nsModuleTable_oid[] = { 1, 3, 6, 1, 4, 1, 8072, 1, 2, 1 };
     netsnmp_table_registration_info *table_info;
     netsnmp_handler_registration *my_handler;
     netsnmp_iterator_info *iinfo;
@@ -76,7 +75,7 @@
     netsnmp_register_table_iterator(my_handler, iinfo);
 }
 
-/** Initialzies the nsModuleTable module */
+/** Initializes the nsModuleTable module */
 void
 init_nsModuleTable(void)
 {
diff --git a/agent/mibgroup/agent/nsTransactionTable.c b/agent/mibgroup/agent/nsTransactionTable.c
index 31b9fe5..dc1f7fa 100644
--- a/agent/mibgroup/agent/nsTransactionTable.c
+++ b/agent/mibgroup/agent/nsTransactionTable.c
@@ -15,10 +15,7 @@
 void
 initialize_table_nsTransactionTable(void)
 {
-    static oid      nsTransactionTable_oid[] =
-        { 1, 3, 6, 1, 4, 1, 8072, 1, 8, 1 };
-    size_t          nsTransactionTable_oid_len =
-        OID_LENGTH(nsTransactionTable_oid);
+    const oid nsTransactionTable_oid[] = { 1, 3, 6, 1, 4, 1, 8072, 1, 8, 1 };
     netsnmp_table_registration_info *table_info;
     netsnmp_handler_registration *my_handler;
     netsnmp_iterator_info *iinfo;
@@ -33,11 +30,10 @@
      * if your table is read only, it's easiest to change the
      * HANDLER_CAN_RWRITE definition below to HANDLER_CAN_RONLY 
      */
-    my_handler = netsnmp_create_handler_registration("nsTransactionTable",
-                                                     nsTransactionTable_handler,
-                                                     nsTransactionTable_oid,
-                                                     nsTransactionTable_oid_len,
-                                                     HANDLER_CAN_RONLY);
+    my_handler = netsnmp_create_handler_registration(
+        "nsTransactionTable", nsTransactionTable_handler,
+        nsTransactionTable_oid, OID_LENGTH(nsTransactionTable_oid),
+        HANDLER_CAN_RONLY);
 
     if (!my_handler || !table_info || !iinfo) {
         if (my_handler)
@@ -68,7 +64,7 @@
     netsnmp_register_table_iterator(my_handler, iinfo);
 }
 
-/** Initialzies the nsTransactionTable module */
+/** Initializes the nsTransactionTable module */
 void
 init_nsTransactionTable(void)
 {
diff --git a/agent/mibgroup/agent/nsVacmAccessTable.c b/agent/mibgroup/agent/nsVacmAccessTable.c
index d2cee35..410b002 100644
--- a/agent/mibgroup/agent/nsVacmAccessTable.c
+++ b/agent/mibgroup/agent/nsVacmAccessTable.c
@@ -17,17 +17,15 @@
      * Initialize the nsVacmAccessTable table by defining its
      *   contents and how it's structured
      */
-    static oid nsVacmAccessTable_oid[]   = { 1,3,6,1,4,1,8072,1,9,1 };
-    size_t     nsVacmAccessTable_oid_len = OID_LENGTH(nsVacmAccessTable_oid);
+    const oid nsVacmAccessTable_oid[]   = { 1,3,6,1,4,1,8072,1,9,1 };
     netsnmp_handler_registration    *reg;
     netsnmp_iterator_info           *iinfo;
     netsnmp_table_registration_info *table_info;
 
-    reg = netsnmp_create_handler_registration("nsVacmAccessTable",
-                                            nsVacmAccessTable_handler,
-                                            nsVacmAccessTable_oid,
-                                            nsVacmAccessTable_oid_len,
-                                            HANDLER_CAN_RWRITE);
+    reg = netsnmp_create_handler_registration(
+        "nsVacmAccessTable", nsVacmAccessTable_handler,
+        nsVacmAccessTable_oid, OID_LENGTH(nsVacmAccessTable_oid),
+        HANDLER_CAN_RWRITE);
 
     table_info = SNMP_MALLOC_TYPEDEF(netsnmp_table_registration_info);
     netsnmp_table_helper_add_indexes(table_info,
diff --git a/agent/mibgroup/agentx/agentx_config.c b/agent/mibgroup/agentx/agentx_config.c
index d156d47..eec8271 100644
--- a/agent/mibgroup/agentx/agentx_config.c
+++ b/agent/mibgroup/agentx/agentx_config.c
@@ -14,13 +14,6 @@
 #include <strings.h>
 #endif
 
-#if HAVE_PWD_H
-#include <pwd.h>
-#endif
-#if HAVE_GRP_H
-#include <grp.h>
-#endif
-
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 #include "snmpd.h"
@@ -47,7 +40,6 @@
 agentx_parse_master(const char *token, char *cptr)
 {
     int             i = -1;
-    char            buf[BUFSIZ];
 
     if (!strcmp(cptr, "agentx") ||
         !strcmp(cptr, "all") ||
@@ -60,8 +52,7 @@
         i = atoi(cptr);
 
     if (i < 0 || i > 1) {
-        sprintf(buf, "master '%s' unrecognised", cptr);
-        config_perror(buf);
+	netsnmp_config_error("master '%s' unrecognised", cptr);
     } else
         netsnmp_ds_set_boolean(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_AGENTX_MASTER, i);
 }
@@ -75,12 +66,6 @@
     int s_perm = -1;
     int d_perm = -1;
     char *st;
-#if HAVE_GETPWNAM && HAVE_PWD_H
-    struct passwd *pwd;
-#endif
-#if HAVE_GETGRNAM && HAVE_GRP_H
-    struct group  *grp;
-#endif
 
     DEBUGMSGTL(("agentx/config", "port permissions: %s\n", cptr));
     socket_perm = strtok_r(cptr, " \t", &st);
@@ -107,16 +92,7 @@
      * Try to handle numeric UIDs or user names for the socket owner
      */
     if (socket_user) {
-        uid = atoi(socket_user);
-        if ( uid == 0 ) {
-#if HAVE_GETPWNAM && HAVE_PWD_H
-            pwd = getpwnam( socket_user );
-            if (pwd)
-                uid = pwd->pw_uid;
-            else
-#endif
-                snmp_log(LOG_WARNING, "Can't identify AgentX socket user (%s).\n", socket_user);
-        }
+        uid = netsnmp_str_to_uid(socket_user);
         if ( uid != 0 )
             netsnmp_ds_set_int(NETSNMP_DS_APPLICATION_ID,
                                NETSNMP_DS_AGENT_X_SOCK_USER, uid);
@@ -128,16 +104,7 @@
      * and similarly for the socket group ownership
      */
     if (socket_group) {
-        gid = atoi(socket_group);
-        if ( gid == 0 ) {
-#if HAVE_GETGRNAM && HAVE_GRP_H
-            grp = getgrnam( socket_group );
-            if (grp)
-                gid = grp->gr_gid;
-            else
-#endif
-                snmp_log(LOG_WARNING, "Can't identify AgentX socket group (%s).\n", socket_group);
-        }
+        gid = netsnmp_str_to_gid(socket_group);
         if ( gid != 0 )
             netsnmp_ds_set_int(NETSNMP_DS_APPLICATION_ID,
                                NETSNMP_DS_AGENT_X_SOCK_GROUP, gid);
diff --git a/agent/mibgroup/agentx/master.c b/agent/mibgroup/agentx/master.c
index 6b0f65e..05f148f 100644
--- a/agent/mibgroup/agentx/master.c
+++ b/agent/mibgroup/agentx/master.c
@@ -60,13 +60,6 @@
     char *agentx_sockets;
     char *cp1;
 
-#ifdef NETSNMP_TRANSPORT_UNIX_DOMAIN
-    int agentx_dir_perm;
-    int agentx_sock_perm;
-    int agentx_sock_user;
-    int agentx_sock_group;
-#endif
-
     if (netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_ROLE) != MASTER_AGENT)
         return;
 
@@ -98,6 +91,18 @@
                                       NETSNMP_DS_AGENT_AGENTX_TIMEOUT);
     sess.retries = netsnmp_ds_get_int(NETSNMP_DS_APPLICATION_ID,
                                       NETSNMP_DS_AGENT_AGENTX_RETRIES);
+
+#ifdef NETSNMP_TRANSPORT_UNIX_DOMAIN
+    {
+	int agentx_dir_perm =
+	    netsnmp_ds_get_int(NETSNMP_DS_APPLICATION_ID,
+			       NETSNMP_DS_AGENT_X_DIR_PERM);
+	if (agentx_dir_perm == 0)
+	    agentx_dir_perm = NETSNMP_AGENT_DIRECTORY_MODE;
+	netsnmp_unix_create_path_with_mode(agentx_dir_perm);
+    }
+#endif
+
     cp1 = agentx_sockets;
     while (cp1) {
         netsnmp_transport *t;
@@ -111,44 +116,15 @@
         if (cp1 != NULL) {
             *cp1++ = '\0';
 	}
-    
-        if (sess.peername[0] == '/') {
-#ifdef NETSNMP_TRANSPORT_UNIX_DOMAIN
-            /*
-             *  If this is a Unix pathname,
-             *  try and create the directory first.
-             */
-            agentx_dir_perm = netsnmp_ds_get_int(NETSNMP_DS_APPLICATION_ID, 
-                                                 NETSNMP_DS_AGENT_X_DIR_PERM);
-            if (agentx_dir_perm == 0)
-                agentx_dir_perm = NETSNMP_AGENT_DIRECTORY_MODE;
-            if (mkdirhier(sess.peername, (mode_t)agentx_dir_perm, 1)) {
-                snmp_log(LOG_ERR,
-                         "Failed to create the directory for the agentX socket: %s\n",
-                         sess.peername);
-            }
-#else
-            netsnmp_sess_log_error(LOG_WARNING,
-                                   "unix domain support not available\n",
-                                   &sess);
-#endif
-        }
-    
+
         /*
-         *  Otherwise, let 'snmp_open' interpret the string.
+         *  Let 'snmp_open' interpret the descriptor.
          */
         sess.local_port = AGENTX_PORT;      /* Indicate server & set default port */
         sess.remote_port = 0;
         sess.callback = handle_master_agentx_packet;
         errno = 0;
         t = netsnmp_transport_open_server("agentx", sess.peername);
-        if (t == NULL && errno == EADDRINUSE) {
-            /*
-             * Could be a left-over socket (now deleted)
-             * Try again
-             */
-            t = netsnmp_transport_open_server("agentx", sess.peername);
-        }
         if (t == NULL) {
             /*
              * diagnose snmp_open errors with the input netsnmp_session
@@ -171,23 +147,24 @@
         } else {
 #ifdef NETSNMP_TRANSPORT_UNIX_DOMAIN
             if (t->domain == netsnmp_UnixDomain && t->local != NULL) {
-                char name[sizeof(struct sockaddr_un) + 1];
-                memcpy(name, t->local, t->local_length);
-                name[t->local_length] = '\0';
                 /*
                  * Apply any settings to the ownership/permissions of the
                  * AgentX socket
                  */
-                agentx_sock_perm =
+                int agentx_sock_perm =
                     netsnmp_ds_get_int(NETSNMP_DS_APPLICATION_ID,
                                        NETSNMP_DS_AGENT_X_SOCK_PERM);
-                agentx_sock_user =
+                int agentx_sock_user =
                     netsnmp_ds_get_int(NETSNMP_DS_APPLICATION_ID,
                                        NETSNMP_DS_AGENT_X_SOCK_USER);
-                agentx_sock_group =
+                int agentx_sock_group =
                     netsnmp_ds_get_int(NETSNMP_DS_APPLICATION_ID,
                                        NETSNMP_DS_AGENT_X_SOCK_GROUP);
 
+                char name[sizeof(struct sockaddr_un) + 1];
+                memcpy(name, t->local, t->local_length);
+                name[t->local_length] = '\0';
+
                 if (agentx_sock_perm != 0)
                     chmod(name, agentx_sock_perm);
 
@@ -213,6 +190,10 @@
         }
     }
 
+#ifdef NETSNMP_TRANSPORT_UNIX_DOMAIN
+    netsnmp_unix_dont_create_path();
+#endif
+
     SNMP_FREE(agentx_sockets);
     DEBUGMSGTL(("agentx/master", "initializing...   DONE\n"));
 }
@@ -234,7 +215,7 @@
 
     cache = netsnmp_handler_check_cache(cache);
     if (!cache) {
-        DEBUGMSGTL(("agentx/master", "response too late on session %08p\n",
+        DEBUGMSGTL(("agentx/master", "response too late on session %8p\n",
                     session));
         return 0;
     }
@@ -243,8 +224,8 @@
     switch (operation) {
     case NETSNMP_CALLBACK_OP_TIMED_OUT:{
             void           *s = snmp_sess_pointer(session);
-            DEBUGMSGTL(("agentx/master", "timeout on session %08p\n",
-                        session));
+            DEBUGMSGTL(("agentx/master", "timeout on session %8p req=0x%x\n",
+                        session, (unsigned)reqid));
 
             netsnmp_handler_mark_requests_as_delegated(requests,
                                        REQUEST_IS_NOT_DELEGATED);
@@ -281,10 +262,10 @@
     case NETSNMP_CALLBACK_OP_DISCONNECT:
     case NETSNMP_CALLBACK_OP_SEND_FAILED:
         if (operation == NETSNMP_CALLBACK_OP_DISCONNECT) {
-            DEBUGMSGTL(("agentx/master", "disconnect on session %08p\n",
+            DEBUGMSGTL(("agentx/master", "disconnect on session %8p\n",
                         session));
         } else {
-            DEBUGMSGTL(("agentx/master", "send failed on session %08p\n",
+            DEBUGMSGTL(("agentx/master", "send failed on session %8p\n",
                         session));
         }
         close_agentx_session(session, -1);
@@ -308,9 +289,10 @@
         return 0;
     }
 
-    DEBUGMSGTL(("agentx/master", "got response errstat=%d, (req=0x%x,trans="
+    DEBUGMSGTL(("agentx/master", "got response errstat=%ld, (req=0x%x,trans="
                 "0x%x,sess=0x%x)\n",
-                pdu->errstat,pdu->reqid,pdu->transid, pdu->sessid));
+                pdu->errstat, (unsigned)pdu->reqid, (unsigned)pdu->transid,
+		(unsigned)pdu->sessid));
 
     if (pdu->errstat != AGENTX_ERR_NOERROR) {
         /* [RFC 2471 - 7.2.5.2.]
@@ -387,9 +369,9 @@
             DEBUGMSGOID(("agentx/master", var->name, var->name_length));
             DEBUGMSG(("agentx/master", "\n"));
             if (netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_VERBOSE)) {
-                DEBUGMSGTL(("snmp_agent", "    >> "));
-                DEBUGMSGVAR(("snmp_agent", var));
-                DEBUGMSG(("snmp_agent", "\n"));
+                DEBUGMSGTL(("agentx/master", "    >> "));
+                DEBUGMSGVAR(("agentx/master", var));
+                DEBUGMSG(("agentx/master", "\n"));
             }
 
             /*
@@ -615,12 +597,11 @@
     /*
      * send the requests out.
      */
-    DEBUGMSGTL(("agentx", "sending pdu (req=0x%x,trans=0x%x,sess=0x%x)\n",
-                pdu->reqid,pdu->transid, pdu->sessid));
+    DEBUGMSGTL(("agentx/master", "sending pdu (req=0x%x,trans=0x%x,sess=0x%x)\n",
+                (unsigned)pdu->reqid, (unsigned)pdu->transid, (unsigned)pdu->sessid));
     result = snmp_async_send(ax_session, pdu, agentx_got_response, cb_data);
-
-    if (result == 0 ) {
-        snmp_free_pdu( pdu );
+    if (result == 0) {
+        snmp_free_pdu(pdu);
     }
 
     return SNMP_ERR_NOERROR;
diff --git a/agent/mibgroup/agentx/master.h b/agent/mibgroup/agentx/master.h
index b6a7f6b..a5dbfad 100644
--- a/agent/mibgroup/agentx/master.h
+++ b/agent/mibgroup/agentx/master.h
@@ -7,7 +7,6 @@
 config_require(agentx/client)
 config_require(agentx/master_admin)
 config_require(agentx/agentx_config)
-config_require(mibII/sysORTable)
 
      void            init_master(void);
      void            real_init_master(void);
diff --git a/agent/mibgroup/agentx/master_admin.c b/agent/mibgroup/agentx/master_admin.c
index 12ddb5d..b073da3 100644
--- a/agent/mibgroup/agentx/master_admin.c
+++ b/agent/mibgroup/agentx/master_admin.c
@@ -45,7 +45,7 @@
 #include <net-snmp/agent/agent_index.h>
 #include <net-snmp/agent/agent_trap.h>
 #include <net-snmp/agent/agent_callbacks.h>
-#include "mibII/sysORTable.h"
+#include <net-snmp/agent/agent_sysORTable.h>
 #include "master.h"
 
 extern struct timeval starttime;
@@ -70,7 +70,7 @@
     netsnmp_session *sp;
     struct timeval  now;
 
-    DEBUGMSGTL(("agentx/master", "open %08p\n", session));
+    DEBUGMSGTL(("agentx/master", "open %8p\n", session));
     sp = (netsnmp_session *) malloc(sizeof(netsnmp_session));
     if (sp == NULL) {
         session->s_snmp_errno = AGENTX_ERR_OPEN_FAILED;
@@ -117,7 +117,7 @@
     sp->flags |= (pdu->flags & AGENTX_MSG_FLAG_NETWORK_BYTE_ORDER);
     sp->next = session->subsession;
     session->subsession = sp;
-    DEBUGMSGTL(("agentx/master", "opened %08p = %d with flags = %02x\n",
+    DEBUGMSGTL(("agentx/master", "opened %8p = %ld with flags = %02lx\n",
                 sp, sp->sessid, sp->flags & AGENTX_MSG_FLAGS_MASK));
 
     return sp->sessid;
@@ -131,7 +131,7 @@
     if (!session)
         return AGENTX_ERR_NOT_OPEN;
 
-    DEBUGMSGTL(("agentx/master", "close %08p, %d\n", session, sessid));
+    DEBUGMSGTL(("agentx/master", "close %8p, %d\n", session, sessid));
     if (sessid == -1) {
         /*
          * The following is necessary to avoid locking up the agent when
@@ -149,9 +149,7 @@
                 
         unregister_mibs_by_session(session);
         unregister_index_by_session(session);
-        snmp_call_callbacks(SNMP_CALLBACK_APPLICATION,
-                            SNMPD_CALLBACK_REQ_UNREG_SYSOR_SESS,
-                            (void*)session);
+        unregister_sysORTable_by_session(session);
 	SNMP_FREE(session->myvoid);
         return AGENTX_ERR_NOERROR;
     }
@@ -163,9 +161,7 @@
         if (sp->sessid == sessid) {
             unregister_mibs_by_session(sp);
             unregister_index_by_session(sp);
-            snmp_call_callbacks(SNMP_CALLBACK_APPLICATION,
-                                SNMPD_CALLBACK_REQ_UNREG_SYSOR_SESS,
-                                (void*)sp);
+            unregister_sysORTable_by_session(sp);
 
             *prevNext = sp->next;
 
@@ -178,7 +174,7 @@
             free(sp);
             sp = NULL;
 
-            DEBUGMSGTL(("agentx/master", "closed %08p, %d okay\n",
+            DEBUGMSGTL(("agentx/master", "closed %8p, %d okay\n",
                         session, sessid));
             return AGENTX_ERR_NOERROR;
         }
@@ -380,20 +376,17 @@
 add_agent_caps_list(netsnmp_session * session, netsnmp_pdu *pdu)
 {
     netsnmp_session *sp;
-    struct sysORTable parms;
+    char* description;
 
     sp = find_agentx_session(session, pdu->sessid);
     if (sp == NULL)
         return AGENTX_ERR_NOT_OPEN;
 
-    parms.OR_oid = pdu->variables->name;
-    parms.OR_oidlen = pdu->variables->name_length;
-    parms.OR_descr  = netsnmp_strdup_and_null(pdu->variables->val.string,
-                                              pdu->variables->val_len);
-    parms.OR_sess = sp;
-    snmp_call_callbacks(SNMP_CALLBACK_APPLICATION,
-                        SNMPD_CALLBACK_REQ_REG_SYSOR, (void*)&parms);
-    free(parms.OR_descr);
+    description = netsnmp_strdup_and_null(pdu->variables->val.string,
+                                          pdu->variables->val_len);
+    register_sysORTable_sess(pdu->variables->name, pdu->variables->name_length,
+                             description, sp);
+    free(description);
     return AGENTX_ERR_NOERROR;
 }
 
@@ -401,22 +394,18 @@
 remove_agent_caps_list(netsnmp_session * session, netsnmp_pdu *pdu)
 {
     netsnmp_session *sp;
-    struct sysORTable parms;
+    int rc;
 
     sp = find_agentx_session(session, pdu->sessid);
     if (sp == NULL)
         return AGENTX_ERR_NOT_OPEN;
 
-    parms.OR_oid = pdu->variables->name;
-    parms.OR_oidlen = pdu->variables->name_length;
-    parms.OR_sess = sp;
-    snmp_call_callbacks(SNMP_CALLBACK_APPLICATION,
-                        SNMPD_CALLBACK_REQ_UNREG_SYSOR, (void*)&parms);
-    /*
-     * no easy way to get an error code...
-     * if (rc < 0)
-     *   return AGENTX_ERR_UNKNOWN_AGENTCAPS;
-     */
+    rc = unregister_sysORTable_sess(pdu->variables->name,
+                                    pdu->variables->name_length, sp);
+
+    if (rc < 0)
+      return AGENTX_ERR_UNKNOWN_AGENTCAPS;
+
     return AGENTX_ERR_NOERROR;
 }
 
@@ -454,7 +443,18 @@
      *     as this is valid AgentX syntax.
      */
 
-    send_trap_vars(-1, -1, pdu->variables);
+	/* If a context name was specified, send the trap using that context.
+	 * Otherwise, send the trap without the context using the old method */
+	if (pdu->contextName != NULL)
+	{
+        send_trap_vars_with_context(-1, -1, pdu->variables, 
+                       pdu->contextName);
+	}
+	else
+	{
+        send_trap_vars(-1, -1, pdu->variables);
+	}
+
     return AGENTX_ERR_NOERROR;
 }
 
@@ -481,12 +481,16 @@
 
     if (operation == NETSNMP_CALLBACK_OP_DISCONNECT) {
         DEBUGMSGTL(("agentx/master",
-                    "transport disconnect on session %08p\n", session));
+                    "transport disconnect on session %8p\n", session));
         /*
          * Shut this session down gracefully.  
          */
         close_agentx_session(session, -1);
         return 1;
+    } else if (operation == NETSNMP_CALLBACK_OP_CONNECT) {
+        DEBUGMSGTL(("agentx/master",
+                    "transport connect on session %8p\n", session));
+        return 1;
     } else if (operation != NETSNMP_CALLBACK_OP_RECEIVED_MESSAGE) {
         DEBUGMSGTL(("agentx/master", "unexpected callback op %d\n",
                     operation));
@@ -503,8 +507,9 @@
         asp = init_agent_snmp_session(session, pdu);
     }
 
-    DEBUGMSGTL(("agentx/master", "handle pdu (req=0x%x,trans=0x%x,sess=0x%x)\n",
-                pdu->reqid,pdu->transid, pdu->sessid));
+    DEBUGMSGTL(("agentx/master", "handle pdu (req=0x%lx,trans=0x%lx,sess=0x%lx)\n",
+                (unsigned long)pdu->reqid, (unsigned long)pdu->transid,
+		(unsigned long)pdu->sessid));
     
     switch (pdu->command) {
     case AGENTX_MSG_OPEN:
@@ -579,9 +584,10 @@
     asp->pdu->time = calculate_time_diff(&now, &starttime);
     asp->pdu->command = AGENTX_MSG_RESPONSE;
     asp->pdu->errstat = asp->status;
-    DEBUGMSGTL(("agentx/master", "send response, stat %d (req=0x%x,trans="
-                "0x%x,sess=0x%x)\n",
-                asp->status, pdu->reqid,pdu->transid, pdu->sessid));
+    DEBUGMSGTL(("agentx/master", "send response, stat %d (req=0x%lx,trans="
+                "0x%lx,sess=0x%lx)\n",
+                asp->status, (unsigned long)pdu->reqid,
+		(unsigned long)pdu->transid, (unsigned long)pdu->sessid));
     if (!snmp_send(asp->session, asp->pdu)) {
         char           *eb = NULL;
         int             pe, pse;
diff --git a/agent/mibgroup/agentx/protocol.c b/agent/mibgroup/agentx/protocol.c
index a482770..771b45b 100644
--- a/agent/mibgroup/agentx/protocol.c
+++ b/agent/mibgroup/agentx/protocol.c
@@ -135,7 +135,7 @@
 #endif
     }
     DEBUGDUMPSETUP("send", (*buf + ilen), 4);
-    DEBUGMSG(("dumpv_send", "  Integer:\t%lu (0x%.2lX)\n", ivalue,
+    DEBUGMSG(("dumpv_send", "  Integer:\t%u (0x%.2X)\n", ivalue,
               ivalue));
     return 1;
 }
@@ -168,7 +168,7 @@
 #endif
     }
     DEBUGDUMPSETUP("send", orig_bufp, 4);
-    DEBUGMSG(("dumpv_send", "  Integer:\t%ld (0x%.2X)\n", orig_val,
+    DEBUGMSG(("dumpv_send", "  Integer:\t%u (0x%.2X)\n", orig_val,
               orig_val));
 }
 
@@ -264,8 +264,8 @@
 
     DEBUGDUMPHEADER("send", "OID Header");
     DEBUGDUMPSETUP("send", (*buf + ilen), 4);
-    DEBUGMSG(("dumpv_send", "  # subids:\t%d (0x%.2X)\n", name_len,
-              name_len));
+    DEBUGMSG(("dumpv_send", "  # subids:\t%d (0x%.2X)\n", (int)name_len,
+              (unsigned int)name_len));
     DEBUGPRINTINDENT("dumpv_send");
     DEBUGMSG(("dumpv_send", "  prefix:\t%d (0x%.2X)\n", prefix, prefix));
     DEBUGPRINTINDENT("dumpv_send");
@@ -449,6 +449,7 @@
                                   vp->name, vp->name_length,
                                   network_order)) {
         DEBUGINDENTLESS();
+        DEBUGINDENTLESS();
         return 0;
     }
     DEBUGINDENTLESS();
@@ -488,7 +489,7 @@
     case ASN_OPAQUE_DOUBLE:
         DEBUGDUMPHEADER("send", "Build Opaque Double");
         DEBUGPRINTINDENT("dumpv_send");
-        DEBUGMSG(("dumpv_send", "  Double:\t%lf\n", *(vp->val.doubleVal)));
+        DEBUGMSG(("dumpv_send", "  Double:\t%f\n", *(vp->val.doubleVal)));
         if (!agentx_realloc_build_double
             (buf, buf_len, out_len, allow_realloc, *(vp->val.doubleVal),
              network_order)) {
@@ -548,6 +549,7 @@
                 DEBUGINDENTLESS();
                 return 0;
             }
+            DEBUGINDENTLESS();
         } else {
             DEBUGDUMPHEADER("send", "Build Counter64 (low, high)");
             if (!agentx_realloc_build_int
@@ -562,6 +564,7 @@
                 DEBUGINDENTLESS();
                 return 0;
             }
+            DEBUGINDENTLESS();
         }
         break;
 
@@ -699,6 +702,17 @@
         pdu->flags &= ~(AGENTX_MSG_FLAG_NON_DEFAULT_CONTEXT);
     }
 
+	/* We've received a PDU that has specified a context.  NetSNMP however, uses
+	 * the pdu->community field to specify context when using the AgentX
+	 * protocol.  Therefore we need to copy the context name and length into the
+	 * pdu->community and pdu->community_len fields, respectively. */
+	if (pdu->contextName != NULL && pdu->community == NULL)
+	{	
+		pdu->community     = strdup(pdu->contextName);
+		pdu->community_len = pdu->contextNameLen;
+		pdu->flags |= AGENTX_MSG_FLAG_NON_DEFAULT_CONTEXT;
+	}
+
     /*
      * Build the header (and context if appropriate).  
      */
@@ -902,7 +916,7 @@
         }
         DEBUGDUMPHEADER("send", "Response");
         DEBUGDUMPSETUP("send", (*buf + *out_len - 4), 4);
-        DEBUGMSG(("dumpv_send", "  sysUpTime:\t%d\n", pdu->time));
+        DEBUGMSG(("dumpv_send", "  sysUpTime:\t%lu\n", pdu->time));
         DEBUGINDENTLESS();
 
         if (!agentx_realloc_build_short
@@ -918,9 +932,9 @@
         }
         DEBUGDUMPHEADER("send", "Response errors");
         DEBUGDUMPSETUP("send", (*buf + *out_len - 4), 4);
-        DEBUGMSG(("dumpv_send", "  errstat:\t%d\n", pdu->errstat));
+        DEBUGMSG(("dumpv_send", "  errstat:\t%ld\n", pdu->errstat));
         DEBUGPRINTINDENT("dumpv_send");
-        DEBUGMSG(("dumpv_send", "  errindex:\t%d\n", pdu->errindex));
+        DEBUGMSG(("dumpv_send", "  errindex:\t%ld\n", pdu->errindex));
         DEBUGINDENTLESS();
 
         /*
@@ -1063,7 +1077,7 @@
         value += data[0];
 #endif
     }
-    DEBUGMSG(("dumpv_recv", "  Integer:\t%ld (0x%.2X)\n", value, value));
+    DEBUGMSG(("dumpv_recv", "  Integer:\t%u (0x%.2X)\n", value, value));
 
     return value;
 }
@@ -1094,7 +1108,7 @@
     }
 
     DEBUGDUMPSETUP("recv", data, 2);
-    DEBUGMSG(("dumpv_recv", "  Short:\t%ld (0x%.2X)\n", value, value));
+    DEBUGMSG(("dumpv_recv", "  Short:\t%hu (0x%.2X)\n", value, value));
     return value;
 }
 
@@ -1140,7 +1154,7 @@
     *length -= 4;
 
     DEBUGMSG(("djp", "  parse_oid\n"));
-    DEBUGMSG(("djp", "  sizeof(oid) = %d\n", sizeof(oid)));
+    DEBUGMSG(("djp", "  sizeof(oid) = %d\n", (int)sizeof(oid)));
     if (n_subid == 0 && prefix == 0) {
         /*
          * Null OID 
@@ -1158,7 +1172,9 @@
      */
     tmp_oid_len = (prefix ? n_subid + 5 : n_subid);
     if (*oid_len < tmp_oid_len) {
-        DEBUGMSGTL(("agentx", "Oversized Object ID\n"));
+        DEBUGMSGTL(("agentx", "Oversized Object ID (buf=%d pdu=%d)\n",
+		    (int) *oid_len, tmp_oid_len));
+        DEBUGINDENTLESS();
         return NULL;
     }
 
@@ -1169,6 +1185,7 @@
 #endif
     if (*length < 4 * n_subid) {
         DEBUGMSGTL(("agentx", "Incomplete Object ID\n"));
+        DEBUGINDENTLESS();
         return NULL;
     }
 
@@ -1227,14 +1244,14 @@
 
     if (*length < 4) {
         DEBUGMSGTL(("agentx", "Incomplete string (too short: %d)\n",
-                    *length));
+                    (int)*length));
         return NULL;
     }
 
     len = agentx_parse_int(data, network_byte_order);
     if (*length < len + 4) {
         DEBUGMSGTL(("agentx", "Incomplete string (still too short: %d)\n",
-                    *length));
+                    (int)*length));
         return NULL;
     }
     if (len > *str_len) {
@@ -1322,7 +1339,7 @@
         *opaque_len = sizeof(double);
         memcpy(opaque_buf, &fu.c[0], sizeof(double));
         *type = ASN_OPAQUE_DOUBLE;
-        DEBUGMSG(("dumpv_recv", "Double: %lf\n", fu.doubleVal));
+        DEBUGMSG(("dumpv_recv", "Double: %f\n", fu.doubleVal));
         return cp;
 
     case ASN_OPAQUE_I64:
@@ -1345,8 +1362,6 @@
 {
     u_char         *bufp = data;
     u_int           int_val;
-    int            int_offset;
-    u_int          *int_ptr = (u_int *) data_buf;
     struct counter64 tmp64;
 
     DEBUGDUMPHEADER("recv", "VarBind:");
@@ -1401,16 +1416,16 @@
 
     case ASN_COUNTER64:
         memset(&tmp64, 0, sizeof(tmp64));
-        if (network_byte_order) {
-            tmp64.high = agentx_parse_int(bufp,   network_byte_order);
-            tmp64.low  = agentx_parse_int(bufp+4, network_byte_order);
-        } else {
-            tmp64.high = agentx_parse_int(bufp+4, network_byte_order);
-            tmp64.low  = agentx_parse_int(bufp,   network_byte_order);
-        }
+	if (network_byte_order) {
+	    tmp64.high = agentx_parse_int(bufp,   network_byte_order);
+	    tmp64.low  = agentx_parse_int(bufp+4, network_byte_order);
+	} else {
+	    tmp64.high = agentx_parse_int(bufp+4, network_byte_order);
+	    tmp64.low  = agentx_parse_int(bufp,   network_byte_order);
+	}
 
         memcpy(data_buf, &tmp64, sizeof(tmp64));
-        *data_len = sizeof(tmp64);
+	*data_len = sizeof(tmp64);
 	bufp    += 8;
 	*length -= 8;
         break;
@@ -1529,6 +1544,7 @@
     DEBUGINDENTLESS();
     bufp += 4;
 
+    DEBUGINDENTLESS();
     *length -= 20;
     if (*length != payload) {   /* Short payload */
         return NULL;
@@ -1604,11 +1620,21 @@
         pdu->community_len = buf_len;
         snmp_clone_mem((void **) &pdu->community,
                        (void *) buffer, (unsigned) buf_len);
+		
+		/* The NetSNMP API stuffs the context into the PDU's community string
+		 * field, when using the AgentX Protocol.  The rest of the code however,
+		 * expects to find the context in the PDU's context field.  Therefore we
+		 * need to copy the context into the PDU's context fields.  */
+		if (pdu->community_len > 0 && pdu->contextName == NULL)
+		{
+			pdu->contextName    = strdup(pdu->community);
+			pdu->contextNameLen = pdu->community_len;
+		}
+
         buf_len = sizeof(buffer);
     }
 
     DEBUGDUMPHEADER("recv", "PDU");
-    DEBUGINDENTMORE();
     switch (pdu->command) {
     case AGENTX_MSG_OPEN:
         pdu->time = *bufp;      /* Timeout */
@@ -1621,7 +1647,8 @@
         DEBUGDUMPHEADER("recv", "Subagent OID");
         bufp = agentx_parse_oid(bufp, length, NULL,
                                 oid_buffer, &oid_buf_len,
-                                pdu->flags & AGENTX_FLAGS_NETWORK_BYTE_ORDER);
+                                pdu->
+                                flags & AGENTX_FLAGS_NETWORK_BYTE_ORDER);
         DEBUGINDENTLESS();
         if (bufp == NULL) {
             DEBUGINDENTLESS();
@@ -1629,7 +1656,8 @@
         }
         DEBUGDUMPHEADER("recv", "Subagent Description");
         bufp = agentx_parse_string(bufp, length, buffer, &buf_len,
-                                   pdu->flags &
+                                   pdu->
+                                   flags &
                                    AGENTX_FLAGS_NETWORK_BYTE_ORDER);
         DEBUGINDENTLESS();
         if (bufp == NULL) {
@@ -1872,14 +1900,11 @@
 
     default:
         DEBUGINDENTLESS();
-        DEBUGINDENTLESS();
         DEBUGMSGTL(("agentx", "Unrecognised PDU type: %d\n",
                     pdu->command));
         return SNMPERR_UNKNOWN_PDU;
     }
     DEBUGINDENTLESS();
-    DEBUGINDENTLESS();
-    DEBUGINDENTLESS();
     return SNMP_ERR_NOERROR;
 }
 
diff --git a/agent/mibgroup/agentx/subagent.c b/agent/mibgroup/agentx/subagent.c
index 312d8da..03a38b7 100644
--- a/agent/mibgroup/agentx/subagent.c
+++ b/agent/mibgroup/agentx/subagent.c
@@ -46,9 +46,8 @@
 #include "agentx/agentx_config.h"
 #include <net-snmp/agent/agent_callbacks.h>
 #include <net-snmp/agent/agent_trap.h>
-#ifdef USING_MIBII_SYSORTABLE_MODULE
-#include "mibII/sysORTable.h"
-#endif
+#include <net-snmp/agent/sysORTable.h>
+#include <net-snmp/agent/agent_sysORTable.h>
 
 #include "subagent.h"
 
@@ -331,8 +330,9 @@
      * ok, we have a pdu from the net. Modify as needed 
      */
 
-    DEBUGMSGTL(("agentx/subagent", "handling agentx request (req=0x%x,trans="
-                "0x%x,sess=0x%x)\n", pdu->reqid,pdu->transid, pdu->sessid));
+    DEBUGMSGTL(("agentx/subagent", "handling AgentX request (req=0x%x,trans="
+                "0x%x,sess=0x%x)\n", (unsigned)pdu->reqid,
+		(unsigned)pdu->transid, (unsigned)pdu->sessid));
     pdu->version = AGENTX_VERSION_1;
     pdu->flags |= UCD_MSG_FLAG_ALWAYS_IN_VIEW;
 
@@ -506,7 +506,7 @@
     result = snmp_async_send(agentx_callback_sess, internal_pdu, mycallback,
                     retmagic);
     if (result == 0) {
-        snmp_free_pdu(internal_pdu);
+        snmp_free_pdu( internal_pdu );
     }
     return 1;
 }
@@ -545,8 +545,11 @@
 
     pdu = snmp_clone_pdu(pdu);
     DEBUGMSGTL(("agentx/subagent",
-                "handling AgentX response (cmd 0x%02x orig_cmd 0x%02x)\n",
-                pdu->command, smagic->original_command));
+                "handling AgentX response (cmd 0x%02x orig_cmd 0x%02x)"
+                " (req=0x%x,trans=0x%x,sess=0x%x)\n",
+                pdu->command, smagic->original_command,
+                (unsigned)pdu->reqid, (unsigned)pdu->transid,
+                (unsigned)pdu->sessid));
 
     if (pdu->command == SNMP_MSG_INTERNAL_SET_FREE ||
         pdu->command == SNMP_MSG_INTERNAL_SET_UNDO ||
@@ -584,7 +587,7 @@
                      * set to `endOfMibView'".  
                      */
                     snmp_set_var_objid(v, u->name, u->name_length);
-                    snmp_set_var_typed_value(v, SNMP_ENDOFMIBVIEW, 0, 0);
+                    snmp_set_var_typed_value(v, SNMP_ENDOFMIBVIEW, NULL, 0);
                     DEBUGMSGTL(("agentx/subagent",
                                 "scope violation -- return endOfMibView\n"));
                 }
@@ -620,7 +623,7 @@
 {
     netsnmp_session *retsess;
     struct agent_netsnmp_set_info *asi;
-    int    result;
+    int result;
 
     if (op != NETSNMP_CALLBACK_OP_RECEIVED_MESSAGE || magic == NULL) {
         return 1;
@@ -629,7 +632,8 @@
     DEBUGMSGTL(("agentx/subagent",
                 "handling agentx subagent set response (mode=%d,req=0x%x,"
                 "trans=0x%x,sess=0x%x)\n",
-                pdu->command, pdu->reqid,pdu->transid, pdu->sessid));
+                (unsigned)pdu->command, (unsigned)pdu->reqid,
+		(unsigned)pdu->transid, (unsigned)pdu->sessid));
     pdu = snmp_clone_pdu(pdu);
 
     asi = (struct agent_netsnmp_set_info *) magic;
@@ -648,7 +652,7 @@
             result = snmp_async_send(agentx_callback_sess, pdu,
                             handle_subagent_set_response, asi);
             if (result == 0) {
-                snmp_free_pdu(pdu);
+                snmp_free_pdu( pdu );
             }
             DEBUGMSGTL(("agentx/subagent",
                         "  going from RESERVE1 -> RESERVE2\n"));
@@ -703,13 +707,12 @@
 }
 
 
-#ifdef USING_MIBII_SYSORTABLE_MODULE
 int
 agentx_sysOR_callback(int majorID, int minorID, void *serverarg,
                       void *clientarg)
 {
-    struct register_sysOR_parameters *reg_parms =
-        (struct register_sysOR_parameters *) serverarg;
+    const struct register_sysOR_parameters *reg_parms =
+        (const struct register_sysOR_parameters *) serverarg;
     netsnmp_session *agentx_ss = (netsnmp_session *) clientarg;
 
     if (minorID == SNMPD_CALLBACK_REG_SYSOR)
@@ -721,7 +724,6 @@
                                        reg_parms->name,
                                        reg_parms->namelen);
 }
-#endif
 
 
 static int
@@ -765,14 +767,12 @@
     snmp_register_callback(SNMP_CALLBACK_APPLICATION,
                            SNMPD_CALLBACK_UNREGISTER_OID,
                            agentx_registration_callback, s);
-#ifdef USING_MIBII_SYSORTABLE_MODULE
     snmp_register_callback(SNMP_CALLBACK_APPLICATION,
                            SNMPD_CALLBACK_REG_SYSOR,
                            agentx_sysOR_callback, s);
     snmp_register_callback(SNMP_CALLBACK_APPLICATION,
                            SNMPD_CALLBACK_UNREG_SYSOR,
                            agentx_sysOR_callback, s);
-#endif
 }
 
 /*
@@ -792,15 +792,12 @@
     snmp_unregister_callback(SNMP_CALLBACK_APPLICATION,
                              SNMPD_CALLBACK_UNREGISTER_OID,
                              agentx_registration_callback, ss, 1);
-#ifdef USING_MIBII_SYSORTABLE_MODULE
     snmp_unregister_callback(SNMP_CALLBACK_APPLICATION,
                              SNMPD_CALLBACK_REG_SYSOR,
                              agentx_sysOR_callback, ss, 1);
     snmp_unregister_callback(SNMP_CALLBACK_APPLICATION,
                              SNMPD_CALLBACK_UNREG_SYSOR,
                              agentx_sysOR_callback, ss, 1);
-#endif
-
 }
 
 /*
@@ -914,6 +911,13 @@
     return 0;
 }
 
+static void
+agentx_reopen_sysORTable(const struct sysORTable* data, void* v)
+{
+  netsnmp_session *agentx_ss = (netsnmp_session *) v;
+  agentx_add_agentcaps(agentx_ss, data->OR_oid, data->OR_oidlen,
+  	                          data->OR_descr);
+}
 
 /*
  * Alarm callback function to open a session to the master agent.  If a
@@ -942,15 +946,20 @@
         register_mib_reattach();
 
         /*
+         * Reregister all our sysOREntries
+         */
+        netsnmp_sysORTable_foreach(&agentx_reopen_sysORTable, main_session);
+
+        /*
          * Register a ping alarm (if need be).  
          */
-        subagent_register_ping_alarm(0, 0, 0, main_session);
+        subagent_register_ping_alarm(0, 0, NULL, main_session);
     } else {
         if (clientreg == 0) {
             /*
              * Register a reattach alarm for later 
              */
-            subagent_register_ping_alarm(0, 0, 0, main_session);
+            subagent_register_ping_alarm(0, 0, NULL, main_session);
         }
     }
 }
diff --git a/agent/mibgroup/disman/event/mteEvent.c b/agent/mibgroup/disman/event/mteEvent.c
index 327f8ba..2fe6979 100644
--- a/agent/mibgroup/disman/event/mteEvent.c
+++ b/agent/mibgroup/disman/event/mteEvent.c
@@ -23,7 +23,7 @@
     DEBUGMSGTL(("disman:event:init", "init event container\n"));
     if (!event_table_data) {
         event_table_data = netsnmp_tdata_create_table("mteEventTable", 0);
-        DEBUGMSGTL(("disman:event:init", "create event container (%x)\n",
+        DEBUGMSGTL(("disman:event:init", "create event container (%p)\n",
                                       event_table_data));
     }
 }
@@ -43,12 +43,12 @@
 
     /*
      * Insert fixed events for the default trigger notifications
-     *
+     * 
      * NB: internal events (with an owner of "_snmpd") will not in
      * fact refer to the mteObjectsTable for the payload varbinds.
-     * The routine mteObjects_internal_vblist() hardcodes the
+     * The routine mteObjects_internal_vblist() hardcodes the 
      * appropriate varbinds for these internal events.
-     *   This routine will need to be updated whenever a new
+     *   This routine will need to be updated whenever a new 
      * internal event is added.
      */
     if ( _defaults_init)
@@ -135,7 +135,7 @@
         DEBUGMSG(("disman:event:dump", "(%s, %s)",
                                          row->indexes->val.string,
                                          row->indexes->next_variable->val.string));
-        DEBUGMSG(("disman:event:dump", ": %x, %x\n", row, entry));
+        DEBUGMSG(("disman:event:dump", ": %p, %p\n", row, entry));
         i++;
     }
     DEBUGMSGTL(("disman:event:dump", "EventTable %d entries\n", i));
@@ -330,7 +330,7 @@
     vp->next_variable     = vblist->next_variable;
     vblist->next_variable = var;
 }
-#endif
+#endif /* __NOT_NEEDED */
 
 int
 _mteEvent_fire_notify( struct mteEvent   *entry,     /* The event to fire  */
@@ -421,7 +421,7 @@
         } else {
             for (v2 = var; v2 && v2->next_variable; v2=v2->next_variable)
                 ;
-            mteObjects_internal_vblist(v2,  entry->mteNotifyObjects, trigger, s);
+            mteObjects_internal_vblist(v2, entry->mteNotifyObjects, trigger, s);
         }
     }
 
diff --git a/agent/mibgroup/disman/event/mteEventNotificationTable.c b/agent/mibgroup/disman/event/mteEventNotificationTable.c
index 5892fb7..934a1c5 100644
--- a/agent/mibgroup/disman/event/mteEventNotificationTable.c
+++ b/agent/mibgroup/disman/event/mteEventNotificationTable.c
@@ -48,7 +48,7 @@
 
     /* Register this using the (common) event_table_data container */
     netsnmp_tdata_register(reg, event_table_data, table_info);
-    DEBUGMSGTL(("disman:event:init", "Event Notify Table container (%x)\n",
+    DEBUGMSGTL(("disman:event:init", "Event Notify Table container (%p)\n",
                                       event_table_data));
 }
 
diff --git a/agent/mibgroup/disman/event/mteEventSetTable.c b/agent/mibgroup/disman/event/mteEventSetTable.c
index 3646144..97783c1 100644
--- a/agent/mibgroup/disman/event/mteEventSetTable.c
+++ b/agent/mibgroup/disman/event/mteEventSetTable.c
@@ -48,7 +48,7 @@
 
     /* Register this using the (common) event_table_data container */
     netsnmp_tdata_register(reg, event_table_data, table_info);
-    DEBUGMSGTL(("disman:event:init", "Event Set Table container (%x)\n",
+    DEBUGMSGTL(("disman:event:init", "Event Set Table container (%p)\n",
                                       event_table_data));
 }
 
diff --git a/agent/mibgroup/disman/event/mteEventTable.c b/agent/mibgroup/disman/event/mteEventTable.c
index 19fe0a1..2c21e67 100644
--- a/agent/mibgroup/disman/event/mteEventTable.c
+++ b/agent/mibgroup/disman/event/mteEventTable.c
@@ -49,7 +49,7 @@
 
     /* Register this using the (common) event_table_data container */
     netsnmp_tdata_register(reg, event_table_data, table_info);
-    DEBUGMSGTL(("disman:event:init", "Event Table container (%x)\n",
+    DEBUGMSGTL(("disman:event:init", "Event Table container (%p)\n",
                                       event_table_data));
 }
 
diff --git a/agent/mibgroup/disman/event/mteObjectsConf.c b/agent/mibgroup/disman/event/mteObjectsConf.c
index 3f9293c..3e9c11b 100644
--- a/agent/mibgroup/disman/event/mteObjectsConf.c
+++ b/agent/mibgroup/disman/event/mteObjectsConf.c
@@ -62,7 +62,7 @@
     line  = read_config_read_data(ASN_OCTET_STR, line, &vp,    &len);
     line  = read_config_read_data(ASN_UNSIGNED,  line, &index, &len);
 
-    DEBUGMSG(("disman:event:conf", "(%s, %s, %d) ", owner, oname, index));
+    DEBUGMSG(("disman:event:conf", "(%s, %s, %lu) ", owner, oname, index));
 
     row   = mteObjects_createEntry( owner, oname, index, 0 );
     /* entry = (struct mteObject *)netsnmp_tdata_row_entry( row ); */
@@ -131,7 +131,7 @@
         if ( entry->flags & MTE_OBJECT_FLAG_FIXED )
             continue;
 
-        DEBUGMSGTL(("disman:event:conf", "  Storing (%s %s %d)\n",
+        DEBUGMSGTL(("disman:event:conf", "  Storing (%s %s %ld)\n",
                          entry->mteOwner, entry->mteOName, entry->mteOIndex));
         memset(line, 0, sizeof(line));
         strcat(line, "_mteOTable ");
diff --git a/agent/mibgroup/disman/event/mteTrigger.c b/agent/mibgroup/disman/event/mteTrigger.c
index 11cb5b7..cf51edb 100644
--- a/agent/mibgroup/disman/event/mteTrigger.c
+++ b/agent/mibgroup/disman/event/mteTrigger.c
@@ -31,7 +31,7 @@
             snmp_log(LOG_ERR, "failed to create mteTriggerTable");
             return;
         }
-        DEBUGMSGTL(("disman:event:init", "create trigger container (%x)\n",
+        DEBUGMSGTL(("disman:event:init", "create trigger container (%p)\n",
                                           trigger_table_data));
     }
     mteTriggerFailures = 0;
@@ -69,7 +69,7 @@
         DEBUGMSG(("disman:event:dump", "(%s, %s)",
                                          row->indexes->val.string,
                                          row->indexes->next_variable->val.string));
-        DEBUGMSG(("disman:event:dump", ": %x, %x\n", row, entry));
+        DEBUGMSG(("disman:event:dump", ": %p, %p\n", row, entry));
         i++;
     }
     DEBUGMSGTL(("disman:event:dump", "TriggerTable %d entries\n", i));
diff --git a/agent/mibgroup/disman/expr/expErrorTable.c b/agent/mibgroup/disman/expr/expErrorTable.c
index 41bbe29..dbc2217 100644
--- a/agent/mibgroup/disman/expr/expErrorTable.c
+++ b/agent/mibgroup/disman/expr/expErrorTable.c
@@ -48,7 +48,7 @@
 
     /* Register this using the (common) expr_table_data container */
     netsnmp_tdata_register(reg, expr_table_data, table_info);
-    DEBUGMSGTL(("disman:expr:init", "Expression Error Table container (%x)\n",
+    DEBUGMSGTL(("disman:expr:init", "Expression Error Table container (%p)\n",
                                      expr_table_data));
 }
 
diff --git a/agent/mibgroup/disman/expr/expExpression.c b/agent/mibgroup/disman/expr/expExpression.c
index 1c24b78..c924141 100644
--- a/agent/mibgroup/disman/expr/expExpression.c
+++ b/agent/mibgroup/disman/expr/expExpression.c
@@ -21,7 +21,7 @@
     DEBUGMSGTL(("disman:expr:init", "init expression container\n"));
     if (!expr_table_data) {
          expr_table_data = netsnmp_tdata_create_table("expExpressionTable", 0);
-         DEBUGMSGTL(("disman:expr:init", "create expression container (%x)\n",
+         DEBUGMSGTL(("disman:expr:init", "create expression container (%p)\n",
                                           expr_table_data));
     }
 }
@@ -57,7 +57,7 @@
         DEBUGMSG(("disman:expr:dump", "(%s, %s)",
                                          row->indexes->val.string,
                                          row->indexes->next_variable->val.string));
-        DEBUGMSG(("disman:expr:dump", ": %x, %x\n", row, entry));
+        DEBUGMSG(("disman:expr:dump", ": %p, %p\n", row, entry));
         i++;
     }
     DEBUGMSGTL(("disman:expr:dump", "ExpressionTable %d entries\n", i));
diff --git a/agent/mibgroup/disman/expr/expExpressionConf.c b/agent/mibgroup/disman/expr/expExpressionConf.c
index 61744e1..f9a9d97 100644
--- a/agent/mibgroup/disman/expr/expExpressionConf.c
+++ b/agent/mibgroup/disman/expr/expExpressionConf.c
@@ -6,6 +6,9 @@
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
+
+#include <ctype.h>
+
 #include "utilities/iquery.h"
 #include "disman/expr/expExpression.h"
 #include "disman/expr/expObject.h"
diff --git a/agent/mibgroup/disman/expr/expExpressionTable.c b/agent/mibgroup/disman/expr/expExpressionTable.c
index c07e5fc..906b5e5 100644
--- a/agent/mibgroup/disman/expr/expExpressionTable.c
+++ b/agent/mibgroup/disman/expr/expExpressionTable.c
@@ -49,7 +49,7 @@
 
     /* Register this using the (common) expr_table_data container */
     netsnmp_tdata_register(reg, expr_table_data, table_info);
-    DEBUGMSGTL(("disman:expr:init", "Expression Table container (%x)\n",
+    DEBUGMSGTL(("disman:expr:init", "Expression Table container (%p)\n",
                                      expr_table_data));
 }
 
diff --git a/agent/mibgroup/disman/expr/expObject.c b/agent/mibgroup/disman/expr/expObject.c
index dffe4e4..c27437b 100644
--- a/agent/mibgroup/disman/expr/expObject.c
+++ b/agent/mibgroup/disman/expr/expObject.c
@@ -21,7 +21,7 @@
     DEBUGMSGTL(("disman:expr:init", "init expObject container\n"));
     if (!expObject_table_data) {
          expObject_table_data = netsnmp_tdata_create_table("expObjectTable", 0);
-         DEBUGMSGTL(("disman:expr:init", "create expObject container (%x)\n",
+         DEBUGMSGTL(("disman:expr:init", "create expObject container (%p)\n",
                                           expObject_table_data));
     }
 }
diff --git a/agent/mibgroup/disman/expr/expObjectTable.c b/agent/mibgroup/disman/expr/expObjectTable.c
index 6e60b81..9c49c0d 100644
--- a/agent/mibgroup/disman/expr/expObjectTable.c
+++ b/agent/mibgroup/disman/expr/expObjectTable.c
@@ -51,7 +51,7 @@
 
     /* Register this using the common expObject_table_data container */
     netsnmp_tdata_register(reg, expObject_table_data, table_info);
-    DEBUGMSGTL(("disman:expr:init", "Expression Object Table container (%x)\n",
+    DEBUGMSGTL(("disman:expr:init", "Expression Object Table container (%p)\n",
                                      expObject_table_data));
 }
 
diff --git a/agent/mibgroup/disman/expr/expValueTable.c b/agent/mibgroup/disman/expr/expValueTable.c
index 97bcbab..2fdb4fc 100644
--- a/agent/mibgroup/disman/expr/expValueTable.c
+++ b/agent/mibgroup/disman/expr/expValueTable.c
@@ -59,7 +59,7 @@
     if (!indexes || !indexes->next_variable ||
         !indexes->next_variable->next_variable ) {
         /* XXX - Shouldn't happen! */
-        return 0;
+        return NULL;
     }
 
     DEBUGMSGTL(( "disman:expr:val", "get (%d) entry (%s, %s, ", mode,
@@ -78,7 +78,7 @@
          */
         if (mode == MODE_GETNEXT || mode == MODE_GETBULK) {
             exp = expExpression_getFirstEntry();
-            DEBUGMSGTL(( "disman:expr:val", "first entry (%x)\n", exp ));
+            DEBUGMSGTL(( "disman:expr:val", "first entry (%p)\n", exp ));
         } else {
             DEBUGMSGTL(( "disman:expr:val", "incomplete request\n" ));
             return NULL;        /* No match */
@@ -86,7 +86,7 @@
     } else {
         exp = expExpression_getEntry( (char*)indexes->val.string,
                                       (char*)indexes->next_variable->val.string);
-        DEBUGMSGTL(( "disman:expr:val", "using entry (%x)\n", exp ));
+        DEBUGMSGTL(( "disman:expr:val", "using entry (%p)\n", exp ));
     }
 
     /*
@@ -101,7 +101,7 @@
         }
 NEXT_EXP:
         exp = expExpression_getNextEntry( exp->expOwner, exp->expName );
-        DEBUGMSGTL(( "disman:expr:val", "using next entry (%x)\n", exp ));
+        DEBUGMSGTL(( "disman:expr:val", "using next entry (%p)\n", exp ));
     }
     if (!exp) {
         DEBUGMSGTL(( "disman:expr:val", "no more entries\n"));
@@ -140,7 +140,7 @@
                 return NULL;
             }
             res = expValue_evaluateExpression( exp, NULL, 0 );
-            DEBUGMSGTL(( "disman:expr:val", "scalar get returned (%x)\n", res));
+            DEBUGMSGTL(( "disman:expr:val", "scalar get returned (%p)\n", res));
         } else {
             /*
              * Otherwise, skip the leading '.0' and use
@@ -148,7 +148,7 @@
              */
             res = expValue_evaluateExpression( exp, vp->val.objid+1,
                                            vp->val_len/sizeof(oid)-1);
-            DEBUGMSGTL(( "disman:expr:val", "w/card get returned (%x)\n", res));
+            DEBUGMSGTL(( "disman:expr:val", "w/card get returned (%p)\n", res));
         }
     } else {
         /*
@@ -187,7 +187,7 @@
             snmp_set_var_typed_value( vp, ASN_PRIV_IMPLIED_OBJECT_ID,
                        (u_char*)nullInstance, 3*sizeof(oid));
             res = expValue_evaluateExpression( exp, NULL, 0 );
-            DEBUGMSGTL(( "disman:expr:val", "scalar next returned (%x)\n", res));
+            DEBUGMSGTL(( "disman:expr:val", "scalar next returned (%p)\n", res));
         } else {
             /*
              * Now comes the interesting case - finding the
@@ -235,7 +235,7 @@
                 len = 1;
             }
             res = expValue_evaluateExpression( exp, vp->val.objid+1, len-1);
-            DEBUGMSGTL(( "disman:expr:val", "w/card next returned (%x)\n", res));
+            DEBUGMSGTL(( "disman:expr:val", "w/card next returned (%p)\n", res));
         }
     }
     return res;
diff --git a/agent/mibgroup/disman/expression/expErrorTable.c b/agent/mibgroup/disman/expression/expErrorTable.c
index b7b257e..c605e9a 100644
--- a/agent/mibgroup/disman/expression/expErrorTable.c
+++ b/agent/mibgroup/disman/expression/expErrorTable.c
@@ -66,13 +66,17 @@
      * magic number        , variable type , ro/rw , callback fn  , L, oidsuffix 
      */
 #define	EXPERRORTIME  1
-    {EXPERRORTIME,  ASN_UNSIGNED, RONLY, var_expErrorTable, 2, {1, 1}},
+    {EXPERRORTIME,  ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_expErrorTable, 2, {1, 1}},
 #define	EXPERRORINDEX 2
-    {EXPERRORINDEX, ASN_INTEGER,  RONLY, var_expErrorTable, 2, {1, 2}},
+    {EXPERRORINDEX, ASN_INTEGER,  NETSNMP_OLDAPI_RONLY,
+     var_expErrorTable, 2, {1, 2}},
 #define	EXPERRORCODE 3
-    {EXPERRORCODE,  ASN_INTEGER,  RONLY, var_expErrorTable, 2, {1, 3}},
+    {EXPERRORCODE,  ASN_INTEGER,  NETSNMP_OLDAPI_RONLY,
+     var_expErrorTable, 2, {1, 3}},
 #define	EXPERRORINSTANCE 4
-    {EXPERRORINSTANCE, ASN_OBJECT_ID, RONLY, var_expErrorTable, 2, {1, 4}}
+    {EXPERRORINSTANCE, ASN_OBJECT_ID, NETSNMP_OLDAPI_RONLY,
+     var_expErrorTable, 2, {1, 4}}
 };
 
 extern struct header_complex_index *expExpressionTableStorage;
diff --git a/agent/mibgroup/disman/expression/expExpressionTable.c b/agent/mibgroup/disman/expression/expExpressionTable.c
index da0e19a..a4dd212 100644
--- a/agent/mibgroup/disman/expression/expExpressionTable.c
+++ b/agent/mibgroup/disman/expression/expExpressionTable.c
@@ -65,19 +65,26 @@
      * magic number        , variable type , ro/rw , callback fn  , L, oidsuffix 
      */
 #define	EXPEXPRESSION  3
-    {EXPEXPRESSION,          ASN_OCTET_STR, RWRITE, var_expExpressionTable, 2, {1, 3}},
+    {EXPEXPRESSION,          ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_expExpressionTable, 2, {1, 3}},
 #define	EXPEXPRESSIONVALUETYPE 4
-    {EXPEXPRESSIONVALUETYPE, ASN_INTEGER,   RWRITE, var_expExpressionTable, 2, {1, 4}},
+    {EXPEXPRESSIONVALUETYPE, ASN_INTEGER,   NETSNMP_OLDAPI_RWRITE,
+     var_expExpressionTable, 2, {1, 4}},
 #define	EXPEXPRESSIONCOMMENT 5
-    {EXPEXPRESSIONCOMMENT,   ASN_OCTET_STR, RWRITE, var_expExpressionTable, 2, {1, 5}},
+    {EXPEXPRESSIONCOMMENT,   ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_expExpressionTable, 2, {1, 5}},
 #define	EXPEXPRESSIONDELTALNTERVAL 6
-    {EXPEXPRESSIONDELTALNTERVAL, ASN_INTEGER, RWRITE, var_expExpressionTable, 2, {1, 6}},
+    {EXPEXPRESSIONDELTALNTERVAL, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_expExpressionTable, 2, {1, 6}},
 #define	EXPEXPRESSIONPREFIX 7
-    {EXPEXPRESSIONPREFIX,    ASN_OBJECT_ID, RONLY,  var_expExpressionTable, 2, {1, 7}},
+    {EXPEXPRESSIONPREFIX,    ASN_OBJECT_ID, NETSNMP_OLDAPI_RONLY,
+     var_expExpressionTable, 2, {1, 7}},
 #define	EXPEXPRESSIONERRORS 8
-    {EXPEXPRESSIONERRORS,    ASN_UNSIGNED,  RONLY,  var_expExpressionTable, 2, {1, 8}},
+    {EXPEXPRESSIONERRORS,    ASN_UNSIGNED,  NETSNMP_OLDAPI_RONLY,
+     var_expExpressionTable, 2, {1, 8}},
 #define	EXPEXPRESSIONENTRYSTATUS  9
-    {EXPEXPRESSIONENTRYSTATUS, ASN_INTEGER, RWRITE, var_expExpressionTable, 2, {1, 9}}
+    {EXPEXPRESSIONENTRYSTATUS, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_expExpressionTable, 2, {1, 9}}
 };
 
 /*
diff --git a/agent/mibgroup/disman/expression/expObjectTable.c b/agent/mibgroup/disman/expression/expObjectTable.c
index 8d1855d..08a607c 100644
--- a/agent/mibgroup/disman/expression/expObjectTable.c
+++ b/agent/mibgroup/disman/expression/expObjectTable.c
@@ -66,23 +66,32 @@
      * magic number        , variable type , ro/rw , callback fn  , L, oidsuffix 
      */
 #define	EXPOBJECTID  2
-    {EXPOBJECTID,         ASN_OBJECT_ID, RWRITE, var_expObjectTable, 2, {1, 2}},
+    {EXPOBJECTID,         ASN_OBJECT_ID, NETSNMP_OLDAPI_RWRITE,
+     var_expObjectTable, 2, {1, 2}},
 #define	EXPOBJECTIDWILDCARD 3
-    {EXPOBJECTIDWILDCARD, ASN_INTEGER,   RWRITE, var_expObjectTable, 2, {1, 3}},
+    {EXPOBJECTIDWILDCARD, ASN_INTEGER,   NETSNMP_OLDAPI_RWRITE,
+     var_expObjectTable, 2, {1, 3}},
 #define	EXPOBJECTSAMPLETYPE 4
-    {EXPOBJECTSAMPLETYPE, ASN_INTEGER,   RWRITE, var_expObjectTable, 2, {1, 4}},
+    {EXPOBJECTSAMPLETYPE, ASN_INTEGER,   NETSNMP_OLDAPI_RWRITE,
+     var_expObjectTable, 2, {1, 4}},
 #define	EXPOBJECTDELTADISCONTINUITYID 5
-    {EXPOBJECTDELTADISCONTINUITYID,  ASN_OBJECT_ID, RWRITE, var_expObjectTable, 2, {1, 5}},
+    {EXPOBJECTDELTADISCONTINUITYID,  ASN_OBJECT_ID, NETSNMP_OLDAPI_RWRITE,
+     var_expObjectTable, 2, {1, 5}},
 #define	EXPOBJECTDISCONTINUITYIDWILDCARD 6
-    {EXPOBJECTDISCONTINUITYIDWILDCARD, ASN_INTEGER, RWRITE, var_expObjectTable, 2, {1, 6}},
+    {EXPOBJECTDISCONTINUITYIDWILDCARD, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_expObjectTable, 2, {1, 6}},
 #define	EXPOBJECTDISCONTINUITYIDTYPE 7
-    {EXPOBJECTDISCONTINUITYIDTYPE,     ASN_INTEGER, RWRITE, var_expObjectTable, 2, {1, 7}},
+    {EXPOBJECTDISCONTINUITYIDTYPE,     ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_expObjectTable, 2, {1, 7}},
 #define	EXPOBJECTCONDITIONAL  8
-    {EXPOBJECTCONDITIONAL, ASN_OBJECT_ID, RWRITE, var_expObjectTable, 2, {1, 8}},
+    {EXPOBJECTCONDITIONAL, ASN_OBJECT_ID, NETSNMP_OLDAPI_RWRITE,
+     var_expObjectTable, 2, {1, 8}},
 #define	EXPOBJECTCONDITIONALWILDCARD  9
-    {EXPOBJECTCONDITIONALWILDCARD,     ASN_INTEGER, RWRITE, var_expObjectTable, 2, {1, 9}},
+    {EXPOBJECTCONDITIONALWILDCARD,     ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_expObjectTable, 2, {1, 9}},
 #define	EXPOBJECTENTRYSTATUS  10
-    {EXPOBJECTENTRYSTATUS, ASN_INTEGER, RWRITE, var_expObjectTable, 2, {1, 10}}
+    {EXPOBJECTENTRYSTATUS, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_expObjectTable, 2, {1, 10}}
 };
 
 
diff --git a/agent/mibgroup/disman/expression/expValueTable.c b/agent/mibgroup/disman/expression/expValueTable.c
index 0f5e0b6..d3c0295 100644
--- a/agent/mibgroup/disman/expression/expValueTable.c
+++ b/agent/mibgroup/disman/expression/expValueTable.c
@@ -76,21 +76,29 @@
      * magic number        , variable type , ro/rw , callback fn  , L, oidsuffix 
      */
 #define	EXPVALUECOUNTER32VAL 2
-    {EXPVALUECOUNTER32VAL,  ASN_COUNTER,  RONLY, var_expValueTable, 2, {1, 2}},
+    {EXPVALUECOUNTER32VAL,  ASN_COUNTER,  NETSNMP_OLDAPI_RONLY,
+     var_expValueTable, 2, {1, 2}},
 #define	EXPVALUEUNSIGNED32VAL 3
-    {EXPVALUEUNSIGNED32VAL, ASN_UNSIGNED, RONLY, var_expValueTable, 2, {1, 3}},
+    {EXPVALUEUNSIGNED32VAL, ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_expValueTable, 2, {1, 3}},
 #define	EXPVALUETIMETICKSVAL 4
-    {EXPVALUETIMETICKSVAL,  ASN_UNSIGNED, RONLY, var_expValueTable, 2, {1, 4}},
+    {EXPVALUETIMETICKSVAL,  ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_expValueTable, 2, {1, 4}},
 #define	EXPVALUEINTEGER32VAL 5
-    {EXPVALUEINTEGER32VAL,  ASN_INTEGER,  RONLY, var_expValueTable, 2, {1, 5}},
+    {EXPVALUEINTEGER32VAL,  ASN_INTEGER,  NETSNMP_OLDAPI_RONLY,
+     var_expValueTable, 2, {1, 5}},
 #define	EXPVALUEIPADDRESSVAL 6
-    {EXPVALUEIPADDRESSVAL, ASN_IPADDRESS, RONLY, var_expValueTable, 2, {1, 6}},
+    {EXPVALUEIPADDRESSVAL, ASN_IPADDRESS, NETSNMP_OLDAPI_RONLY,
+     var_expValueTable, 2, {1, 6}},
 #define	EXPVALUEOCTETSTRINGVAL 7
-    {EXPVALUEOCTETSTRINGVAL, ASN_OCTET_STR, RONLY, var_expValueTable, 2, {1, 7}},
+    {EXPVALUEOCTETSTRINGVAL, ASN_OCTET_STR, NETSNMP_OLDAPI_RONLY,
+     var_expValueTable, 2, {1, 7}},
 #define	EXPVALUEOIDVAL  8
-    {EXPVALUEOIDVAL,       ASN_OBJECT_ID, RONLY, var_expValueTable, 2, {1, 8}},
+    {EXPVALUEOIDVAL,       ASN_OBJECT_ID, NETSNMP_OLDAPI_RONLY,
+     var_expValueTable, 2, {1, 8}},
 #define	EXPVALUECOUNTER64VAL  9
-    {EXPVALUECOUNTER64VAL, ASN_INTEGER,   RONLY, var_expValueTable, 2, {1, 9}}
+    {EXPVALUECOUNTER64VAL, ASN_INTEGER,   NETSNMP_OLDAPI_RONLY,
+     var_expValueTable, 2, {1, 9}}
 };
 
 
diff --git a/agent/mibgroup/disman/mteObjectsTable.c b/agent/mibgroup/disman/mteObjectsTable.c
index 4f7e95f..2cf2b0e 100644
--- a/agent/mibgroup/disman/mteObjectsTable.c
+++ b/agent/mibgroup/disman/mteObjectsTable.c
@@ -53,13 +53,14 @@
      * magic number        , variable type , ro/rw , callback fn  , L, oidsuffix 
      */
 #define   MTEOBJECTSID          5
-    {MTEOBJECTSID, ASN_OBJECT_ID, RWRITE, var_mteObjectsTable, 2, {1, 3}},
+    {MTEOBJECTSID, ASN_OBJECT_ID, NETSNMP_OLDAPI_RWRITE,
+     var_mteObjectsTable, 2, {1, 3}},
 #define   MTEOBJECTSIDWILDCARD  6
-    {MTEOBJECTSIDWILDCARD, ASN_INTEGER, RWRITE, var_mteObjectsTable, 2,
-     {1, 4}},
+    {MTEOBJECTSIDWILDCARD, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_mteObjectsTable, 2, {1, 4}},
 #define   MTEOBJECTSENTRYSTATUS  7
-    {MTEOBJECTSENTRYSTATUS, ASN_INTEGER, RWRITE, var_mteObjectsTable, 2,
-     {1, 5}},
+    {MTEOBJECTSENTRYSTATUS, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_mteObjectsTable, 2, {1, 5}},
 
 };
 /*
@@ -641,6 +642,8 @@
 
 
             StorageNew = SNMP_MALLOC_STRUCT(mteObjectsTable_data);
+            if (StorageNew == NULL)
+                return SNMP_ERR_GENERR;
             StorageNew->mteOwner = netsnmp_strdup_and_null(vp->val.string,
                                                            vp->val_len);
             StorageNew->mteOwnerLen = vp->val_len;
@@ -888,6 +891,8 @@
      * malloc initial struct 
      */
     StorageNew = SNMP_MALLOC_STRUCT(mteObjectsTable_data);
+    if (StorageNew == NULL)
+        return SNMP_ERR_GENERR;
     StorageNew->mteOwner = netsnmp_strdup_and_null(owner, strlen(owner));
     StorageNew->mteOwnerLen = strlen(owner);
     StorageNew->mteObjectsName = netsnmp_strdup_and_null(objname,
diff --git a/agent/mibgroup/disman/mteTriggerBooleanTable.c b/agent/mibgroup/disman/mteTriggerBooleanTable.c
index 49ceb5f..fba4980 100644
--- a/agent/mibgroup/disman/mteTriggerBooleanTable.c
+++ b/agent/mibgroup/disman/mteTriggerBooleanTable.c
@@ -53,25 +53,25 @@
      * magic number        , variable type , ro/rw , callback fn  , L, oidsuffix 
      */
 #define   MTETRIGGERBOOLEANCOMPARISON  3
-    {MTETRIGGERBOOLEANCOMPARISON, ASN_INTEGER, RWRITE,
+    {MTETRIGGERBOOLEANCOMPARISON, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerBooleanTable, 2, {1, 1}},
 #define   MTETRIGGERBOOLEANVALUE  4
-    {MTETRIGGERBOOLEANVALUE, ASN_INTEGER, RWRITE,
+    {MTETRIGGERBOOLEANVALUE, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerBooleanTable, 2, {1, 2}},
 #define   MTETRIGGERBOOLEANSTARTUP  5
-    {MTETRIGGERBOOLEANSTARTUP, ASN_INTEGER, RWRITE,
+    {MTETRIGGERBOOLEANSTARTUP, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerBooleanTable, 2, {1, 3}},
 #define   MTETRIGGERBOOLEANOBJECTSOWNER  6
-    {MTETRIGGERBOOLEANOBJECTSOWNER, ASN_OCTET_STR, RWRITE,
+    {MTETRIGGERBOOLEANOBJECTSOWNER, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerBooleanTable, 2, {1, 4}},
 #define   MTETRIGGERBOOLEANOBJECTS  7
-    {MTETRIGGERBOOLEANOBJECTS, ASN_OCTET_STR, RWRITE,
+    {MTETRIGGERBOOLEANOBJECTS, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerBooleanTable, 2, {1, 5}},
 #define   MTETRIGGERBOOLEANEVENTOWNER  8
-    {MTETRIGGERBOOLEANEVENTOWNER, ASN_OCTET_STR, RWRITE,
+    {MTETRIGGERBOOLEANEVENTOWNER, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerBooleanTable, 2, {1, 6}},
 #define   MTETRIGGERBOOLEANEVENT  9
-    {MTETRIGGERBOOLEANEVENT, ASN_OCTET_STR, RWRITE,
+    {MTETRIGGERBOOLEANEVENT, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerBooleanTable, 2, {1, 7}},
 
 };
diff --git a/agent/mibgroup/disman/mteTriggerDeltaTable.c b/agent/mibgroup/disman/mteTriggerDeltaTable.c
index 3edb935..137e097 100644
--- a/agent/mibgroup/disman/mteTriggerDeltaTable.c
+++ b/agent/mibgroup/disman/mteTriggerDeltaTable.c
@@ -53,13 +53,13 @@
      * magic number        , variable type , ro/rw , callback fn  , L, oidsuffix 
      */
 #define   MTETRIGGERDELTADISCONTINUITYID  3
-    {MTETRIGGERDELTADISCONTINUITYID, ASN_OBJECT_ID, RWRITE,
+    {MTETRIGGERDELTADISCONTINUITYID, ASN_OBJECT_ID, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerDeltaTable, 2, {1, 1}},
 #define   MTETRIGGERDELTADISCONTINUITYIDWILDCARD  4
-    {MTETRIGGERDELTADISCONTINUITYIDWILDCARD, ASN_INTEGER, RWRITE,
+    {MTETRIGGERDELTADISCONTINUITYIDWILDCARD, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerDeltaTable, 2, {1, 2}},
 #define   MTETRIGGERDELTADISCONTINUITYIDTYPE  5
-    {MTETRIGGERDELTADISCONTINUITYIDTYPE, ASN_INTEGER, RWRITE,
+    {MTETRIGGERDELTADISCONTINUITYIDTYPE, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerDeltaTable, 2, {1, 3}},
 
 };
diff --git a/agent/mibgroup/disman/mteTriggerExistenceTable.c b/agent/mibgroup/disman/mteTriggerExistenceTable.c
index 1ad0a74..c5761b5 100644
--- a/agent/mibgroup/disman/mteTriggerExistenceTable.c
+++ b/agent/mibgroup/disman/mteTriggerExistenceTable.c
@@ -53,22 +53,22 @@
      * magic number        , variable type , ro/rw , callback fn  , L, oidsuffix 
      */
 #define   MTETRIGGEREXISTENCETEST  3
-    {MTETRIGGEREXISTENCETEST, ASN_BIT_STR, RWRITE,
+    {MTETRIGGEREXISTENCETEST, ASN_BIT_STR, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerExistenceTable, 2, {1, 1}},
 #define   MTETRIGGEREXISTENCESTARTUP  4
-    {MTETRIGGEREXISTENCESTARTUP, ASN_BIT_STR, RWRITE,
+    {MTETRIGGEREXISTENCESTARTUP, ASN_BIT_STR, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerExistenceTable, 2, {1, 2}},
 #define   MTETRIGGEREXISTENCEOBJECTSOWNER  5
-    {MTETRIGGEREXISTENCEOBJECTSOWNER, ASN_OCTET_STR, RWRITE,
+    {MTETRIGGEREXISTENCEOBJECTSOWNER, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerExistenceTable, 2, {1, 3}},
 #define   MTETRIGGEREXISTENCEOBJECTS  6
-    {MTETRIGGEREXISTENCEOBJECTS, ASN_OCTET_STR, RWRITE,
+    {MTETRIGGEREXISTENCEOBJECTS, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerExistenceTable, 2, {1, 4}},
 #define   MTETRIGGEREXISTENCEEVENTOWNER  7
-    {MTETRIGGEREXISTENCEEVENTOWNER, ASN_OCTET_STR, RWRITE,
+    {MTETRIGGEREXISTENCEEVENTOWNER, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerExistenceTable, 2, {1, 5}},
 #define   MTETRIGGEREXISTENCEEVENT  8
-    {MTETRIGGEREXISTENCEEVENT, ASN_OCTET_STR, RWRITE,
+    {MTETRIGGEREXISTENCEEVENT, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerExistenceTable, 2, {1, 6}},
 
 };
diff --git a/agent/mibgroup/disman/mteTriggerTable.c b/agent/mibgroup/disman/mteTriggerTable.c
index 4a4408c..f4db62a 100644
--- a/agent/mibgroup/disman/mteTriggerTable.c
+++ b/agent/mibgroup/disman/mteTriggerTable.c
@@ -83,43 +83,44 @@
      * magic number        , variable type , ro/rw , callback fn  , L, oidsuffix 
      */
 #define   MTETRIGGERCOMMENT     5
-    {MTETRIGGERCOMMENT, ASN_OCTET_STR, RWRITE, var_mteTriggerTable, 2,
-     {1, 3}},
+    {MTETRIGGERCOMMENT, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_mteTriggerTable, 2, {1, 3}},
 #define   MTETRIGGERTEST        6
-    {MTETRIGGERTEST, ASN_OCTET_STR, RWRITE, var_mteTriggerTable, 2, {1, 4}},
+    {MTETRIGGERTEST, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_mteTriggerTable, 2, {1, 4}},
 #define   MTETRIGGERSAMPLETYPE  7
-    {MTETRIGGERSAMPLETYPE, ASN_INTEGER, RWRITE, var_mteTriggerTable, 2,
-     {1, 5}},
+    {MTETRIGGERSAMPLETYPE, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_mteTriggerTable, 2, {1, 5}},
 #define   MTETRIGGERVALUEID     8
-    {MTETRIGGERVALUEID, ASN_OBJECT_ID, RWRITE, var_mteTriggerTable, 2,
-     {1, 6}},
+    {MTETRIGGERVALUEID, ASN_OBJECT_ID, NETSNMP_OLDAPI_RWRITE,
+     var_mteTriggerTable, 2, {1, 6}},
 #define   MTETRIGGERVALUEIDWILDCARD  9
-    {MTETRIGGERVALUEIDWILDCARD, ASN_INTEGER, RWRITE, var_mteTriggerTable,
-     2, {1, 7}},
+    {MTETRIGGERVALUEIDWILDCARD, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_mteTriggerTable, 2, {1, 7}},
 #define   MTETRIGGERTARGETTAG   10
-    {MTETRIGGERTARGETTAG, ASN_OCTET_STR, RWRITE, var_mteTriggerTable, 2,
-     {1, 8}},
+    {MTETRIGGERTARGETTAG, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_mteTriggerTable, 2, {1, 8}},
 #define   MTETRIGGERCONTEXTNAME  11
-    {MTETRIGGERCONTEXTNAME, ASN_OCTET_STR, RWRITE, var_mteTriggerTable, 2,
-     {1, 9}},
+    {MTETRIGGERCONTEXTNAME, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_mteTriggerTable, 2, {1, 9}},
 #define   MTETRIGGERCONTEXTNAMEWILDCARD  12
-    {MTETRIGGERCONTEXTNAMEWILDCARD, ASN_INTEGER, RWRITE,
+    {MTETRIGGERCONTEXTNAMEWILDCARD, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerTable, 2, {1, 10}},
 #define   MTETRIGGERFREQUENCY   13
-    {MTETRIGGERFREQUENCY, ASN_UNSIGNED, RWRITE, var_mteTriggerTable, 2,
-     {1, 11}},
+    {MTETRIGGERFREQUENCY, ASN_UNSIGNED, NETSNMP_OLDAPI_RWRITE,
+     var_mteTriggerTable, 2, {1, 11}},
 #define   MTETRIGGEROBJECTSOWNER  14
-    {MTETRIGGEROBJECTSOWNER, ASN_OCTET_STR, RWRITE, var_mteTriggerTable, 2,
-     {1, 12}},
+    {MTETRIGGEROBJECTSOWNER, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_mteTriggerTable, 2, {1, 12}},
 #define   MTETRIGGEROBJECTS     15
-    {MTETRIGGEROBJECTS, ASN_OCTET_STR, RWRITE, var_mteTriggerTable, 2,
-     {1, 13}},
+    {MTETRIGGEROBJECTS, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_mteTriggerTable, 2, {1, 13}},
 #define   MTETRIGGERENABLED     16
-    {MTETRIGGERENABLED, ASN_INTEGER, RWRITE, var_mteTriggerTable, 2,
-     {1, 14}},
+    {MTETRIGGERENABLED, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_mteTriggerTable, 2, {1, 14}},
 #define   MTETRIGGERENTRYSTATUS  17
-    {MTETRIGGERENTRYSTATUS, ASN_INTEGER, RWRITE, var_mteTriggerTable, 2,
-     {1, 15}},
+    {MTETRIGGERENTRYSTATUS, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_mteTriggerTable, 2, {1, 15}},
 
 };
 /*
@@ -356,8 +357,7 @@
 void
 parse_simple_monitor(const char *token, char *line)
 {
-    char            buf[SPRINT_MAX_LEN], *cp, ebuf[SPRINT_MAX_LEN],
-                    eventname[64];
+    char            buf[SPRINT_MAX_LEN], *cp, eventname[64];
     oid             obuf[MAX_OID_LEN];
     size_t          obufLen;
     struct mteTriggerTable_data *StorageNew;
@@ -444,8 +444,7 @@
             cp = copy_nword(cp, buf, sizeof(buf));
             obufLen = MAX_OID_LEN;
             if (!snmp_parse_oid(buf, obuf, &obufLen)) {
-                sprintf(ebuf, "unable to parse oid: %s", buf);
-                config_perror(ebuf);
+		netsnmp_config_error("unable to parse oid: %s", buf);
                 /*
                  * XXX: free StorageNew 
                  */
@@ -506,8 +505,7 @@
     cp = copy_nword(cp, buf, sizeof(buf));
     obufLen = MAX_OID_LEN;
     if (!snmp_parse_oid(buf, obuf, &obufLen)) {
-        sprintf(ebuf, "unable to parse oid: %s", buf);
-        config_perror(ebuf);
+	netsnmp_config_error("unable to parse oid: %s", buf);
         /*
          * XXX: free StorageNew 
          */
diff --git a/agent/mibgroup/disman/mteTriggerThresholdTable.c b/agent/mibgroup/disman/mteTriggerThresholdTable.c
index 038a2fb..28b33d8 100644
--- a/agent/mibgroup/disman/mteTriggerThresholdTable.c
+++ b/agent/mibgroup/disman/mteTriggerThresholdTable.c
@@ -53,49 +53,49 @@
      * magic number        , variable type , ro/rw , callback fn  , L, oidsuffix 
      */
 #define   MTETRIGGERTHRESHOLDSTARTUP  3
-    {MTETRIGGERTHRESHOLDSTARTUP, ASN_INTEGER, RWRITE,
+    {MTETRIGGERTHRESHOLDSTARTUP, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerThresholdTable, 2, {1, 1}},
 #define   MTETRIGGERTHRESHOLDRISING  4
-    {MTETRIGGERTHRESHOLDRISING, ASN_INTEGER, RWRITE,
+    {MTETRIGGERTHRESHOLDRISING, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerThresholdTable, 2, {1, 2}},
 #define   MTETRIGGERTHRESHOLDFALLING  5
-    {MTETRIGGERTHRESHOLDFALLING, ASN_INTEGER, RWRITE,
+    {MTETRIGGERTHRESHOLDFALLING, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerThresholdTable, 2, {1, 3}},
 #define   MTETRIGGERTHRESHOLDDELTARISING  6
-    {MTETRIGGERTHRESHOLDDELTARISING, ASN_INTEGER, RWRITE,
+    {MTETRIGGERTHRESHOLDDELTARISING, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerThresholdTable, 2, {1, 4}},
 #define   MTETRIGGERTHRESHOLDDELTAFALLING  7
-    {MTETRIGGERTHRESHOLDDELTAFALLING, ASN_INTEGER, RWRITE,
+    {MTETRIGGERTHRESHOLDDELTAFALLING, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerThresholdTable, 2, {1, 5}},
 #define   MTETRIGGERTHRESHOLDOBJECTSOWNER  8
-    {MTETRIGGERTHRESHOLDOBJECTSOWNER, ASN_OCTET_STR, RWRITE,
+    {MTETRIGGERTHRESHOLDOBJECTSOWNER, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerThresholdTable, 2, {1, 6}},
 #define   MTETRIGGERTHRESHOLDOBJECTS  9
-    {MTETRIGGERTHRESHOLDOBJECTS, ASN_OCTET_STR, RWRITE,
+    {MTETRIGGERTHRESHOLDOBJECTS, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerThresholdTable, 2, {1, 7}},
 #define   MTETRIGGERTHRESHOLDRISINGEVENTOWNER  10
-    {MTETRIGGERTHRESHOLDRISINGEVENTOWNER, ASN_OCTET_STR, RWRITE,
+    {MTETRIGGERTHRESHOLDRISINGEVENTOWNER, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerThresholdTable, 2, {1, 8}},
 #define   MTETRIGGERTHRESHOLDRISINGEVENT  11
-    {MTETRIGGERTHRESHOLDRISINGEVENT, ASN_OCTET_STR, RWRITE,
+    {MTETRIGGERTHRESHOLDRISINGEVENT, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerThresholdTable, 2, {1, 9}},
 #define   MTETRIGGERTHRESHOLDFALLINGEVENTOWNER  12
-    {MTETRIGGERTHRESHOLDFALLINGEVENTOWNER, ASN_OCTET_STR, RWRITE,
+    {MTETRIGGERTHRESHOLDFALLINGEVENTOWNER, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerThresholdTable, 2, {1, 10}},
 #define   MTETRIGGERTHRESHOLDFALLINGEVENT  13
-    {MTETRIGGERTHRESHOLDFALLINGEVENT, ASN_OCTET_STR, RWRITE,
+    {MTETRIGGERTHRESHOLDFALLINGEVENT, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerThresholdTable, 2, {1, 11}},
 #define   MTETRIGGERTHRESHOLDDELTARISINGEVENTOWNER  14
-    {MTETRIGGERTHRESHOLDDELTARISINGEVENTOWNER, ASN_OCTET_STR, RWRITE,
+    {MTETRIGGERTHRESHOLDDELTARISINGEVENTOWNER, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerThresholdTable, 2, {1, 12}},
 #define   MTETRIGGERTHRESHOLDDELTARISINGEVENT  15
-    {MTETRIGGERTHRESHOLDDELTARISINGEVENT, ASN_OCTET_STR, RWRITE,
+    {MTETRIGGERTHRESHOLDDELTARISINGEVENT, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerThresholdTable, 2, {1, 13}},
 #define   MTETRIGGERTHRESHOLDDELTAFALLINGEVENTOWNER  16
-    {MTETRIGGERTHRESHOLDDELTAFALLINGEVENTOWNER, ASN_OCTET_STR, RWRITE,
+    {MTETRIGGERTHRESHOLDDELTAFALLINGEVENTOWNER, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerThresholdTable, 2, {1, 14}},
 #define   MTETRIGGERTHRESHOLDDELTAFALLINGEVENT  17
-    {MTETRIGGERTHRESHOLDDELTAFALLINGEVENT, ASN_OCTET_STR, RWRITE,
+    {MTETRIGGERTHRESHOLDDELTAFALLINGEVENT, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
      var_mteTriggerThresholdTable, 2, {1, 15}},
 
 };
diff --git a/agent/mibgroup/disman/nslookup/lookupCtlTable.c b/agent/mibgroup/disman/nslookup/lookupCtlTable.c
index bcedd07..0eb5c16 100644
--- a/agent/mibgroup/disman/nslookup/lookupCtlTable.c
+++ b/agent/mibgroup/disman/nslookup/lookupCtlTable.c
@@ -55,12 +55,18 @@
     /*
      * magic number        , variable type , ro/rw , callback fn  , L, oidsuffix 
      */
-    {COLUMN_LOOKUPCTLTARGETADDRESSTYPE, ASN_INTEGER, RWRITE, var_lookupCtlTable, 2, {1, 3}},
-    {COLUMN_LOOKUPCTLTARGETADDRESS,   ASN_OCTET_STR, RWRITE, var_lookupCtlTable, 2, {1, 4}},
-    {COLUMN_LOOKUPCTLOPERSTATUS, ASN_INTEGER, RONLY, var_lookupCtlTable, 2, {1, 5}},
-    {COLUMN_LOOKUPCTLTIME,      ASN_UNSIGNED, RONLY, var_lookupCtlTable, 2, {1, 6}},
-    {COLUMN_LOOKUPCTLRC,         ASN_INTEGER, RONLY, var_lookupCtlTable, 2, {1, 7}},
-    {COLUMN_LOOKUPCTLROWSTATUS, ASN_INTEGER, RWRITE, var_lookupCtlTable, 2, {1, 8}}
+    {COLUMN_LOOKUPCTLTARGETADDRESSTYPE, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_lookupCtlTable, 2, {1, 3}},
+    {COLUMN_LOOKUPCTLTARGETADDRESS,   ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_lookupCtlTable, 2, {1, 4}},
+    {COLUMN_LOOKUPCTLOPERSTATUS, ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_lookupCtlTable, 2, {1, 5}},
+    {COLUMN_LOOKUPCTLTIME,      ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_lookupCtlTable, 2, {1, 6}},
+    {COLUMN_LOOKUPCTLRC,         ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_lookupCtlTable, 2, {1, 7}},
+    {COLUMN_LOOKUPCTLROWSTATUS, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_lookupCtlTable, 2, {1, 8}}
 };
 
 
@@ -616,7 +622,7 @@
                         address));
         } else {
             while (*lookup->h_addr_list) {
-                bcopy(*lookup->h_addr_list++, (char *) &a, sizeof(a));
+                memcpy(&a, *lookup->h_addr_list++, sizeof(a));
 
                 temp = SNMP_MALLOC_STRUCT(lookupResultsTable_data);
                 if (temp == NULL) {
@@ -1005,7 +1011,7 @@
 
     snmp_varlist_add_variable(&vars, NULL, 0, ASN_OCTET_STR, (char *) thedata->lookupCtlOwnerIndex, thedata->lookupCtlOwnerIndexLen);   /* lookupCtlOwnerIndex */
     snmp_varlist_add_variable(&vars, NULL, 0, ASN_OCTET_STR, (char *) thedata->lookupCtlOperationName, thedata->lookupCtlOperationNameLen);     /* lookupCtlOperationName */
-    bzero(newoid, MAX_OID_LEN * sizeof(oid));
+    memset(newoid, '\0', MAX_OID_LEN * sizeof(oid));
     header_complex_generate_oid(newoid, &newoid_len, NULL, 0, vars);
 
 
diff --git a/agent/mibgroup/disman/nslookup/lookupResultsTable.c b/agent/mibgroup/disman/nslookup/lookupResultsTable.c
index c5fd2b7..bfb56c9 100644
--- a/agent/mibgroup/disman/nslookup/lookupResultsTable.c
+++ b/agent/mibgroup/disman/nslookup/lookupResultsTable.c
@@ -42,8 +42,10 @@
     { 1, 3, 6, 1, 2, 1, 82, 1, 4 };
 
 struct variable2 lookupResultsTable_variables[] = {
-    {COLUMN_LOOKUPRESULTSADDRESSTYPE, ASN_INTEGER, RONLY, var_lookupResultsTable, 2, {1, 2}},
-    {COLUMN_LOOKUPRESULTSADDRESS,   ASN_OCTET_STR, RONLY, var_lookupResultsTable, 2, {1, 3}}
+    {COLUMN_LOOKUPRESULTSADDRESSTYPE, ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_lookupResultsTable, 2, {1, 2}},
+    {COLUMN_LOOKUPRESULTSADDRESS,   ASN_OCTET_STR, NETSNMP_OLDAPI_RONLY,
+     var_lookupResultsTable, 2, {1, 3}}
 };
 
 /*
diff --git a/agent/mibgroup/disman/ping/pingCtlTable.c b/agent/mibgroup/disman/ping/pingCtlTable.c
index 1e102a0..3f4f128 100644
--- a/agent/mibgroup/disman/ping/pingCtlTable.c
+++ b/agent/mibgroup/disman/ping/pingCtlTable.c
@@ -75,27 +75,48 @@
     /*
      * magic number        , variable type , ro/rw , callback fn  , L, oidsuffix 
      */
-    {COLUMN_PINGCTLTARGETADDRESSTYPE, ASN_INTEGER, RWRITE, var_pingCtlTable, 2, {1, 3}},
-    {COLUMN_PINGCTLTARGETADDRESS,   ASN_OCTET_STR, RWRITE, var_pingCtlTable, 2, {1, 4}},
-    {COLUMN_PINGCTLDATASIZE,         ASN_UNSIGNED, RONLY, var_pingCtlTable, 2, {1, 5}},
-    {COLUMN_PINGCTLTIMEOUT,          ASN_UNSIGNED, RONLY, var_pingCtlTable, 2, {1, 6}},
-    {COLUMN_PINGCTLPROBECOUNT,       ASN_UNSIGNED, RONLY, var_pingCtlTable, 2, {1, 7}},
-    {COLUMN_PINGCTLADMINSTATUS,       ASN_INTEGER, RWRITE, var_pingCtlTable, 2, {1, 8}},
-    {COLUMN_PINGCTLDATAFILL,        ASN_OCTET_STR, RWRITE, var_pingCtlTable, 2, {1, 9}},
-    {COLUMN_PINGCTLFREQUENCY,        ASN_UNSIGNED, RWRITE, var_pingCtlTable, 2, {1, 10}},
-    {COLUMN_PINGCTLMAXROWS,          ASN_UNSIGNED, RWRITE, var_pingCtlTable, 2, {1, 11}},
-    {COLUMN_PINGCTLSTORAGETYPE,       ASN_INTEGER, RWRITE, var_pingCtlTable, 2, {1, 12}},
-    {COLUMN_PINGCTLTRAPGENERATION,  ASN_OCTET_STR, RWRITE, var_pingCtlTable, 2, {1, 13}},
-    {COLUMN_PINGCTLTRAPPROBEFAILUREFILTER, ASN_UNSIGNED, RWRITE, var_pingCtlTable, 2, {1, 14}},
-    {COLUMN_PINGCTLTRAPTESTFAILUREFILTER,  ASN_UNSIGNED, RWRITE, var_pingCtlTable, 2, {1, 15}},
-    {COLUMN_PINGCTLTYPE,            ASN_OBJECT_ID, RWRITE, var_pingCtlTable, 2, {1, 16}},
-    {COLUMN_PINGCTLDESCR,           ASN_OCTET_STR, RWRITE, var_pingCtlTable, 2, {1, 17}},
-    {COLUMN_PINGCTLSOURCEADDRESSTYPE, ASN_INTEGER, RWRITE, var_pingCtlTable, 2, {1, 18}},
-    {COLUMN_PINGCTLSOURCEADDRESS,   ASN_OCTET_STR, RWRITE, var_pingCtlTable, 2, {1, 19}},
-    {COLUMN_PINGCTLIFINDEX,           ASN_INTEGER, RWRITE, var_pingCtlTable, 2, {1, 20}},
-    {COLUMN_PINGCTLBYPASSROUTETABLE,  ASN_INTEGER, RWRITE, var_pingCtlTable, 2, {1, 21}},
-    {COLUMN_PINGCTLDSFIELD,          ASN_UNSIGNED, RWRITE, var_pingCtlTable, 2, {1, 22}},
-    {COLUMN_PINGCTLROWSTATUS,         ASN_INTEGER, RWRITE, var_pingCtlTable, 2, {1, 23}}
+    {COLUMN_PINGCTLTARGETADDRESSTYPE, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_pingCtlTable, 2, {1, 3}},
+    {COLUMN_PINGCTLTARGETADDRESS,   ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_pingCtlTable, 2, {1, 4}},
+    {COLUMN_PINGCTLDATASIZE,         ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_pingCtlTable, 2, {1, 5}},
+    {COLUMN_PINGCTLTIMEOUT,          ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_pingCtlTable, 2, {1, 6}},
+    {COLUMN_PINGCTLPROBECOUNT,       ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_pingCtlTable, 2, {1, 7}},
+    {COLUMN_PINGCTLADMINSTATUS,       ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_pingCtlTable, 2, {1, 8}},
+    {COLUMN_PINGCTLDATAFILL,        ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_pingCtlTable, 2, {1, 9}},
+    {COLUMN_PINGCTLFREQUENCY,        ASN_UNSIGNED, NETSNMP_OLDAPI_RWRITE,
+     var_pingCtlTable, 2, {1, 10}},
+    {COLUMN_PINGCTLMAXROWS,          ASN_UNSIGNED, NETSNMP_OLDAPI_RWRITE,
+     var_pingCtlTable, 2, {1, 11}},
+    {COLUMN_PINGCTLSTORAGETYPE,       ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_pingCtlTable, 2, {1, 12}},
+    {COLUMN_PINGCTLTRAPGENERATION,  ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_pingCtlTable, 2, {1, 13}},
+    {COLUMN_PINGCTLTRAPPROBEFAILUREFILTER, ASN_UNSIGNED, NETSNMP_OLDAPI_RWRITE,
+     var_pingCtlTable, 2, {1, 14}},
+    {COLUMN_PINGCTLTRAPTESTFAILUREFILTER,  ASN_UNSIGNED, NETSNMP_OLDAPI_RWRITE,
+     var_pingCtlTable, 2, {1, 15}},
+    {COLUMN_PINGCTLTYPE,            ASN_OBJECT_ID, NETSNMP_OLDAPI_RWRITE,
+     var_pingCtlTable, 2, {1, 16}},
+    {COLUMN_PINGCTLDESCR,           ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_pingCtlTable, 2, {1, 17}},
+    {COLUMN_PINGCTLSOURCEADDRESSTYPE, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_pingCtlTable, 2, {1, 18}},
+    {COLUMN_PINGCTLSOURCEADDRESS,   ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_pingCtlTable, 2, {1, 19}},
+    {COLUMN_PINGCTLIFINDEX,           ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_pingCtlTable, 2, {1, 20}},
+    {COLUMN_PINGCTLBYPASSROUTETABLE,  ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_pingCtlTable, 2, {1, 21}},
+    {COLUMN_PINGCTLDSFIELD,          ASN_UNSIGNED, NETSNMP_OLDAPI_RWRITE,
+     var_pingCtlTable, 2, {1, 22}},
+    {COLUMN_PINGCTLROWSTATUS,         ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_pingCtlTable, 2, {1, 23}}
 };
 
 
diff --git a/agent/mibgroup/disman/ping/pingProbeHistoryTable.c b/agent/mibgroup/disman/ping/pingProbeHistoryTable.c
index 31fa0b8..78c75be 100644
--- a/agent/mibgroup/disman/ping/pingProbeHistoryTable.c
+++ b/agent/mibgroup/disman/ping/pingProbeHistoryTable.c
@@ -50,10 +50,14 @@
     { 1, 3, 6, 1, 2, 1, 80, 1, 4 };
 
 struct variable2 pingProbeHistoryTable_variables[] = {
-    {COLUMN_PINGPROBEHISTORYRESPONSE, ASN_UNSIGNED, RONLY, var_pingProbeHistoryTable, 2, {1, 2}},
-    {COLUMN_PINGPROBEHISTORYSTATUS,    ASN_INTEGER, RONLY, var_pingProbeHistoryTable, 2, {1, 3}},
-    {COLUMN_PINGPROBEHISTORYLASTRC,    ASN_INTEGER, RONLY, var_pingProbeHistoryTable, 2, {1, 4}},
-    {COLUMN_PINGPROBEHISTORYTIME,    ASN_OCTET_STR, RONLY, var_pingProbeHistoryTable, 2, {1, 5}}
+    {COLUMN_PINGPROBEHISTORYRESPONSE, ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_pingProbeHistoryTable, 2, {1, 2}},
+    {COLUMN_PINGPROBEHISTORYSTATUS,    ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_pingProbeHistoryTable, 2, {1, 3}},
+    {COLUMN_PINGPROBEHISTORYLASTRC,    ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_pingProbeHistoryTable, 2, {1, 4}},
+    {COLUMN_PINGPROBEHISTORYTIME,    ASN_OCTET_STR, NETSNMP_OLDAPI_RONLY,
+     var_pingProbeHistoryTable, 2, {1, 5}}
 };
 
 
diff --git a/agent/mibgroup/disman/ping/pingResultsTable.c b/agent/mibgroup/disman/ping/pingResultsTable.c
index 1f71fd5..1445d86 100644
--- a/agent/mibgroup/disman/ping/pingResultsTable.c
+++ b/agent/mibgroup/disman/ping/pingResultsTable.c
@@ -49,16 +49,26 @@
     { 1, 3, 6, 1, 2, 1, 80, 1, 3 };
 
 struct variable2 pingResultsTable_variables[] = {
-    {COLUMN_PINGRESULTSOPERSTATUS,       ASN_INTEGER, RONLY, var_pingResultsTable, 2, {1, 1}},
-    {COLUMN_PINGRESULTSIPTARGETADDRESSTYPE, ASN_INTEGER, RONLY, var_pingResultsTable, 2, {1, 2}},
-    {COLUMN_PINGRESULTSIPTARGETADDRESS, ASN_OCTET_STR, RONLY, var_pingResultsTable, 2, {1, 3}},
-    {COLUMN_PINGRESULTSMINRTT,          ASN_UNSIGNED, RONLY, var_pingResultsTable, 2, {1, 4}},
-    {COLUMN_PINGRESULTSMAXRTT,          ASN_UNSIGNED, RONLY, var_pingResultsTable, 2, {1, 5}},
-    {COLUMN_PINGRESULTSAVERAGERTT,      ASN_UNSIGNED, RONLY, var_pingResultsTable, 2, {1, 6}},
-    {COLUMN_PINGRESULTSPROBERESPONSES,  ASN_UNSIGNED, RONLY, var_pingResultsTable, 2, {1, 7}},
-    {COLUMN_PINGRESULTSSENTPROBES,      ASN_UNSIGNED, RONLY, var_pingResultsTable, 2, {1, 8}},
-    {COLUMN_PINGRESULTSRTTSUMOFSQUARES, ASN_UNSIGNED, RONLY, var_pingResultsTable, 2, {1, 9}},
-    {COLUMN_PINGRESULTSLASTGOODPROBE,  ASN_OCTET_STR, RONLY, var_pingResultsTable, 2, {1, 10}}
+    {COLUMN_PINGRESULTSOPERSTATUS,       ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_pingResultsTable, 2, {1, 1}},
+    {COLUMN_PINGRESULTSIPTARGETADDRESSTYPE, ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_pingResultsTable, 2, {1, 2}},
+    {COLUMN_PINGRESULTSIPTARGETADDRESS, ASN_OCTET_STR, NETSNMP_OLDAPI_RONLY,
+     var_pingResultsTable, 2, {1, 3}},
+    {COLUMN_PINGRESULTSMINRTT,          ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_pingResultsTable, 2, {1, 4}},
+    {COLUMN_PINGRESULTSMAXRTT,          ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_pingResultsTable, 2, {1, 5}},
+    {COLUMN_PINGRESULTSAVERAGERTT,      ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_pingResultsTable, 2, {1, 6}},
+    {COLUMN_PINGRESULTSPROBERESPONSES,  ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_pingResultsTable, 2, {1, 7}},
+    {COLUMN_PINGRESULTSSENTPROBES,      ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_pingResultsTable, 2, {1, 8}},
+    {COLUMN_PINGRESULTSRTTSUMOFSQUARES, ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_pingResultsTable, 2, {1, 9}},
+    {COLUMN_PINGRESULTSLASTGOODPROBE,  ASN_OCTET_STR, NETSNMP_OLDAPI_RONLY,
+     var_pingResultsTable, 2, {1, 10}}
 };
 
 
diff --git a/agent/mibgroup/disman/schedule/schedCore.c b/agent/mibgroup/disman/schedule/schedCore.c
index 4055d46..28400f5 100644
--- a/agent/mibgroup/disman/schedule/schedCore.c
+++ b/agent/mibgroup/disman/schedule/schedCore.c
@@ -22,7 +22,7 @@
     if (!schedule_table) {
         schedule_table = netsnmp_tdata_create_table("schedTable", 0);
         DEBUGMSGTL(("disman:schedule:init",
-                        "create schedule container(%x)\n", schedule_table));
+                        "create schedule container(%p)\n", schedule_table));
     }
 }
 
@@ -53,13 +53,13 @@
         DEBUGMSGTL(("disman:schedule:callback", "missing entry\n"));
         return;
     }
-    entry->schedLastRun = time(0);
+    entry->schedLastRun = time(NULL);
     entry->schedTriggers++;
 
     DEBUGMSGTL(( "disman:schedule:callback", "assignment "));
     DEBUGMSGOID(("disman:schedule:callback", entry->schedVariable,
                                              entry->schedVariable_len));
-    DEBUGMSG((   "disman:schedule:callback", " = %d\n", entry->schedValue));
+    DEBUGMSG((   "disman:schedule:callback", " = %ld\n", entry->schedValue));
 
     memset(&assign, 0, sizeof(netsnmp_variable_list));
     snmp_set_var_objid(&assign, entry->schedVariable, entry->schedVariable_len);
@@ -239,20 +239,6 @@
 }
 
 
-#ifndef HAVE_LOCALTIME_R
-struct tm *
-localtime_r(const time_t *timep, struct tm *result) {
-    struct tm *tmp;
-
-    tmp = localtime( timep );
-    if ( tmp && result ) {
-        memcpy( result, tmp, sizeof(struct tm));
-    }
-
-    return (tmp ? result : NULL );
-}
-#endif
-
 /*
  * determine the time for the next scheduled action of a given entry
  */
@@ -291,14 +277,14 @@
         } else {
              entry->schedNextRun = now + entry->schedInterval;
         }
-        DEBUGMSGTL(("disman:schedule:time", "periodic: (%d) %s",
+        DEBUGMSGTL(("disman:schedule:time", "periodic: (%ld) %s",
                                   entry->schedNextRun,
                            ctime(&entry->schedNextRun)));
         break;
 
     case SCHED_TYPE_ONESHOT:
         if ( entry->schedLastRun ) {
-            DEBUGMSGTL(("disman:schedule:time", "one-shot: expired (%d) %s",
+            DEBUGMSGTL(("disman:schedule:time", "one-shot: expired (%ld) %s",
                                   entry->schedNextRun,
                            ctime(&entry->schedNextRun)));
             return;
@@ -414,13 +400,13 @@
          * 'next_tm' now contains the time for the next scheduled run
          */
         entry->schedNextRun = mktime( &next_tm );
-        DEBUGMSGTL(("disman:schedule:time", "calendar: (%d) %s",
+        DEBUGMSGTL(("disman:schedule:time", "calendar: (%ld) %s",
                                   entry->schedNextRun,
                            ctime(&entry->schedNextRun)));
         return;
 
     default:
-        DEBUGMSGTL(("disman:schedule:time", "unknown type (%d)\n",
+        DEBUGMSGTL(("disman:schedule:time", "unknown type (%ld)\n",
                                              entry->schedType));
         return;
     }
diff --git a/agent/mibgroup/disman/traceroute/traceRouteCtlTable.c b/agent/mibgroup/disman/traceroute/traceRouteCtlTable.c
index 42f24dc..5c70e0d 100644
--- a/agent/mibgroup/disman/traceroute/traceRouteCtlTable.c
+++ b/agent/mibgroup/disman/traceroute/traceRouteCtlTable.c
@@ -41,31 +41,56 @@
      * magic number        , variable type , ro/rw , callback fn  , L, oidsuffix 
      */
 
-    {COLUMN_TRACEROUTECTLTARGETADDRESSTYPE, ASN_INTEGER, RWRITE, var_traceRouteCtlTable, 2, {1, 3}},
-    {COLUMN_TRACEROUTECTLTARGETADDRESS,   ASN_OCTET_STR, RWRITE, var_traceRouteCtlTable, 2, {1, 4}},
-    {COLUMN_TRACEROUTECTLBYPASSROUTETABLE,  ASN_INTEGER, RWRITE, var_traceRouteCtlTable, 2, {1, 5}},
-    {COLUMN_TRACEROUTECTLDATASIZE,     ASN_UNSIGNED, RWRITE, var_traceRouteCtlTable, 2, {1, 6}},
-    {COLUMN_TRACEROUTECTLTIMEOUT,      ASN_UNSIGNED, RWRITE, var_traceRouteCtlTable, 2, {1, 7}},
-    {COLUMN_TRACEROUTECTLPROBESPERHOP, ASN_UNSIGNED, RWRITE, var_traceRouteCtlTable, 2, {1, 8}},
-    {COLUMN_TRACEROUTECTLPORT,         ASN_UNSIGNED, RWRITE, var_traceRouteCtlTable, 2, {1, 9}},
-    {COLUMN_TRACEROUTECTLMAXTTL,       ASN_UNSIGNED, RWRITE, var_traceRouteCtlTable, 2, {1, 10}},
-    {COLUMN_TRACEROUTECTLDSFIELD,      ASN_UNSIGNED, RWRITE, var_traceRouteCtlTable, 2, {1, 11}},
-    {COLUMN_TRACEROUTECTLSOURCEADDRESSTYPE, ASN_INTEGER, RWRITE, var_traceRouteCtlTable, 2, {1, 12}},
-    {COLUMN_TRACEROUTECTLSOURCEADDRESS,   ASN_OCTET_STR, RWRITE, var_traceRouteCtlTable, 2, {1, 13}},
-    {COLUMN_TRACEROUTECTLIFINDEX,       ASN_INTEGER, RWRITE, var_traceRouteCtlTable, 2, {1, 14}},
-    {COLUMN_TRACEROUTECTLMISCOPTIONS, ASN_OCTET_STR, RWRITE, var_traceRouteCtlTable, 2, {1, 15}},
-    {COLUMN_TRACEROUTECTLMAXFAILURES,  ASN_UNSIGNED, RWRITE, var_traceRouteCtlTable, 2, {1, 16}},
-    {COLUMN_TRACEROUTECTLDONTFRAGMENT,  ASN_INTEGER, RWRITE, var_traceRouteCtlTable, 2, {1, 17}},
-    {COLUMN_TRACEROUTECTLINITIALTTL,   ASN_UNSIGNED, RWRITE, var_traceRouteCtlTable, 2, {1, 18}},
-    {COLUMN_TRACEROUTECTLFREQUENCY,    ASN_UNSIGNED, RWRITE, var_traceRouteCtlTable, 2, {1, 19}},
-    {COLUMN_TRACEROUTECTLSTORAGETYPE,   ASN_INTEGER, RWRITE, var_traceRouteCtlTable, 2, {1, 20}},
-    {COLUMN_TRACEROUTECTLADMINSTATUS,   ASN_INTEGER, RWRITE, var_traceRouteCtlTable, 2, {1, 21}},
-    {COLUMN_TRACEROUTECTLDESCR,       ASN_OCTET_STR, RWRITE, var_traceRouteCtlTable, 2, {1, 22}},
-    {COLUMN_TRACEROUTECTLMAXROWS,      ASN_UNSIGNED, RWRITE, var_traceRouteCtlTable, 2, {1, 23}},
-    {COLUMN_TRACEROUTECTLTRAPGENERATION,  ASN_OCTET_STR, RWRITE, var_traceRouteCtlTable, 2, {1, 24}},
-    {COLUMN_TRACEROUTECTLCREATEHOPSENTRIES, ASN_INTEGER, RWRITE, var_traceRouteCtlTable, 2, {1, 25}},
-    {COLUMN_TRACEROUTECTLTYPE,        ASN_OBJECT_ID, RWRITE, var_traceRouteCtlTable, 2, {1, 26}},
-    {COLUMN_TRACEROUTECTLROWSTATUS,     ASN_INTEGER, RWRITE, var_traceRouteCtlTable, 2, {1, 27}}
+    {COLUMN_TRACEROUTECTLTARGETADDRESSTYPE, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 3}},
+    {COLUMN_TRACEROUTECTLTARGETADDRESS,   ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 4}},
+    {COLUMN_TRACEROUTECTLBYPASSROUTETABLE,  ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 5}},
+    {COLUMN_TRACEROUTECTLDATASIZE,     ASN_UNSIGNED, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 6}},
+    {COLUMN_TRACEROUTECTLTIMEOUT,      ASN_UNSIGNED, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 7}},
+    {COLUMN_TRACEROUTECTLPROBESPERHOP, ASN_UNSIGNED, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 8}},
+    {COLUMN_TRACEROUTECTLPORT,         ASN_UNSIGNED, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 9}},
+    {COLUMN_TRACEROUTECTLMAXTTL,       ASN_UNSIGNED, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 10}},
+    {COLUMN_TRACEROUTECTLDSFIELD,      ASN_UNSIGNED, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 11}},
+    {COLUMN_TRACEROUTECTLSOURCEADDRESSTYPE, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 12}},
+    {COLUMN_TRACEROUTECTLSOURCEADDRESS,   ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 13}},
+    {COLUMN_TRACEROUTECTLIFINDEX,       ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 14}},
+    {COLUMN_TRACEROUTECTLMISCOPTIONS, ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 15}},
+    {COLUMN_TRACEROUTECTLMAXFAILURES,  ASN_UNSIGNED, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 16}},
+    {COLUMN_TRACEROUTECTLDONTFRAGMENT,  ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 17}},
+    {COLUMN_TRACEROUTECTLINITIALTTL,   ASN_UNSIGNED, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 18}},
+    {COLUMN_TRACEROUTECTLFREQUENCY,    ASN_UNSIGNED, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 19}},
+    {COLUMN_TRACEROUTECTLSTORAGETYPE,   ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 20}},
+    {COLUMN_TRACEROUTECTLADMINSTATUS,   ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 21}},
+    {COLUMN_TRACEROUTECTLDESCR,       ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 22}},
+    {COLUMN_TRACEROUTECTLMAXROWS,      ASN_UNSIGNED, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 23}},
+    {COLUMN_TRACEROUTECTLTRAPGENERATION,  ASN_OCTET_STR, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 24}},
+    {COLUMN_TRACEROUTECTLCREATEHOPSENTRIES, ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 25}},
+    {COLUMN_TRACEROUTECTLTYPE,        ASN_OBJECT_ID, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 26}},
+    {COLUMN_TRACEROUTECTLROWSTATUS,     ASN_INTEGER, NETSNMP_OLDAPI_RWRITE,
+     var_traceRouteCtlTable, 2, {1, 27}}
 
 };
 
@@ -126,7 +151,8 @@
         exit(1);
     }
 
-    bzero(host, sizeof(char) * (item->traceRouteCtlTargetAddressLen + 1));
+    memset(host, '\0',
+	   sizeof(char) * (item->traceRouteCtlTargetAddressLen + 1));
     strcpy(host, item->traceRouteCtlTargetAddress);
     host[item->traceRouteCtlTargetAddressLen] = '\0';
 
@@ -219,7 +245,7 @@
         struct hostent *hp = NULL;
         /* struct hostenv hp; */
         char            pa[64];
-        bzero(pa, 64);
+        memset(pa, '\0', 64);
 
         to->sin6_family = AF_INET6;
         to->sin6_port = htons(33434);
@@ -234,7 +260,7 @@
                             strerror(errno)));
                 exit(1);
             }
-            bzero(StorageTmp->traceRouteResultsIpTgtAddr,
+            memset(StorageTmp->traceRouteResultsIpTgtAddr, '\0',
                   sizeof(char) * (strlen(host) + 1));
             memcpy(StorageTmp->traceRouteResultsIpTgtAddr, host,
                    strlen(host) + 1);
@@ -255,7 +281,7 @@
                                 strerror(errno)));
                     exit(1);
                 }
-                bzero(StorageTmp->traceRouteResultsIpTgtAddr,
+                memset(StorageTmp->traceRouteResultsIpTgtAddr, '\0',
                       sizeof(char) * (strlen(host) + 1));
                 memcpy(StorageTmp->traceRouteResultsIpTgtAddr, hostname,
                        strlen(hostname) + 1);
@@ -692,7 +718,7 @@
     snmp_varlist_add_variable(&vars, NULL, 0, ASN_OCTET_STR, (char *) thedata->traceRouteCtlOwnerIndex, thedata->traceRouteCtlOwnerIndexLen);   /* traceRouteCtlOwnerIndex */
     snmp_varlist_add_variable(&vars, NULL, 0, ASN_OCTET_STR, (char *) thedata->traceRouteCtlTestName, thedata->traceRouteCtlTestNameLen);       /* traceRouteCtlOperationName */
 
-    bzero(newoid, sizeof(oid) * MAX_OID_LEN);
+    memset(newoid, '\0', sizeof(oid) * MAX_OID_LEN);
     header_complex_generate_oid(newoid, &newoid_len, NULL, 0, vars);
 
     for (hcilast = hciptr2 = traceRouteProbeHistoryTableStorage;
@@ -1326,7 +1352,7 @@
     snmp_varlist_add_variable(&vars, NULL, 0, ASN_OCTET_STR, (char *) thedata->traceRouteCtlOwnerIndex, thedata->traceRouteCtlOwnerIndexLen);   /* traceRouteCtlOwnerIndex */
     snmp_varlist_add_variable(&vars, NULL, 0, ASN_OCTET_STR, (char *) thedata->traceRouteCtlTestName, thedata->traceRouteCtlTestNameLen);       /* traceRouteCtlTestName */
 
-    bzero(newoid, sizeof(oid) * MAX_OID_LEN);
+    memset(newoid, '\0', sizeof(oid) * MAX_OID_LEN);
     header_complex_generate_oid(newoid, &newoid_len, NULL, 0, vars);
 
     for (hciptr2 = traceRouteResultsTableStorage; hciptr2 != NULL;
@@ -1357,7 +1383,7 @@
     snmp_varlist_add_variable(&vars, NULL, 0, ASN_OCTET_STR, (char *) thedata->traceRouteCtlOwnerIndex, thedata->traceRouteCtlOwnerIndexLen);   /* traceRouteCtlOwnerIndex */
     snmp_varlist_add_variable(&vars, NULL, 0, ASN_OCTET_STR, (char *) thedata->traceRouteCtlTestName, thedata->traceRouteCtlTestNameLen);       /* traceRouteCtlOperationName */
 
-    bzero(newoid, sizeof(oid) * MAX_OID_LEN);
+    memset(newoid, '\0', sizeof(oid) * MAX_OID_LEN);
 
     header_complex_generate_oid(newoid, &newoid_len, NULL, 0, vars);
 
@@ -1388,7 +1414,7 @@
     snmp_varlist_add_variable(&vars, NULL, 0, ASN_OCTET_STR, (char *) thedata->traceRouteCtlOwnerIndex, thedata->traceRouteCtlOwnerIndexLen);   /* traceRouteCtlOwnerIndex */
     snmp_varlist_add_variable(&vars, NULL, 0, ASN_OCTET_STR, (char *) thedata->traceRouteCtlTestName, thedata->traceRouteCtlTestNameLen);       /* traceRouteCtlTestName */
 
-    bzero(newoid, sizeof(oid) * MAX_OID_LEN);
+    memset(newoid, '\0', sizeof(oid) * MAX_OID_LEN);
 
     header_complex_generate_oid(newoid, &newoid_len, NULL, 0, vars);
 
@@ -1447,7 +1473,7 @@
     /*
      * traceRouteCtlTargetAddress 
      */
-    bzero(newoid, MAX_OID_LEN * sizeof(oid));
+    memset(newoid, '\0', MAX_OID_LEN * sizeof(oid));
     header_complex_generate_oid(newoid, &newoid_len,
                                 traceRouteCtlTargetAddress,
                                 sizeof(traceRouteCtlTargetAddress) /
@@ -1461,7 +1487,7 @@
 
     for (hciptr = traceRouteHopsTableStorage; hciptr != NULL;
          hciptr = hciptr->next) {
-        bzero(indexoid, MAX_OID_LEN * sizeof(oid));
+	memset(indexoid, '\0', MAX_OID_LEN * sizeof(oid));
         header_complex_generate_oid(indexoid, &indexoid_len, NULL, 0,
                                     vars);
         if (snmp_oid_compare
@@ -1470,13 +1496,13 @@
                 (struct traceRouteHopsTable_data *)
                 header_complex_get_from_oid(traceRouteHopsTableStorage,
                                             hciptr->name, hciptr->namelen);
-            bzero(tempoid, MAX_OID_LEN * sizeof(oid));
+            memset(tempoid, '\0', MAX_OID_LEN * sizeof(oid));
             header_complex_generate_oid(tempoid, &tempoid_len,
                                         traceRouteHopsIpTgAddress,
                                         sizeof(traceRouteHopsIpTgAddress) /
                                         sizeof(oid), vars);
             snmp_varlist_add_variable(&var_hops, NULL, 0, ASN_UNSIGNED, (char *) &StorageHops->traceRouteHopsHopIndex, sizeof(StorageHops->traceRouteHopsHopIndex));    /* traceRouteCtlTestName */
-            bzero(newoid, MAX_OID_LEN * sizeof(oid));
+            memset(newoid, '\0', MAX_OID_LEN * sizeof(oid));
             header_complex_generate_oid(newoid, &newoid_len, tempoid,
                                         tempoid_len, var_hops);
             snmp_varlist_add_variable(&var_list, newoid, newoid_len,
@@ -4093,11 +4119,7 @@
         freehostinfo(hi);
 
 
-#ifdef HAVE_SETLINEBUF
-        setlinebuf(stdout);
-#else
-        setvbuf(stdout, NULL, _IOLBF, 0);
-#endif
+        netsnmp_set_line_buffering(stdout);
 
         outip = (struct ip *) malloc(packlen);
         if (outip == NULL) {
@@ -4939,7 +4961,7 @@
 
         setlinebuf(stdout);
 
-        (void) bzero((char *) &whereto, sizeof(struct sockaddr_in6));
+        memset(&whereto, '\0', sizeof(struct sockaddr_in6));
 
         to->sin6_family = AF_INET6;
         to->sin6_port = htons(port);
@@ -5036,7 +5058,7 @@
             saddr.sin6_port = 0;
             close(probe_fd);
         } else {
-            (void) bzero((char *) &saddr, sizeof(struct sockaddr_in6));
+            memset(&saddr, '\0', sizeof(struct sockaddr_in6));
             saddr.sin6_family = AF_INET6;
             if (inet_pton(AF_INET6, source, &saddr.sin6_addr) < 0) {
                 Printf("traceroute: unknown addr %s\n", source);
diff --git a/agent/mibgroup/disman/traceroute/traceRouteCtlTable.h b/agent/mibgroup/disman/traceroute/traceRouteCtlTable.h
index 0be8dc4..0711978 100644
--- a/agent/mibgroup/disman/traceroute/traceRouteCtlTable.h
+++ b/agent/mibgroup/disman/traceroute/traceRouteCtlTable.h
@@ -525,7 +525,7 @@
 #define FD_SET(n, p)    ((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS)))
 #define FD_CLR(n, p)    ((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS)))
 #define FD_ISSET(n, p)  ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS)))
-#define FD_ZERO(p)      bzero((char *)(p), sizeof(*(p)))
+#define FD_ZERO(p)      memset((p), '\0', sizeof(*(p)))
 #endif
 
 #define Fprintf (void)fprintf
diff --git a/agent/mibgroup/disman/traceroute/traceRouteHopsTable.c b/agent/mibgroup/disman/traceroute/traceRouteHopsTable.c
index 296dd53..763757d 100644
--- a/agent/mibgroup/disman/traceroute/traceRouteHopsTable.c
+++ b/agent/mibgroup/disman/traceroute/traceRouteHopsTable.c
@@ -40,15 +40,24 @@
     { 1, 3, 6, 1, 2, 1, 81, 1, 5 };
 
 struct variable2 traceRouteHopsTable_variables[] = {
-    {COLUMN_TRACEROUTEHOPSIPTGTADDRESSTYPE, ASN_INTEGER, RONLY, var_traceRouteHopsTable, 2, {1, 2}},
-    {COLUMN_TRACEROUTEHOPSIPTGTADDRESS,   ASN_OCTET_STR, RONLY, var_traceRouteHopsTable, 2, {1, 3}},
-    {COLUMN_TRACEROUTEHOPSMINRTT,          ASN_UNSIGNED, RONLY, var_traceRouteHopsTable, 2, {1, 4}},
-    {COLUMN_TRACEROUTEHOPSMAXRTT,          ASN_UNSIGNED, RONLY, var_traceRouteHopsTable, 2, {1, 5}},
-    {COLUMN_TRACEROUTEHOPSAVERAGERTT,      ASN_UNSIGNED, RONLY, var_traceRouteHopsTable, 2, {1, 6}},
-    {COLUMN_TRACEROUTEHOPSRTTSUMOFSQUARES, ASN_UNSIGNED, RONLY, var_traceRouteHopsTable, 2, {1, 7}},
-    {COLUMN_TRACEROUTEHOPSSENTPROBES,      ASN_UNSIGNED, RONLY, var_traceRouteHopsTable, 2, {1, 8}},
-    {COLUMN_TRACEROUTEHOPSPROBERESPONSES,  ASN_UNSIGNED, RONLY, var_traceRouteHopsTable, 2, {1, 9}},
-    {COLUMN_TRACEROUTEHOPSLASTGOODPROBE,  ASN_OCTET_STR, RONLY, var_traceRouteHopsTable, 2, {1, 10}}
+    {COLUMN_TRACEROUTEHOPSIPTGTADDRESSTYPE, ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteHopsTable, 2, {1, 2}},
+    {COLUMN_TRACEROUTEHOPSIPTGTADDRESS,   ASN_OCTET_STR, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteHopsTable, 2, {1, 3}},
+    {COLUMN_TRACEROUTEHOPSMINRTT,          ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteHopsTable, 2, {1, 4}},
+    {COLUMN_TRACEROUTEHOPSMAXRTT,          ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteHopsTable, 2, {1, 5}},
+    {COLUMN_TRACEROUTEHOPSAVERAGERTT,      ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteHopsTable, 2, {1, 6}},
+    {COLUMN_TRACEROUTEHOPSRTTSUMOFSQUARES, ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteHopsTable, 2, {1, 7}},
+    {COLUMN_TRACEROUTEHOPSSENTPROBES,      ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteHopsTable, 2, {1, 8}},
+    {COLUMN_TRACEROUTEHOPSPROBERESPONSES,  ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteHopsTable, 2, {1, 9}},
+    {COLUMN_TRACEROUTEHOPSLASTGOODPROBE,  ASN_OCTET_STR, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteHopsTable, 2, {1, 10}}
 };
 
 
diff --git a/agent/mibgroup/disman/traceroute/traceRouteProbeHistoryTable.c b/agent/mibgroup/disman/traceroute/traceRouteProbeHistoryTable.c
index f3b7ce6..0b410c5 100644
--- a/agent/mibgroup/disman/traceroute/traceRouteProbeHistoryTable.c
+++ b/agent/mibgroup/disman/traceroute/traceRouteProbeHistoryTable.c
@@ -39,12 +39,18 @@
     { 1, 3, 6, 1, 2, 1, 81, 1, 4 };
 
 struct variable2 traceRouteProbeHistoryTable_variables[] = {
-    {COLUMN_TRACEROUTEPROBEHISTORYHADDRTYPE, ASN_INTEGER, RONLY, var_traceRouteProbeHistoryTable, 2, {1, 4}},
-    {COLUMN_TRACEROUTEPROBEHISTORYHADDR,   ASN_OCTET_STR, RONLY, var_traceRouteProbeHistoryTable, 2, {1, 5}},
-    {COLUMN_TRACEROUTEPROBEHISTORYRESPONSE, ASN_UNSIGNED, RONLY, var_traceRouteProbeHistoryTable, 2, {1, 6}},
-    {COLUMN_TRACEROUTEPROBEHISTORYSTATUS,    ASN_INTEGER, RONLY, var_traceRouteProbeHistoryTable, 2, {1, 7}},
-    {COLUMN_TRACEROUTEPROBEHISTORYLASTRC,    ASN_INTEGER, RONLY, var_traceRouteProbeHistoryTable, 2, {1, 8}},
-    {COLUMN_TRACEROUTEPROBEHISTORYTIME,    ASN_OCTET_STR, RONLY, var_traceRouteProbeHistoryTable, 2, {1, 9}}
+    {COLUMN_TRACEROUTEPROBEHISTORYHADDRTYPE, ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteProbeHistoryTable, 2, {1, 4}},
+    {COLUMN_TRACEROUTEPROBEHISTORYHADDR,   ASN_OCTET_STR, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteProbeHistoryTable, 2, {1, 5}},
+    {COLUMN_TRACEROUTEPROBEHISTORYRESPONSE, ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteProbeHistoryTable, 2, {1, 6}},
+    {COLUMN_TRACEROUTEPROBEHISTORYSTATUS,    ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteProbeHistoryTable, 2, {1, 7}},
+    {COLUMN_TRACEROUTEPROBEHISTORYLASTRC,    ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteProbeHistoryTable, 2, {1, 8}},
+    {COLUMN_TRACEROUTEPROBEHISTORYTIME,    ASN_OCTET_STR, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteProbeHistoryTable, 2, {1, 9}}
 };
 
 
diff --git a/agent/mibgroup/disman/traceroute/traceRouteResultsTable.c b/agent/mibgroup/disman/traceroute/traceRouteResultsTable.c
index d562adc..19e73b6 100644
--- a/agent/mibgroup/disman/traceroute/traceRouteResultsTable.c
+++ b/agent/mibgroup/disman/traceroute/traceRouteResultsTable.c
@@ -48,14 +48,22 @@
     { 1, 3, 6, 1, 2, 1, 81, 1, 3 };
 
 struct variable2 traceRouteResultsTable_variables[] = {
-    {COLUMN_TRACEROUTERESULTSOPERSTATUS,     ASN_INTEGER, RONLY, var_traceRouteResultsTable, 2, {1, 1}},
-    {COLUMN_TRACEROUTERESULTSCURHOPCOUNT,      ASN_GAUGE, RONLY, var_traceRouteResultsTable, 2, {1, 2}},
-    {COLUMN_TRACEROUTERESULTSCURPROBECOUNT,    ASN_GAUGE, RONLY, var_traceRouteResultsTable, 2, {1, 3}},
-    {COLUMN_TRACEROUTERESULTSIPTGTADDRTYPE,  ASN_INTEGER, RONLY, var_traceRouteResultsTable, 2, {1, 4}},
-    {COLUMN_TRACEROUTERESULTSIPTGTADDR,    ASN_OCTET_STR, RONLY, var_traceRouteResultsTable, 2, {1, 5}},
-    {COLUMN_TRACEROUTERESULTSTESTATTEMPTS,  ASN_UNSIGNED, RONLY, var_traceRouteResultsTable, 2, {1, 6}},
-    {COLUMN_TRACEROUTERESULTSTESTSUCCESSES, ASN_UNSIGNED, RONLY, var_traceRouteResultsTable, 2, {1, 7}},
-    {COLUMN_TRACEROUTERESULTSLASTGOODPATH, ASN_OCTET_STR, RONLY, var_traceRouteResultsTable, 2, {1, 8}}
+    {COLUMN_TRACEROUTERESULTSOPERSTATUS,     ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteResultsTable, 2, {1, 1}},
+    {COLUMN_TRACEROUTERESULTSCURHOPCOUNT,      ASN_GAUGE, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteResultsTable, 2, {1, 2}},
+    {COLUMN_TRACEROUTERESULTSCURPROBECOUNT,    ASN_GAUGE, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteResultsTable, 2, {1, 3}},
+    {COLUMN_TRACEROUTERESULTSIPTGTADDRTYPE,  ASN_INTEGER, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteResultsTable, 2, {1, 4}},
+    {COLUMN_TRACEROUTERESULTSIPTGTADDR,    ASN_OCTET_STR, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteResultsTable, 2, {1, 5}},
+    {COLUMN_TRACEROUTERESULTSTESTATTEMPTS,  ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteResultsTable, 2, {1, 6}},
+    {COLUMN_TRACEROUTERESULTSTESTSUCCESSES, ASN_UNSIGNED, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteResultsTable, 2, {1, 7}},
+    {COLUMN_TRACEROUTERESULTSLASTGOODPATH, ASN_OCTET_STR, NETSNMP_OLDAPI_RONLY,
+     var_traceRouteResultsTable, 2, {1, 8}}
 };
 
 
diff --git a/agent/mibgroup/etherlike-mib.h b/agent/mibgroup/etherlike-mib.h
new file mode 100644
index 0000000..224e254
--- /dev/null
+++ b/agent/mibgroup/etherlike-mib.h
@@ -0,0 +1,7 @@
+/*
+ * module to include the modules
+ */
+
+config_require(etherlike-mib/dot3StatsTable)
+config_add_mib(EtherLike-MIB)
+
diff --git a/agent/mibgroup/etherlike-mib/data_access/dot3stats.h b/agent/mibgroup/etherlike-mib/data_access/dot3stats.h
new file mode 100644
index 0000000..7d2b44f
--- /dev/null
+++ b/agent/mibgroup/etherlike-mib/data_access/dot3stats.h
@@ -0,0 +1,7 @@
+/*
+ * module to include the modules
+ */
+
+#if defined(linux)
+config_require(etherlike-mib/data_access/dot3stats_linux)
+#endif
diff --git a/agent/mibgroup/etherlike-mib/data_access/dot3stats_linux.c b/agent/mibgroup/etherlike-mib/data_access/dot3stats_linux.c
new file mode 100644
index 0000000..b110950
--- /dev/null
+++ b/agent/mibgroup/etherlike-mib/data_access/dot3stats_linux.c
@@ -0,0 +1,928 @@
+/*
+ * standard Net-SNMP includes 
+ */
+
+#include <net-snmp/net-snmp-config.h>
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+/*
+ * include our parent header 
+ */
+#include "etherlike-mib/dot3StatsTable/dot3StatsTable.h"
+#include "etherlike-mib/dot3StatsTable/dot3StatsTable_data_access.h"
+#include "etherlike-mib/dot3StatsTable/ioctl_imp_common.h"
+
+/*
+ * @retval  0 success
+ * @retval -1 getifaddrs failed 
+ * @retval -2 memory allocation failed
+ */
+
+struct ifname *
+dot3stats_interface_name_list_get (struct ifname *list_head, int *retval)
+{
+    struct ifaddrs *addrs = NULL, *p = NULL;
+    struct ifname *nameptr1=NULL, *nameptr2 = NULL;
+
+    DEBUGMSGTL(("access:dot3StatsTable:interface_name_list_get",
+                "called\n"));
+
+    if ((getifaddrs(&addrs)) < 0) {
+        DEBUGMSGTL(("access:dot3StatsTable:interface_name_list_get",
+                    "getifaddrs failed\n"));
+        snmp_log (LOG_ERR, "access:dot3StatsTable,interface_name_list_get, getifaddrs failed\n");
+        *retval = -1;
+        return NULL;
+    }
+
+    for (p = addrs; p; p = p->ifa_next) {
+
+        if (!list_head) {
+            if ( (list_head = (struct ifname *) malloc (sizeof(struct ifname))) < 0) {
+                DEBUGMSGTL(("access:dot3StatsTable:interface_name_list_get",
+                            "memory allocation failed\n"));
+                snmp_log (LOG_ERR, "access:dot3StatsTable,interface_name_list_get, memory allocation failed\n");
+                freeifaddrs(addrs);
+                *retval = -2;
+                return NULL;
+            }
+            memset(list_head, 0, sizeof (struct ifname));
+            strlcpy(list_head->name, p->ifa_name, IF_NAMESIZE);
+            continue;
+        }
+
+         for (nameptr1 = list_head; nameptr1; nameptr2 = nameptr1, nameptr1 = nameptr1->ifn_next)
+            if (!strncmp(p->ifa_name, nameptr1->name, IF_NAMESIZE))
+                break;
+
+        if (nameptr1)
+            continue;
+
+        if ( (nameptr2->ifn_next = (struct ifname *) malloc (sizeof(struct ifname))) < 0) {
+            DEBUGMSGTL(("access:dot3StatsTable:interface_name_list_get",
+                        "memory allocation failed\n"));
+            snmp_log (LOG_ERR, "access:dot3StatsTable,interface_name_list_get, memory allocation failed\n");
+            dot3stats_interface_name_list_free (list_head);
+            freeifaddrs(addrs);
+            *retval = -2;
+            return NULL;
+        }
+        nameptr2 = nameptr2->ifn_next;
+        memset(nameptr2, 0, sizeof (struct ifname));
+        strlcpy(nameptr2->name, p->ifa_name, IF_NAMESIZE);
+        continue;
+
+    }
+
+    freeifaddrs(addrs);
+    return list_head;
+}
+
+/*
+ * @retval 0 success
+ * @retval -1 invalid pointer
+ */
+
+int
+dot3stats_interface_name_list_free (struct ifname *list_head)
+{
+    struct ifname *nameptr1 = NULL, *nameptr2 = NULL;
+
+    DEBUGMSGTL(("access:dot3StatsTable:interface_name_list_free",
+                "called\n"));
+
+    if (!list_head) {
+        snmp_log (LOG_ERR, "access:dot3StatsTable:interface_name_list_free: invalid pointer list_head");
+        DEBUGMSGTL(("access:dot3StatsTable:interface_name_list_free",
+                    "invalid pointer list_head\n"));
+        return -1;
+    }
+
+    for (nameptr1 = list_head; nameptr1; nameptr1 = nameptr2) {
+            nameptr2 = nameptr1->ifn_next;
+            free (nameptr1);
+    }
+
+    return 0;
+}
+
+/*
+ * @retval  0 : not found
+ * @retval !0 : ifIndex
+ */
+
+int 
+dot3stats_interface_ioctl_ifindex_get (int fd, const char *name) {
+#ifndef SIOCGIFINDEX
+    return 0;
+#else
+    struct ifreq    ifrq;
+    int rc = 0;
+
+    DEBUGMSGTL(("access:dot3StatsTable:interface_ioctl_ifindex_get", "called\n"));
+                 
+    rc = _dot3Stats_ioctl_get(fd, SIOCGIFINDEX, &ifrq, name);
+    if (rc < 0) {
+        DEBUGMSGTL(("access:dot3StatsTable:interface_ioctl_ifindex_get",
+                    "error on interface '%s'\n", name));
+        snmp_log (LOG_ERR, "access:dot3StatsTable:interface_ioctl_ifindex_get, error on interface '%s'\n", name);
+        return 0;
+
+    }
+
+    return ifrq.ifr_ifindex;
+#endif /* SIOCGIFINDEX */
+}
+
+# if HAVE_LINUX_RTNETLINK_H /* { NETLINK */
+/*
+ * The following code is based upon code I got from Stephen Hemminger
+ */
+#include <linux/rtnetlink.h>
+#include <errno.h>
+
+struct rtnl_handle {
+    int                     fd;
+    struct sockaddr_nl      local;
+    struct sockaddr_nl      peer;
+    __u32                   seq;
+    __u32                   dump;
+};
+
+struct ifstat_ent {
+    struct ifstat_ent *next;
+    const char *name;
+    int ifindex;
+    struct rtnl_link_stats stats;
+};
+
+typedef int (*rtnl_filter_t)(const struct sockaddr_nl *, struct nlmsghdr *n, void *);
+
+struct rtnl_dump_filter_arg
+{
+    rtnl_filter_t filter;
+    void *arg1;
+    rtnl_filter_t junk;
+    void *arg2;
+};
+
+static struct ifstat_ent *kern_db;
+static const int rcvbuf_size = 1024 * 1024;
+
+static int
+rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions, int protocol)
+{
+    socklen_t addr_len;
+    int sndbuf = 32768;
+
+    memset(rth, 0, sizeof(*rth));
+
+    rth->fd = socket(AF_NETLINK, SOCK_RAW, protocol);
+    if (rth->fd < 0) {
+        snmp_log(LOG_ERR, "Cannot open netlink socket");
+        return -1;
+    }
+
+    if (setsockopt(rth->fd,SOL_SOCKET,SO_SNDBUF,&sndbuf,sizeof(sndbuf)) < 0) {
+        snmp_log(LOG_ERR, "SO_SNDBUF");
+        return -1;
+    }
+
+    if (setsockopt(rth->fd,SOL_SOCKET,SO_RCVBUF,&rcvbuf_size,sizeof(rcvbuf_size)) < 0) {
+        snmp_log(LOG_ERR, "SO_RCVBUF");
+        return -1;
+    }
+
+    memset(&rth->local, 0, sizeof(rth->local));
+    rth->local.nl_family = AF_NETLINK;
+    rth->local.nl_groups = subscriptions;
+
+    if (bind(rth->fd, (struct sockaddr*)&rth->local, sizeof(rth->local)) < 0) {
+        snmp_log(LOG_ERR, "Cannot bind netlink socket");
+        return -1;
+    }
+    addr_len = sizeof(rth->local);
+    if (getsockname(rth->fd, (struct sockaddr*)&rth->local, &addr_len) < 0) {
+        snmp_log(LOG_ERR, "Cannot getsockname");
+        return -1;
+    }
+    if (addr_len != sizeof(rth->local)) {
+        snmp_log(LOG_ERR, "Wrong address length %d\n", addr_len);
+        return -1;
+    }
+    if (rth->local.nl_family != AF_NETLINK) {
+        snmp_log(LOG_ERR, "Wrong address family %d\n", rth->local.nl_family);
+        return -1;
+    }
+    rth->seq = time(NULL);
+    return 0;
+}
+
+static int
+rtnl_open(struct rtnl_handle *rth, unsigned subscriptions)
+{
+    return rtnl_open_byproto(rth, subscriptions, NETLINK_ROUTE);
+}
+
+static void
+rtnl_close(struct rtnl_handle *rth)
+{
+    if (rth->fd != -1)
+        close(rth->fd);
+    rth->fd = -1;
+
+    return;
+}
+
+static int
+rtnl_wilddump_request(struct rtnl_handle *rth, int family, int type)
+{
+    struct {
+        struct nlmsghdr nlh;
+        struct rtgenmsg g;
+    } req;
+
+    memset(&req, 0, sizeof(req));
+    req.nlh.nlmsg_len = sizeof(req);
+    req.nlh.nlmsg_type = type;
+    req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST;
+    req.nlh.nlmsg_pid = 0;
+    req.nlh.nlmsg_seq = rth->dump = ++rth->seq;
+    req.g.rtgen_family = family;
+
+    return send(rth->fd, (void*)&req, sizeof(req), 0);
+}
+
+static int
+parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len)
+{
+    memset(tb, 0, sizeof(struct rtattr *) * (max + 1));
+    while (RTA_OK(rta, len))
+    {
+        if (rta->rta_type <= max)
+            tb[rta->rta_type] = rta;
+        rta = RTA_NEXT(rta,len);
+    }
+
+    if (len)
+        snmp_log(LOG_ERR, "parse_rtattr: !!!Deficit %d, rta_len=%d\n", len, rta->rta_len);
+
+    return 0;
+}
+
+static int
+get_nlmsg(const struct sockaddr_nl *who, struct nlmsghdr *m, void *arg)
+{
+    struct ifinfomsg *ifi = NLMSG_DATA(m);
+    struct rtattr * tb[IFLA_MAX+1];
+    int len = m->nlmsg_len;
+    struct ifstat_ent *n;
+
+    if (m->nlmsg_type != RTM_NEWLINK)
+        return 0;
+
+    len -= NLMSG_LENGTH(sizeof(*ifi));
+    if (len < 0)
+        return -1;
+
+    parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), len);
+    if (tb[IFLA_IFNAME] == NULL || tb[IFLA_STATS] == NULL)
+        return 0;
+
+    n = malloc(sizeof(*n));
+    memset(n, 0, sizeof(*n));
+
+    n->ifindex = ifi->ifi_index;
+    n->name = strdup(RTA_DATA(tb[IFLA_IFNAME]));
+    memcpy(&n->stats, RTA_DATA(tb[IFLA_STATS]), sizeof(n->stats));
+    n->next = kern_db;
+    kern_db = n;
+    return 0;
+}
+
+static int
+rtnl_dump_filter_l(struct rtnl_handle *rth,
+                   const struct rtnl_dump_filter_arg *arg)
+{
+    struct sockaddr_nl nladdr;
+    struct iovec iov;
+    struct msghdr msg = {
+        .msg_name = &nladdr,
+        .msg_namelen = sizeof(nladdr),
+        .msg_iov = &iov,
+        .msg_iovlen = 1,
+    };
+    char buf[16384];
+
+    iov.iov_base = buf;
+    while (1) {
+        int status;
+        const struct rtnl_dump_filter_arg *a;
+
+        iov.iov_len = sizeof(buf);
+        status = recvmsg(rth->fd, &msg, 0);
+
+        if (status < 0) {
+            if (errno == EINTR || errno == EAGAIN)
+                continue;
+            fprintf(stderr, "netlink receive error %s (%d)\n",
+                            strerror(errno), errno);
+            return -1;
+        }
+
+        if (status == 0) {
+            fprintf(stderr, "EOF on netlink\n");
+            return -1;
+        }
+
+        for (a = arg; a->filter; a++) {
+            struct nlmsghdr *h = (struct nlmsghdr*)buf;
+
+            while (NLMSG_OK(h, status)) {
+                int err;
+
+                if (nladdr.nl_pid != 0 ||
+                     h->nlmsg_pid != rth->local.nl_pid ||
+                     h->nlmsg_seq != rth->dump) {
+                    if (a->junk) {
+                        err = a->junk(&nladdr, h, a->arg2);
+                        if (err < 0)
+                            return err;
+                    }
+                    goto skip_it;
+                }
+
+                if (h->nlmsg_type == NLMSG_DONE)
+                    return 0;
+                if (h->nlmsg_type == NLMSG_ERROR) {
+                    struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h);
+                    if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr))) {
+                        fprintf(stderr, "ERROR truncated\n");
+                    } else {
+                        errno = -err->error;
+                        perror("RTNETLINK answers");
+                    }
+                    return -1;
+                }
+                err = a->filter(&nladdr, h, a->arg1);
+                if (err < 0)
+                    return err;
+
+skip_it:
+                h = NLMSG_NEXT(h, status);
+            }
+        } while (0);
+        if (msg.msg_flags & MSG_TRUNC) {
+            fprintf(stderr, "Message truncated\n");
+            continue;
+        }
+        if (status) {
+            fprintf(stderr, "!!!Remnant of size %d\n", status);
+            exit(1);
+        }
+    }
+}
+
+static int
+rtnl_dump_filter(struct rtnl_handle *rth,
+                 rtnl_filter_t filter,
+                 void *arg1,
+                 rtnl_filter_t junk,
+                 void *arg2)
+{
+    const struct rtnl_dump_filter_arg a[2] = {
+        { .filter = filter, .arg1 = arg1, .junk = junk, .arg2 = arg2 },
+        { .filter = NULL,   .arg1 = NULL, .junk = NULL, .arg2 = NULL }
+    };
+
+    return rtnl_dump_filter_l(rth, a);
+}
+
+int
+_dot3Stats_netlink_get_errorcntrs(dot3StatsTable_rowreq_ctx *rowreq_ctx, const char *name)
+{
+    struct rtnl_handle rth;
+    struct ifstat_ent *ke;
+    int done;
+
+    if (rtnl_open(&rth, 0) < 0)
+    {
+        snmp_log(LOG_ERR, "_dot3Stats_netlink_get_errorcntrs: rtnl_open() failed\n");
+        return 1;
+    }
+
+    if (rtnl_wilddump_request(&rth, AF_INET, RTM_GETLINK) < 0)
+    {
+        snmp_log(LOG_ERR, "_dot3Stats_netlink_get_errorcntrs: Cannot send dump request");
+        rtnl_close(&rth);
+        return 1;
+    }
+
+    if (rtnl_dump_filter(&rth, get_nlmsg, NULL, NULL, NULL) < 0)
+    {
+        snmp_log(LOG_ERR, "_dot3Stats_netlink_get_errorcntrs: Dump terminated\n");
+        rtnl_close(&rth);
+        return 1;
+    }
+
+    rtnl_close(&rth);
+
+    /*
+     * Now scan kern_db for this if's data
+     * While doing so, we'll throw away the kern db.
+     */
+    done = 0;
+
+    while ((ke = kern_db) != NULL)
+    {
+        if (strcmp(ke->name, name) == 0)
+        {
+            dot3StatsTable_data *data = &rowreq_ctx->data;
+
+            DEBUGMSGTL(("access:dot3StatsTable", "IFLA_STATS for %s\n", name));
+
+            data->dot3StatsFCSErrors = ke->stats.rx_crc_errors;
+            rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSFCSERRORS_FLAG;
+
+            data->dot3StatsDeferredTransmissions = ke->stats.tx_dropped;
+            rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSDEFERREDTRANSMISSIONS_FLAG;
+
+            data->dot3StatsInternalMacTransmitErrors = ke->stats.tx_fifo_errors;
+            rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSINTERNALMACTRANSMITERRORS_FLAG;
+
+            data->dot3StatsCarrierSenseErrors = ke->stats.tx_carrier_errors;
+            rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSCARRIERSENSEERRORS_FLAG;
+
+            data->dot3StatsFrameTooLongs = ke->stats.rx_frame_errors;
+            rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSFRAMETOOLONGS_FLAG;
+
+            data->dot3StatsInternalMacReceiveErrors = ke->stats.rx_fifo_errors;
+            rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSINTERNALMACRECEIVEERRORS_FLAG;
+
+            done = 1;
+        }
+        kern_db = ke->next;
+        free(ke);
+    }
+
+    return !done;
+}
+# else /* }{ */
+int
+_dot3Stats_netlink_get_errorcntrs(dot3StatsTable_rowreq_ctx *rowreq_ctx, const char *name)
+{
+    return 1;
+}
+# endif /* } */
+
+
+/*
+ * NAME: getulongfromsysclassnetstatistics
+ * PURPOSE: To get a single statistics value from /sys/class/net/<ifname>/statistics/<ctrname>
+ * ARGUMENTS: ifname: interface name
+ *      ctrname: counter name
+ *      valuep: where to store value
+ * RETURNS: 0 if value not available
+ *      non-0 if value available
+ */
+static int
+getulongfromsysclassnetstatistics(const char *ifname, char *ctrname, u_long *valuep)
+{
+    char path[256];
+    FILE *fp;
+    int rv;
+
+    if (ifname == NULL || ctrname == NULL || valuep == NULL)
+        return 0;
+
+    snprintf(path, sizeof(path), "/sys/class/net/%s/statistics/%s", ifname, ctrname);
+    fp = fopen(path, "rt");
+    if (fp == NULL)
+        return 0;
+
+    rv = 1;
+    if (fscanf(fp, "%lu", valuep) != 1)
+        rv = 0;
+
+    fclose(fp);
+
+    return rv;
+}
+
+/*
+ * NAME: interface_dot3stats_get_errorcounters
+ * PURPOSE: To get ethernet error statistics
+ * ARGUMENTS: rowreq_ctx: where to store the value(s)
+ *      name: interface name
+ * RETURNS: nothing. fields not set if data not available
+ */
+void
+interface_dot3stats_get_errorcounters (dot3StatsTable_rowreq_ctx *rowreq_ctx, const char *name)
+{
+    u_long value;
+    dot3StatsTable_data *data = &rowreq_ctx->data;
+    FILE *dev;
+    const char NETDEV_FILE[] = "/proc/net/dev";
+
+    if (_dot3Stats_netlink_get_errorcntrs(rowreq_ctx, name) == 0)
+    {
+        DEBUGMSGTL(("access:dot3StatsTable", "interface_dot3stats_get_errorcounters: got data from IFLA_STATS\n"));
+        return;
+    }
+
+    if ((dev = fopen(NETDEV_FILE, "r")) != NULL)
+    {
+        char line[256], *lp, *next;
+        size_t namelen = strlen(name);
+        unsigned int value;
+        unsigned int column;
+
+        while (fgets(line, sizeof(line), dev) != NULL)
+        {
+            /*    br0:68395635 1038214    0    0    0     0          0    939411 25626606   90708    0    0    0     0       0          0 */
+            lp = line;
+            while (*lp == ' ' || *lp == '\t')
+                lp++;
+            if (strncmp(lp, name, namelen) != 0 || lp[namelen] != ':')
+                continue;
+            lp += namelen + 1;         /* Skip name and colon */
+
+            column = 1;
+            while (1)
+            {
+                value = strtoul(lp, &next, 10);
+                if (next == lp)
+                    break;             /* no more data */
+                switch (column)
+                {
+                case 3: 
+                    data->dot3StatsFCSErrors = value;
+                    rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSFCSERRORS_FLAG;
+                    break;
+                case 12:
+                    data->dot3StatsDeferredTransmissions = value;
+                    rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSDEFERREDTRANSMISSIONS_FLAG;
+                    break;
+                case 13:
+                    data->dot3StatsInternalMacTransmitErrors = value;
+                    rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSINTERNALMACTRANSMITERRORS_FLAG;
+                    break;
+                case 15:
+                    data->dot3StatsCarrierSenseErrors = value;
+                    rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSCARRIERSENSEERRORS_FLAG;
+                    break;
+                case 6:
+                    data->dot3StatsFrameTooLongs = value;
+                    rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSFRAMETOOLONGS_FLAG;
+                    break;
+                case 5:
+                    data->dot3StatsInternalMacReceiveErrors = value;
+                    rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSINTERNALMACRECEIVEERRORS_FLAG;
+                    break;
+                case 14:
+                    data->dot3StatsSingleCollisionFrames = value;
+                    rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSSINGLECOLLISIONFRAMES_FLAG;
+                    break;
+                }
+                column++;
+                lp = next;
+            }
+            break;
+        }
+
+        fclose(dev);
+    }
+
+    if (!(rowreq_ctx->column_exists_flags & COLUMN_DOT3STATSFCSERRORS_FLAG) &&
+          getulongfromsysclassnetstatistics(name, "rx_errors", &value)) {
+        data->dot3StatsFCSErrors = value;
+        rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSFCSERRORS_FLAG;
+    }
+    if (!(rowreq_ctx->column_exists_flags & COLUMN_DOT3STATSDEFERREDTRANSMISSIONS_FLAG) &&
+          getulongfromsysclassnetstatistics(name, "tx_dropped", &value)) {
+        data->dot3StatsDeferredTransmissions = value;
+        rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSDEFERREDTRANSMISSIONS_FLAG;
+    }
+    if (!(rowreq_ctx->column_exists_flags & COLUMN_DOT3STATSINTERNALMACTRANSMITERRORS_FLAG) &&
+          getulongfromsysclassnetstatistics(name, "tx_fifo_errors", &value)) {
+        data->dot3StatsInternalMacTransmitErrors = value;
+        rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSINTERNALMACTRANSMITERRORS_FLAG;
+    }
+    if (!(rowreq_ctx->column_exists_flags & COLUMN_DOT3STATSCARRIERSENSEERRORS_FLAG) &&
+          getulongfromsysclassnetstatistics(name, "tx_carrier_errors", &value)) {
+        data->dot3StatsCarrierSenseErrors = value;
+        rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSCARRIERSENSEERRORS_FLAG;
+    }
+    if (!(rowreq_ctx->column_exists_flags & COLUMN_DOT3STATSFRAMETOOLONGS_FLAG) &&
+          getulongfromsysclassnetstatistics(name, "rx_frame_errors", &value)) {
+        data->dot3StatsFrameTooLongs = value;
+        rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSFRAMETOOLONGS_FLAG;
+    }
+    if (!(rowreq_ctx->column_exists_flags & COLUMN_DOT3STATSINTERNALMACRECEIVEERRORS_FLAG) &&
+          getulongfromsysclassnetstatistics(name, "rx_fifo_errors", &value)) {
+        data->dot3StatsInternalMacReceiveErrors = value;
+        rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSINTERNALMACRECEIVEERRORS_FLAG;
+    }
+
+    return;
+}
+
+/*
+ * @retval  0 success
+ * @retval -1 cannot get ETHTOOL_DRVINFO failed 
+ * @retval -2 nstats zero - no statistcs available
+ * @retval -3 memory allocation for holding the statistics failed
+ * @retval -4 cannot get ETHTOOL_GSTRINGS information
+ * @retval -5 cannot get ETHTOOL_GSTATS information
+ * @retval -6 function not supported if HAVE_LINUX_ETHTOOL_H not defined
+ */
+
+
+int 
+interface_ioctl_dot3stats_get (dot3StatsTable_rowreq_ctx *rowreq_ctx, int fd, const char *name) {
+
+#ifdef HAVE_LINUX_ETHTOOL_H
+    dot3StatsTable_data *data = &rowreq_ctx->data;
+    struct ethtool_drvinfo driver_info;
+    struct ethtool_gstrings *eth_strings;
+    struct ethtool_stats *eth_stats;
+    struct ifreq ifr; 
+    unsigned int nstats, size_str, i;
+    int err;
+
+    DEBUGMSGTL(("access:dot3StatsTable:interface_ioctl_dot3Stats_get",
+                "called\n"));
+
+    memset(&ifr, 0, sizeof(ifr));
+    strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
+
+    memset(&driver_info, 0, sizeof (driver_info));
+    driver_info.cmd = ETHTOOL_GDRVINFO;
+    ifr.ifr_data = (char *)&driver_info;
+
+    err = _dot3Stats_ioctl_get(fd, SIOCETHTOOL, &ifr, name);
+    if (err < 0) {
+        DEBUGMSGTL(("access:dot3StatsTable:interface_ioctl_dot3Stats_get",
+                    "ETHTOOL_GETDRVINFO failed for interface |%s| \n", name));
+        return -1;
+    }
+
+    nstats = driver_info.n_stats;
+    if (nstats < 1) {
+        DEBUGMSGTL(("access:dot3StatsTable:interface_ioctl_dot3Stats_get",
+                    "no stats available for interface |%s| \n", name));
+        return -2;
+    }
+
+    size_str = nstats * ETH_GSTRING_LEN;
+
+    eth_strings = malloc(size_str + sizeof (struct ethtool_gstrings));
+    if (!eth_strings) {
+        DEBUGMSGTL(("access:dot3StatsTable:interface_ioctl_dot3Stats_get",
+                    "no memory available\n"));
+        snmp_log (LOG_ERR, "access:dot3StatsTable,interface_ioctl_dot3Stats_get, no memory available\n");
+
+        return -3;
+    }
+    memset (eth_strings, 0, (size_str + sizeof (struct ethtool_gstrings)));
+
+    eth_stats = malloc (size_str + sizeof (struct ethtool_stats));
+    if (!eth_stats) {
+        free (eth_strings);
+        DEBUGMSGTL(("access:dot3StatsTable:interface_ioctl_dot3Stats_get",
+                    "no memory available\n"));
+        snmp_log (LOG_ERR, "access:dot3StatsTable,interface_ioctl_dot3Stats_get, no memory available\n");
+
+        return -3;
+    }
+     memset (eth_stats, 0, (size_str + sizeof (struct ethtool_stats)));
+
+    eth_strings->cmd = ETHTOOL_GSTRINGS;
+    eth_strings->string_set = ETH_SS_STATS;
+    eth_strings->len = nstats;
+    ifr.ifr_data = (char *) eth_strings;
+    err = _dot3Stats_ioctl_get(fd, SIOCETHTOOL, &ifr, name);
+    if (err < 0) {
+        DEBUGMSGTL(("access:dot3StatsTable:interface_ioctl_dot3Stats_get",
+                    "cannot get stats strings information for interface |%s| \n", name));
+        snmp_log (LOG_ERR, "access:dot3StatsTable,interface_ioctl_dot3Stats_get, cannot get stats strings information for interface |%s| \n", name);
+
+        free(eth_strings);
+        free(eth_stats);
+        return -4;
+    }
+
+    eth_stats->cmd = ETHTOOL_GSTATS;
+    eth_stats->n_stats = nstats;
+    ifr.ifr_data = (char *) eth_stats;
+    err = _dot3Stats_ioctl_get(fd, SIOCETHTOOL, &ifr, name);
+    if (err < 0) {
+        DEBUGMSGTL(("access:dot3StatsTable:interface_ioctl_dot3Stats_get",
+                    "cannot get stats strings information for interface |%s| \n", name));
+        snmp_log (LOG_ERR, "access:dot3StatsTable,interface_ioctl_dot3Stats_get, cannot get stats information for interface |%s| \n", name);
+
+        free(eth_strings);
+        free(eth_stats);
+        return -5;
+    }
+
+    for (i = 0; i < nstats; i++) {
+        char s[ETH_GSTRING_LEN];
+
+        strlcpy(s, (const char *) &eth_strings->data[i * ETH_GSTRING_LEN],
+                sizeof(s));
+    
+        if (DOT3STATSALIGNMENTERRORS(s)) {
+            data->dot3StatsAlignmentErrors = (u_long)eth_stats->data[i];
+            rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSALIGNMENTERRORS_FLAG;
+        }
+
+        if (DOT3STATSMULTIPLECOLLISIONFRAMES(s)) {
+            data->dot3StatsMultipleCollisionFrames = (u_long)eth_stats->data[i];
+            rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSMULTIPLECOLLISIONFRAMES_FLAG;
+        }
+            
+        if (DOT3STATSLATECOLLISIONS(s)) {
+            data->dot3StatsLateCollisions = (u_long)eth_stats->data[i];
+            rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSLATECOLLISIONS_FLAG;
+        }
+
+        if (DOT3STATSSINGLECOLLISIONFRAMES(s)) {
+            data->dot3StatsSingleCollisionFrames = (u_long)eth_stats->data[i];
+            rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSSINGLECOLLISIONFRAMES_FLAG;
+        }
+
+        if (DOT3STATSEXCESSIVECOLLISIONS(s)) {
+            data->dot3StatsExcessiveCollisions = (u_long)eth_stats->data[i];
+            rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSEXCESSIVECOLLISIONS_FLAG;
+        }
+    }
+
+    free(eth_strings);
+    free(eth_stats);
+
+    return 0;
+#else
+    return -6;
+#endif
+}
+
+
+/*
+ * @retval  0 success
+ * @retval -1 ETHTOOL_GSET failed
+ * @retval -2 function not supported if HAVE_LINUX_ETHTOOL_H not defined
+ */
+
+int
+interface_ioctl_dot3stats_duplex_get(dot3StatsTable_rowreq_ctx *rowreq_ctx, int fd, const char* name) {
+
+#ifdef HAVE_LINUX_ETHTOOL_H
+    dot3StatsTable_data *data = &rowreq_ctx->data;
+    struct ethtool_cmd edata;
+    struct ifreq ifr;
+    int err;
+
+    DEBUGMSGTL(("access:dot3StatsTable:interface_ioctl_dot3Stats_duplex_get",
+                "called\n"));
+
+    memset(&edata, 0, sizeof (edata));
+    memset(&ifr, 0, sizeof (ifr));
+    edata.cmd = ETHTOOL_GSET;
+    ifr.ifr_data = (char *)&edata;
+
+    err = _dot3Stats_ioctl_get (fd, SIOCETHTOOL, &ifr, name);
+    if (err < 0) {
+        DEBUGMSGTL(("access:dot3StatsTable:interface_ioctl_dot3Stats_duplex_get",
+                    "ETHTOOL_GSET failed\n"));
+
+        return -1;
+    }
+    
+    if (err == 0) {
+        rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSDUPLEXSTATUS_FLAG;
+        switch (edata.duplex) {
+        case DUPLEX_HALF:
+            data->dot3StatsDuplexStatus = (u_long) DOT3STATSDUPLEXSTATUS_HALFDUPLEX;
+            break;
+        case DUPLEX_FULL:
+            data->dot3StatsDuplexStatus = (u_long) DOT3STATSDUPLEXSTATUS_FULLDUPLEX;
+            break;
+        default:
+            data->dot3StatsDuplexStatus = (u_long) DOT3STATSDUPLEXSTATUS_UNKNOWN;
+            break;
+        };
+    }
+
+    DEBUGMSGTL(("access:dot3StatsTable:interface_ioctl_dot3Stats_duplex_get",
+                "ETHTOOL_GSET processed\n"));
+    return err;
+#else
+    return -2;
+#endif
+}
+
+
+/*
+ * NAME: interface_sysclassnet_dot3stats_get
+ * PURPOSE: To get ethernet statistics from /sys/class/net/...
+ * ARGUMENTS: rowreq_ctx: where to store the value(s)
+ *	name: interface name
+ * RETURNS: nothing. fields not set if data not available
+ */
+void
+interface_sysclassnet_dot3stats_get (dot3StatsTable_rowreq_ctx *rowreq_ctx, const char *name)
+{
+    u_long value;
+    dot3StatsTable_data *data = &rowreq_ctx->data;
+
+    if (getulongfromsysclassnetstatistics(name, "rx_errors", &value)) {
+	data->dot3StatsFCSErrors = value;
+	rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSFCSERRORS_FLAG;
+    }
+    if (getulongfromsysclassnetstatistics(name, "tx_dropped", &value)) {
+	data->dot3StatsDeferredTransmissions = value;
+	rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSDEFERREDTRANSMISSIONS_FLAG;
+    }
+    if (getulongfromsysclassnetstatistics(name, "tx_fifo_errors", &value)) {
+	data->dot3StatsInternalMacTransmitErrors = value;
+	rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSINTERNALMACTRANSMITERRORS_FLAG;
+    }
+    if (getulongfromsysclassnetstatistics(name, "tx_carrier_errors", &value)) {
+	data->dot3StatsCarrierSenseErrors = value;
+	rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSCARRIERSENSEERRORS_FLAG;
+    }
+    if (getulongfromsysclassnetstatistics(name, "rx_frame_errors", &value)) {
+	data->dot3StatsFrameTooLongs = value;
+	rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSFRAMETOOLONGS_FLAG;
+    }
+    if (getulongfromsysclassnetstatistics(name, "rx_fifo_errors", &value)) {
+	data->dot3StatsInternalMacReceiveErrors = value;
+	rowreq_ctx->column_exists_flags |= COLUMN_DOT3STATSINTERNALMACRECEIVEERRORS_FLAG;
+    }
+
+    return;
+}
+
+
+
+/* ioctl wrapper
+ *
+ * @param      fd : socket fd to use w/ioctl, or -1 to open/close one
+ * @param  which
+ * @param ifrq
+ * param ifentry : ifentry to update
+ * @param name
+ *
+ * @retval  0 : success
+ * @retval -1 : invalid parameters
+ * @retval -2 : couldn't create socket
+ * @retval -3 : ioctl call failed
+ */
+int
+_dot3Stats_ioctl_get(int fd, int which, struct ifreq *ifrq, const char* name)
+{
+    int ourfd = -1, rc = 0;
+
+    DEBUGMSGTL(("access:dot3StatsTable:ioctl", "_dot3Stats_ioctl_get\n"));
+
+    /*
+     * sanity checks
+     */
+    if(NULL == name) {
+        DEBUGMSGTL(("access:dot3StatsTable:ioctl",
+                    "_dot3Stats_ioctl_get invalid ifname '%s'\n", name));
+        snmp_log (LOG_ERR, "access:dot3StatsTable:ioctl, _dot3Stats_ioctl_get error on interface '%s'\n", name);
+        return -1;
+    }
+
+    /*
+     * create socket for ioctls
+     */
+    if(fd < 0) {
+        fd = ourfd = socket(AF_INET, SOCK_DGRAM, 0);
+        if(ourfd < 0) {
+            DEBUGMSGTL(("access:dot3StatsTable:ioctl",
+                        "dot3Stats_ioctl_get couldn't create a socket\n", name));
+            snmp_log (LOG_ERR, "access:dot3StatsTable:ioctl, _dot3Stats_ioctl_get error on interface '%s'\n", name);
+
+            return -2;
+        }
+    }
+
+    strlcpy(ifrq->ifr_name, name, sizeof(ifrq->ifr_name));
+    rc = ioctl(fd, which, ifrq);
+    if (rc < 0) {
+        DEBUGMSGTL(("access:dot3StatsTable:ioctl",
+                    "dot3Stats_ioctl_get ioctl %d returned %d\n", which, rc));
+        rc = -3;
+    }
+
+    if(ourfd >= 0)
+        close(ourfd);
+
+    return rc;
+}
+
+
diff --git a/agent/mibgroup/etherlike-mib/dot3StatsTable.h b/agent/mibgroup/etherlike-mib/dot3StatsTable.h
new file mode 100644
index 0000000..b04f7bf
--- /dev/null
+++ b/agent/mibgroup/etherlike-mib/dot3StatsTable.h
@@ -0,0 +1,11 @@
+/*
+ * module to include the modules
+ */
+
+config_require(etherlike-mib/data_access/dot3stats)
+config_require(etherlike-mib/dot3StatsTable/dot3StatsTable)
+config_require(etherlike-mib/dot3StatsTable/dot3StatsTable_data_get)
+config_require(etherlike-mib/dot3StatsTable/dot3StatsTable_data_set)
+config_require(etherlike-mib/dot3StatsTable/dot3StatsTable_data_access)
+config_require(etherlike-mib/dot3StatsTable/dot3StatsTable_interface)
+
diff --git a/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable.c b/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable.c
new file mode 100644
index 0000000..b86380a
--- /dev/null
+++ b/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable.c
@@ -0,0 +1,215 @@
+/*
+ * Note: this file originally auto-generated by mib2c using
+ *       version : 14170 $ of $ 
+ *
+ * $Id:$
+ */
+/** \page MFD helper for dot3StatsTable
+ *
+ * \section intro Introduction
+ * Introductory text.
+ *
+ */
+/*
+ * standard Net-SNMP includes 
+ */
+#include <net-snmp/net-snmp-config.h>
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+/*
+ * include our parent header 
+ */
+#include "dot3StatsTable.h"
+
+#include <net-snmp/agent/mib_modules.h>
+
+#include "dot3StatsTable_interface.h"
+
+oid             dot3StatsTable_oid[] = { DOT3STATSTABLE_OID };
+int             dot3StatsTable_oid_size = OID_LENGTH(dot3StatsTable_oid);
+
+dot3StatsTable_registration dot3StatsTable_user_context;
+static dot3StatsTable_registration *dot3StatsTable_user_context_p;
+
+void            initialize_table_dot3StatsTable(void);
+void            shutdown_table_dot3StatsTable(void);
+
+
+/**
+ * Initializes the dot3StatsTable module
+ */
+void
+init_dot3StatsTable(void)
+{
+    DEBUGMSGTL(("verbose:dot3StatsTable:init_dot3StatsTable", "called\n"));
+
+    /*
+     * TODO:300:o: Perform dot3StatsTable one-time module initialization.
+     */
+
+    /*
+     * here we initialize all the tables we're planning on supporting
+     */
+    if (should_init("dot3StatsTable"))
+        initialize_table_dot3StatsTable();
+
+}                               /* init_dot3StatsTable */
+
+/**
+ * Shut-down the dot3StatsTable module (agent is exiting)
+ */
+void
+shutdown_dot3StatsTable(void)
+{
+    if (should_init("dot3StatsTable"))
+        shutdown_table_dot3StatsTable();
+
+}
+
+/**
+ * Initialize the table dot3StatsTable 
+ *    (Define its contents and how it's structured)
+ */
+void
+initialize_table_dot3StatsTable(void)
+{
+    u_long          flags;
+
+    DEBUGMSGTL(("verbose:dot3StatsTable:initialize_table_dot3StatsTable",
+                "called\n"));
+
+    /*
+     * TODO:301:o: Perform dot3StatsTable one-time table initialization.
+     */
+
+    /*
+     * TODO:302:o: |->Initialize dot3StatsTable user context
+     * if you'd like to pass in a pointer to some data for this
+     * table, allocate or set it up here.
+     */
+    /*
+     * a netsnmp_data_list is a simple way to store void pointers. A simple
+     * string token is used to add, find or remove pointers.
+     */
+    dot3StatsTable_user_context_p
+	= netsnmp_create_data_list("dot3StatsTable", NULL, NULL);
+
+    /*
+     * No support for any flags yet, but in the future you would
+     * set any flags here.
+     */
+    flags = 0;
+
+    /*
+     * call interface initialization code
+     */
+    _dot3StatsTable_initialize_interface(dot3StatsTable_user_context_p, flags);
+}                               /* initialize_table_dot3StatsTable */
+
+/**
+ * Shutdown the table dot3StatsTable 
+ */
+void
+shutdown_table_dot3StatsTable(void)
+{
+    /*
+     * call interface shutdown code
+     */
+    _dot3StatsTable_shutdown_interface(dot3StatsTable_user_context_p);
+    netsnmp_free_all_list_data(dot3StatsTable_user_context_p);
+    dot3StatsTable_user_context_p = NULL;
+}
+
+/**
+ * extra context initialization (eg default values)
+ *
+ * @param rowreq_ctx    : row request context
+ * @param user_init_ctx : void pointer for user (parameter to rowreq_ctx_allocate)
+ *
+ * @retval MFD_SUCCESS  : no errors
+ * @retval MFD_ERROR    : error (context allocate will fail)
+ */
+int
+dot3StatsTable_rowreq_ctx_init(dot3StatsTable_rowreq_ctx * rowreq_ctx,
+                               void *user_init_ctx)
+{
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsTable_rowreq_ctx_init",
+                "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    /*
+     * TODO:210:o: |-> Perform extra dot3StatsTable rowreq initialization. (eg DEFVALS)
+     */
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsTable_rowreq_ctx_init */
+
+/**
+ * extra context cleanup
+ *
+ */
+void
+dot3StatsTable_rowreq_ctx_cleanup(dot3StatsTable_rowreq_ctx * rowreq_ctx)
+{
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsTable_rowreq_ctx_cleanup",
+                "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    /*
+     * TODO:211:o: |-> Perform extra dot3StatsTable rowreq cleanup.
+     */
+}                               /* dot3StatsTable_rowreq_ctx_cleanup */
+
+/**
+ * pre-request callback
+ *
+ *
+ * @retval MFD_SUCCESS              : success.
+ * @retval MFD_ERROR                : other error
+ */
+int
+dot3StatsTable_pre_request(dot3StatsTable_registration * user_context)
+{
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsTable_pre_request",
+                "called\n"));
+
+    /*
+     * TODO:510:o: Perform dot3StatsTable pre-request actions.
+     */
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsTable_pre_request */
+
+/**
+ * post-request callback
+ *
+ * Note:
+ *   New rows have been inserted into the container, and
+ *   deleted rows have been removed from the container and
+ *   released.
+ *
+ * @param user_context
+ * @param rc : MFD_SUCCESS if all requests succeeded
+ *
+ * @retval MFD_SUCCESS : success.
+ * @retval MFD_ERROR   : other error (ignored)
+ */
+int
+dot3StatsTable_post_request(dot3StatsTable_registration * user_context,
+                            int rc)
+{
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsTable_post_request",
+                "called\n"));
+
+    /*
+     * TODO:511:o: Perform dot3StatsTable post-request actions.
+     */
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsTable_post_request */
+
+
+/** @{ */
diff --git a/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable.h b/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable.h
new file mode 100644
index 0000000..c4713fc
--- /dev/null
+++ b/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable.h
@@ -0,0 +1,271 @@
+/*
+ * Note: this file originally auto-generated by mib2c using
+ *       version : 14170 $ of $
+ *
+ * $Id:$
+ */
+#ifndef DOT3STATSTABLE_H
+#define DOT3STATSTABLE_H
+
+#ifdef __cplusplus
+extern          "C" {
+#endif
+
+
+/** @addtogroup misc misc: Miscellaneous routines
+ *
+ * @{
+ */
+#include <net-snmp/library/asn1.h>
+
+    /*
+     * OID and column number definitions for dot3StatsTable 
+     */
+#include "dot3StatsTable_oids.h"
+
+    /*
+     * enum definions 
+     */
+#include "dot3StatsTable_enums.h"
+
+    /*
+     *********************************************************************
+     * function declarations
+     */
+    void            init_dot3StatsTable(void);
+    void            shutdown_dot3StatsTable(void);
+
+    /*
+     *********************************************************************
+     * Table declarations
+     */
+/**********************************************************************
+ **********************************************************************
+ ***
+ *** Table dot3StatsTable
+ ***
+ **********************************************************************
+ **********************************************************************/
+    /*
+     * EtherLike-MIB::dot3StatsTable is subid 2 of dot3.
+     * Its status is Current.
+     * OID: .1.3.6.1.2.1.10.7.2, length: 9
+     */
+    /*
+     *********************************************************************
+     * When you register your mib, you get to provide a generic
+     * pointer that will be passed back to you for most of the
+     * functions calls.
+     *
+     * TODO:100:r: Review all context structures
+     */
+    /*
+     * TODO:101:o: |-> Review dot3StatsTable registration context.
+     */
+    typedef netsnmp_data_list dot3StatsTable_registration;
+
+/**********************************************************************/
+    /*
+     * TODO:110:r: |-> Review dot3StatsTable data context structure.
+     * This structure is used to represent the data for dot3StatsTable.
+     */
+    /*
+     * This structure contains storage for all the columns defined in the
+     * dot3StatsTable.
+     */
+    typedef struct dot3StatsTable_data_s {
+
+        /*
+         * dot3StatsAlignmentErrors(2)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h
+         */
+        u_long          dot3StatsAlignmentErrors;
+
+        /*
+         * dot3StatsFCSErrors(3)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h
+         */
+        u_long          dot3StatsFCSErrors;
+
+        /*
+         * dot3StatsSingleCollisionFrames(4)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h
+         */
+        u_long          dot3StatsSingleCollisionFrames;
+
+        /*
+         * dot3StatsMultipleCollisionFrames(5)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h
+         */
+        u_long          dot3StatsMultipleCollisionFrames;
+
+        /*
+         * dot3StatsSQETestErrors(6)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h
+         */
+        u_long          dot3StatsSQETestErrors;
+
+        /*
+         * dot3StatsDeferredTransmissions(7)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h
+         */
+        u_long          dot3StatsDeferredTransmissions;
+
+        /*
+         * dot3StatsLateCollisions(8)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h
+         */
+        u_long          dot3StatsLateCollisions;
+
+        /*
+         * dot3StatsExcessiveCollisions(9)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h
+         */
+        u_long          dot3StatsExcessiveCollisions;
+
+        /*
+         * dot3StatsInternalMacTransmitErrors(10)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h
+         */
+        u_long          dot3StatsInternalMacTransmitErrors;
+
+        /*
+         * dot3StatsCarrierSenseErrors(11)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h
+         */
+        u_long          dot3StatsCarrierSenseErrors;
+
+        /*
+         * dot3StatsFrameTooLongs(13)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h
+         */
+        u_long          dot3StatsFrameTooLongs;
+
+        /*
+         * dot3StatsInternalMacReceiveErrors(16)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h
+         */
+        u_long          dot3StatsInternalMacReceiveErrors;
+
+        /*
+         * dot3StatsEtherChipSet(17)/OBJECTID/ASN_OBJECT_ID/oid(oid)//L/A/w/e/r/d/h
+         */
+        oid             dot3StatsEtherChipSet[128];
+        size_t          dot3StatsEtherChipSet_len;      /* # of oid elements, not bytes */
+
+        /*
+         * dot3StatsSymbolErrors(18)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h
+         */
+        u_long          dot3StatsSymbolErrors;
+
+        /*
+         * dot3StatsDuplexStatus(19)/INTEGER/ASN_INTEGER/long(u_long)//l/A/w/E/r/d/h
+         */
+        u_long          dot3StatsDuplexStatus;
+
+        /*
+         * dot3StatsRateControlAbility(20)/TruthValue/ASN_INTEGER/long(u_long)//l/A/w/E/r/d/h
+         */
+        u_long          dot3StatsRateControlAbility;
+
+        /*
+         * dot3StatsRateControlStatus(21)/INTEGER/ASN_INTEGER/long(u_long)//l/A/w/E/r/d/h
+         */
+        u_long          dot3StatsRateControlStatus;
+
+    } dot3StatsTable_data;
+
+
+    /*
+     * TODO:120:r: |-> Review dot3StatsTable mib index.
+     * This structure is used to represent the index for dot3StatsTable.
+     */
+    typedef struct dot3StatsTable_mib_index_s {
+
+        /*
+         * dot3StatsIndex(1)/InterfaceIndex/ASN_INTEGER/long(long)//l/A/w/e/R/d/H
+         */
+        long            dot3StatsIndex;
+
+
+    } dot3StatsTable_mib_index;
+
+    /*
+     * TODO:121:r: |   |-> Review dot3StatsTable max index length.
+     * If you KNOW that your indexes will never exceed a certain
+     * length, update this macro to that length.
+     */
+#define MAX_dot3StatsTable_IDX_LEN     255
+
+
+    /*
+     *********************************************************************
+     * TODO:130:o: |-> Review dot3StatsTable Row request (rowreq) context.
+     * When your functions are called, you will be passed a
+     * dot3StatsTable_rowreq_ctx pointer.
+     */
+    typedef struct dot3StatsTable_rowreq_ctx_s {
+
+    /** this must be first for container compare to work */
+        netsnmp_index   oid_idx;
+        oid             oid_tmp[MAX_dot3StatsTable_IDX_LEN];
+
+        dot3StatsTable_mib_index tbl_idx;
+
+        dot3StatsTable_data data;
+        unsigned int    column_exists_flags;    /* flags for existence */
+
+        /*
+         * flags per row. Currently, the first (lower) 8 bits are reserved
+         * for the user. See mfd.h for other flags.
+         */
+        u_int           rowreq_flags;
+
+        /*
+         * TODO:131:o: |   |-> Add useful data to dot3StatsTable rowreq context.
+         */
+
+        /*
+         * storage for future expansion
+         */
+        netsnmp_data_list *dot3StatsTable_data_list;
+
+    } dot3StatsTable_rowreq_ctx;
+
+    typedef struct dot3StatsTable_ref_rowreq_ctx_s {
+        dot3StatsTable_rowreq_ctx *rowreq_ctx;
+    } dot3StatsTable_ref_rowreq_ctx;
+
+    /*
+     *********************************************************************
+     * function prototypes
+     */
+    int             dot3StatsTable_pre_request(dot3StatsTable_registration
+                                               * user_context);
+    int             dot3StatsTable_post_request(dot3StatsTable_registration
+                                                * user_context, int rc);
+
+    int            
+        dot3StatsTable_rowreq_ctx_init(dot3StatsTable_rowreq_ctx *
+                                       rowreq_ctx, void *user_init_ctx);
+    void           
+        dot3StatsTable_rowreq_ctx_cleanup(dot3StatsTable_rowreq_ctx *
+                                          rowreq_ctx);
+
+
+    dot3StatsTable_rowreq_ctx
+        *dot3StatsTable_row_find_by_mib_index(dot3StatsTable_mib_index *
+                                              mib_idx);
+
+    extern oid      dot3StatsTable_oid[];
+    extern int      dot3StatsTable_oid_size;
+
+
+#include "dot3StatsTable_interface.h"
+#include "dot3StatsTable_data_access.h"
+#include "dot3StatsTable_data_get.h"
+#include "dot3StatsTable_data_set.h"
+
+    /*
+     * DUMMY markers, ignore
+     *
+     * TODO:099:x: *************************************************************
+     * TODO:199:x: *************************************************************
+     * TODO:299:x: *************************************************************
+     * TODO:399:x: *************************************************************
+     * TODO:499:x: *************************************************************
+     */
+
+#ifdef __cplusplus
+}
+#endif
+#endif                          /* DOT3STATSTABLE_H */
+/** @} */
diff --git a/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_access.c b/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_access.c
new file mode 100644
index 0000000..d992ab9
--- /dev/null
+++ b/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_access.c
@@ -0,0 +1,417 @@
+/*
+ * Note: this file originally auto-generated by mib2c using
+ *       version : 14170 $ of $ 
+ *
+ * $Id:$
+ */
+/*
+ * standard Net-SNMP includes 
+ */
+
+#include <net-snmp/net-snmp-config.h>
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+/*
+ * include our parent header 
+ */
+#include "dot3StatsTable.h"
+#include "dot3StatsTable_data_access.h"
+
+#if defined(linux)
+#include "ioctl_imp_common.h"
+#endif
+
+/** @ingroup interface
+ * @addtogroup data_access data_access: Routines to access data
+ *
+ * These routines are used to locate the data used to satisfy
+ * requests.
+ * 
+ * @{
+ */
+/**********************************************************************
+ **********************************************************************
+ ***
+ *** Table dot3StatsTable
+ ***
+ **********************************************************************
+ **********************************************************************/
+/*
+ * EtherLike-MIB::dot3StatsTable is subid 2 of dot3.
+ * Its status is Current.
+ * OID: .1.3.6.1.2.1.10.7.2, length: 9
+ */
+
+/**
+ * initialization for dot3StatsTable data access
+ *
+ * This function is called during startup to allow you to
+ * allocate any resources you need for the data table.
+ *
+ * @param dot3StatsTable_reg
+ *        Pointer to dot3StatsTable_registration
+ *
+ * @retval MFD_SUCCESS : success.
+ * @retval MFD_ERROR   : unrecoverable error.
+ */
+int
+dot3StatsTable_init_data(dot3StatsTable_registration * dot3StatsTable_reg)
+{
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsTable_init_data",
+                "called\n"));
+
+    /*
+     * TODO:303:o: Initialize dot3StatsTable data.
+     */
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsTable_init_data */
+
+/**
+ * container overview
+ *
+ */
+
+/**
+ * container initialization
+ *
+ * @param container_ptr_ptr A pointer to a container pointer. If you
+ *        create a custom container, use this parameter to return it
+ *        to the MFD helper. If set to NULL, the MFD helper will
+ *        allocate a container for you.
+ * @param  cache A pointer to a cache structure. You can set the timeout
+ *         and other cache flags using this pointer.
+ *
+ *  This function is called at startup to allow you to customize certain
+ *  aspects of the access method. For the most part, it is for advanced
+ *  users. The default code should suffice for most cases. If no custom
+ *  container is allocated, the MFD code will create one for your.
+ *
+ *  This is also the place to set up cache behavior. The default, to
+ *  simply set the cache timeout, will work well with the default
+ *  container. If you are using a custom container, you may want to
+ *  look at the cache helper documentation to see if there are any
+ *  flags you want to set.
+ *
+ * @remark
+ *  This would also be a good place to do any initialization needed
+ *  for you data source. For example, opening a connection to another
+ *  process that will supply the data, opening a database, etc.
+ */
+void
+dot3StatsTable_container_init(netsnmp_container ** container_ptr_ptr,
+                              netsnmp_cache * cache)
+{
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsTable_container_init",
+                "called\n"));
+
+    if (NULL == container_ptr_ptr) {
+        snmp_log(LOG_ERR,
+                 "bad container param to dot3StatsTable_container_init\n");
+        return;
+    }
+
+    /*
+     * For advanced users, you can use a custom container. If you
+     * do not create one, one will be created for you.
+     */
+    *container_ptr_ptr = NULL;
+
+    if (NULL == cache) {
+        snmp_log(LOG_ERR,
+                 "bad cache param to dot3StatsTable_container_init\n");
+        return;
+    }
+
+    /*
+     * TODO:345:A: Set up dot3StatsTable cache properties.
+     *
+     * Also for advanced users, you can set parameters for the
+     * cache. Do not change the magic pointer, as it is used
+     * by the MFD helper. To completely disable caching, set
+     * cache->enabled to 0.
+     */
+    cache->timeout = DOT3STATSTABLE_CACHE_TIMEOUT;      /* seconds */
+}                               /* dot3StatsTable_container_init */
+
+/**
+ * container shutdown
+ *
+ * @param container_ptr A pointer to the container.
+ *
+ *  This function is called at shutdown to allow you to customize certain
+ *  aspects of the access method. For the most part, it is for advanced
+ *  users. The default code should suffice for most cases.
+ *
+ *  This function is called before dot3StatsTable_container_free().
+ *
+ * @remark
+ *  This would also be a good place to do any cleanup needed
+ *  for you data source. For example, closing a connection to another
+ *  process that supplied the data, closing a database, etc.
+ */
+void
+dot3StatsTable_container_shutdown(netsnmp_container * container_ptr)
+{
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsTable_container_shutdown",
+                "called\n"));
+
+    if (NULL == container_ptr) {
+        snmp_log(LOG_ERR,
+                 "bad params to dot3StatsTable_container_shutdown\n");
+        return;
+    }
+
+}                               /* dot3StatsTable_container_shutdown */
+
+/**
+ * load initial data
+ *
+ * TODO:350:M: Implement dot3StatsTable data load
+ * This function will also be called by the cache helper to load
+ * the container again (after the container free function has been
+ * called to free the previous contents).
+ *
+ * @param container container to which items should be inserted
+ *
+ * @retval MFD_SUCCESS              : success.
+ * @retval MFD_RESOURCE_UNAVAILABLE : Can't access data source
+ * @retval MFD_ERROR                : other error.
+ *
+ *  This function is called to load the index(es) (and data, optionally)
+ *  for the every row in the data set.
+ *
+ * @remark
+ *  While loading the data, the only important thing is the indexes.
+ *  If access to your data is cheap/fast (e.g. you have a pointer to a
+ *  structure in memory), it would make sense to update the data here.
+ *  If, however, the accessing the data invovles more work (e.g. parsing
+ *  some other existing data, or peforming calculations to derive the data),
+ *  then you can limit yourself to setting the indexes and saving any
+ *  information you will need later. Then use the saved information in
+ *  dot3StatsTable_row_prep() for populating data.
+ *
+ * @note
+ *  If you need consistency between rows (like you want statistics
+ *  for each row to be from the same time frame), you should set all
+ *  data here.
+ *
+ */
+
+/*
+ *
+ * @retval  MFD_SUCCESS success
+ * @retval  MFD_ERROR could not get the interface names 
+ * @retval  MFD_RESOURCE_UNAVAILABLE failed to allocate memory
+ * @retval  -2 could not open a socket
+ */
+
+
+int
+dot3StatsTable_container_load(netsnmp_container * container)
+{
+    dot3StatsTable_rowreq_ctx *rowreq_ctx;
+    size_t          count = 0;
+    int             fd;
+#if defined(linux)
+    long            dot3StatsIndex;
+    int             rc = 0, retval = 0;
+    struct ifname *list_head = NULL, *p = NULL;
+#endif
+    
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsTable_container_load",
+                "called\n"));
+      
+    /*
+     * TODO:352:M: |   |-> set indexes in new dot3StatsTable rowreq context.
+     * data context will be set from the param (unless NULL,
+     * in which case a new data context will be allocated)
+     */
+    
+    /*
+     * temporary storage for index values
+     */
+
+    /*
+     * dot3StatsIndex(1)/InterfaceIndex/ASN_INTEGER/long(long)//l/A/w/e/R/d/H
+     */
+
+
+
+    /*
+     * create socket for ioctls
+     */
+    
+    fd = socket(AF_INET, SOCK_DGRAM, 0);
+    if(fd < 0) {
+        snmp_log(LOG_ERR, "could not create socket\n");
+        return -2;
+    }
+
+    /*
+     * get the interface names of the devices present in the system, in case of failure retval suggests the reson for failure
+     * and list_head contains null
+     */
+
+#if defined(linux)
+    list_head = dot3stats_interface_name_list_get (list_head, &retval);
+
+    if (!list_head) {
+        snmp_log (LOG_ERR, "access:dot3StatsTable, error getting the interface names present in the system\n");
+        DEBUGMSGTL(("access:dot3StatsTable", "error getting the interface names present in the system"));
+        close(fd);
+        return MFD_ERROR;
+    }
+    
+    /*
+     * Walk over the list of interface names present in the system and retreive the statistics 
+     */
+
+    for (p = list_head; p; p = p->ifn_next) {
+        DEBUGMSGTL(("access:dot3StatsTable", "processing '%s'\n", p->name));
+
+        /*
+         * get index via ioctl.
+         */
+
+        dot3StatsIndex = (long) dot3stats_interface_ioctl_ifindex_get(-1, p->name);
+
+        /* 
+         *    get the dot3stats contents populated, if the device is not an ethernet device
+         *    the operation will not be supported and an error message will be logged
+         */
+        
+        rowreq_ctx = dot3StatsTable_allocate_rowreq_ctx(NULL);
+        if (NULL == rowreq_ctx) {
+            snmp_log(LOG_ERR, "memory allocation for dot3StatsTable failed\n");
+            close(fd);
+            return MFD_RESOURCE_UNAVAILABLE;
+        }
+        
+        if (MFD_SUCCESS !=
+            dot3StatsTable_indexes_set(rowreq_ctx, dot3StatsIndex)) {
+            snmp_log(LOG_ERR,
+                     "error setting index while loading "
+                     "dot3StatsTable data.\n");
+            dot3StatsTable_release_rowreq_ctx(rowreq_ctx);
+            continue;
+        }
+
+        /*
+         * TODO:352:r: |   |-> populate dot3StatsTable data context.
+         * Populate data context here. (optionally, delay until row prep)
+         */
+        /*
+         * non-TRANSIENT data: no need to copy. set pointer to data 
+         */
+
+        memset (&rowreq_ctx->data, 0, sizeof (rowreq_ctx->data));
+        rc = interface_ioctl_dot3stats_get (rowreq_ctx, fd, p->name);
+
+        if (rc < 0) {
+            DEBUGMSGTL(("access:dot3StatsTable", "error getting the statistics for interface |%s| "
+                        "dot3StatsTable data, operation might not be supported\n", p->name));
+            dot3StatsTable_release_rowreq_ctx(rowreq_ctx);
+            continue;
+        }
+
+        rc = interface_ioctl_dot3stats_duplex_get(rowreq_ctx, fd, p->name);
+        if (rc < 0) {
+            DEBUGMSGTL(("access:dot3StatsTable", "error getting the duplex status for |%s| "
+                        "dot3StatsTable data, operation might not be supported\n", p->name));
+            dot3StatsTable_release_rowreq_ctx(rowreq_ctx);
+            continue;
+        }
+
+	interface_sysclassnet_dot3stats_get(rowreq_ctx, p->name);
+
+	interface_dot3stats_get_errorcounters(rowreq_ctx, p->name);
+
+        /*
+         * insert into table container
+         */
+        rc = CONTAINER_INSERT(container, rowreq_ctx);
+        if (rc < 0) {
+            DEBUGMSGTL(("access:dot3StatsTable", "error inserting |%s|", p->name));
+            dot3StatsTable_release_rowreq_ctx(rowreq_ctx);
+            continue;
+        }
+
+        ++count;
+    }
+
+    close(fd);
+
+    /*
+     * free the interface names list 
+     */
+
+    if ( (dot3stats_interface_name_list_free(list_head)) < 0) {
+        snmp_log(LOG_ERR, "access:dot3StatsTable, error freeing the interface name list \n");
+        DEBUGMSGTL(("access:dot3StatsTable", "error freeing the interface name list\n"));
+        return MFD_ERROR;
+    }
+#endif
+
+    DEBUGMSGT(("verbose:dot3StatsTable:dot3StatsTable_container_load",
+               "inserted %d records\n", count));
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsTable_container_load */
+
+/**
+ * container clean up
+ *
+ * @param container container with all current items
+ *
+ *  This optional callback is called prior to all
+ *  item's being removed from the container. If you
+ *  need to do any processing before that, do it here.
+ *
+ * @note
+ *  The MFD helper will take care of releasing all the row contexts.
+ *
+ */
+void
+dot3StatsTable_container_free(netsnmp_container * container)
+{
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsTable_container_free",
+                "called\n"));
+
+    /*
+     * TODO:380:M: Free dot3StatsTable container data.
+     */
+}                               /* dot3StatsTable_container_free */
+
+/**
+ * prepare row for processing.
+ *
+ *  When the agent has located the row for a request, this function is
+ *  called to prepare the row for processing. If you fully populated
+ *  the data context during the index setup phase, you may not need to
+ *  do anything.
+ *
+ * @param rowreq_ctx pointer to a context.
+ *
+ * @retval MFD_SUCCESS     : success.
+ * @retval MFD_ERROR       : other error.
+ */
+int
+dot3StatsTable_row_prep(dot3StatsTable_rowreq_ctx * rowreq_ctx)
+{
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsTable_row_prep",
+                "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    /*
+     * TODO:390:o: Prepare row for request.
+     * If populating row data was delayed, this is the place to
+     * fill in the row for this request.
+     */
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsTable_row_prep */
+
+/** @} */
diff --git a/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_access.h b/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_access.h
new file mode 100644
index 0000000..f4b39a9
--- /dev/null
+++ b/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_access.h
@@ -0,0 +1,79 @@
+/*
+ * Note: this file originally auto-generated by mib2c using
+ *       version : 14170 $ of $
+ *
+ * $Id:$
+ */
+#ifndef DOT3STATSTABLE_DATA_ACCESS_H
+#define DOT3STATSTABLE_DATA_ACCESS_H
+
+#ifdef __cplusplus
+extern          "C" {
+#endif
+
+
+    /*
+     *********************************************************************
+     * function declarations
+     */
+
+    /*
+     *********************************************************************
+     * Table declarations
+     */
+/**********************************************************************
+ **********************************************************************
+ ***
+ *** Table dot3StatsTable
+ ***
+ **********************************************************************
+ **********************************************************************/
+    /*
+     * EtherLike-MIB::dot3StatsTable is subid 2 of dot3.
+     * Its status is Current.
+     * OID: .1.3.6.1.2.1.10.7.2, length: 9
+     */
+
+
+    int             dot3StatsTable_init_data(dot3StatsTable_registration *
+                                             dot3StatsTable_reg);
+
+
+    /*
+     * TODO:180:o: Review dot3StatsTable cache timeout.
+     * The number of seconds before the cache times out
+     */
+#define DOT3STATSTABLE_CACHE_TIMEOUT   60
+
+    void            dot3StatsTable_container_init(netsnmp_container **
+                                                  container_ptr_ptr,
+                                                  netsnmp_cache * cache);
+    void            dot3StatsTable_container_shutdown(netsnmp_container *
+                                                      container_ptr);
+
+    int             dot3StatsTable_container_load(netsnmp_container *
+                                                  container);
+    void            dot3StatsTable_container_free(netsnmp_container *
+                                                  container);
+
+    int             dot3StatsTable_cache_load(netsnmp_container *
+                                              container);
+    void            dot3StatsTable_cache_free(netsnmp_container *
+                                              container);
+
+#define MAX_LINE_SIZE 256
+
+    int             dot3StatsTable_row_prep(dot3StatsTable_rowreq_ctx *
+                                            rowreq_ctx);
+
+    void            interface_sysclassnet_dot3stats_get
+        (dot3StatsTable_rowreq_ctx * rowreq_ctx, const char *name);
+    void            interface_dot3stats_get_errorcounters
+        (dot3StatsTable_rowreq_ctx * rowreq_ctx, const char *name);
+
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif                          /* DOT3STATSTABLE_DATA_ACCESS_H */
diff --git a/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_get.c b/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_get.c
new file mode 100644
index 0000000..42646e0
--- /dev/null
+++ b/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_get.c
@@ -0,0 +1,1450 @@
+/*
+ * Note: this file originally auto-generated by mib2c using
+ *       version : 12088 $ of $ 
+ *
+ * $Id:$
+ */
+/*
+ * standard Net-SNMP includes 
+ */
+#include <net-snmp/net-snmp-config.h>
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+/*
+ * include our parent header 
+ */
+#include "dot3StatsTable.h"
+
+
+/** @defgroup data_get data_get: Routines to get data
+ *
+ * TODO:230:M: Implement dot3StatsTable get routines.
+ * TODO:240:M: Implement dot3StatsTable mapping routines (if any).
+ *
+ * These routine are used to get the value for individual objects. The
+ * row context is passed, along with a pointer to the memory where the
+ * value should be copied.
+ *
+ * @{
+ */
+/**********************************************************************
+ **********************************************************************
+ ***
+ *** Table dot3StatsTable
+ ***
+ **********************************************************************
+ **********************************************************************/
+/*
+ * EtherLike-MIB::dot3StatsTable is subid 2 of dot3.
+ * Its status is Current.
+ * OID: .1.3.6.1.2.1.10.7.2, length: 9
+ */
+
+/*
+ * ---------------------------------------------------------------------
+ * * TODO:200:r: Implement dot3StatsTable data context functions.
+ */
+
+
+/**
+ * set mib index(es)
+ *
+ * @param tbl_idx mib index structure
+ * @param dot3StatsIndex_val
+ *
+ * @retval MFD_SUCCESS     : success.
+ * @retval MFD_ERROR       : other error.
+ *
+ * @remark
+ *  This convenience function is useful for setting all the MIB index
+ *  components with a single function call. It is assume that the C values
+ *  have already been mapped from their native/rawformat to the MIB format.
+ */
+int
+dot3StatsTable_indexes_set_tbl_idx(dot3StatsTable_mib_index * tbl_idx,
+                                   long dot3StatsIndex_val)
+{
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsTable_indexes_set_tbl_idx", "called\n"));
+
+    /*
+     * dot3StatsIndex(1)/InterfaceIndex/ASN_INTEGER/long(long)//l/A/w/e/R/d/H 
+     */
+    tbl_idx->dot3StatsIndex = dot3StatsIndex_val;
+
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsTable_indexes_set_tbl_idx */
+
+/**
+ * @internal
+ * set row context indexes
+ *
+ * @param reqreq_ctx the row context that needs updated indexes
+ *
+ * @retval MFD_SUCCESS     : success.
+ * @retval MFD_ERROR       : other error.
+ *
+ * @remark
+ *  This function sets the mib indexs, then updates the oid indexs
+ *  from the mib index.
+ */
+int
+dot3StatsTable_indexes_set(dot3StatsTable_rowreq_ctx * rowreq_ctx,
+                           long dot3StatsIndex_val)
+{
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsTable_indexes_set",
+                "called\n"));
+
+    if (MFD_SUCCESS !=
+        dot3StatsTable_indexes_set_tbl_idx(&rowreq_ctx->tbl_idx,
+                                           dot3StatsIndex_val))
+        return MFD_ERROR;
+
+    /*
+     * convert mib index to oid index
+     */
+    rowreq_ctx->oid_idx.len = sizeof(rowreq_ctx->oid_tmp) / sizeof(oid);
+    if (0 != dot3StatsTable_index_to_oid(&rowreq_ctx->oid_idx,
+                                         &rowreq_ctx->tbl_idx)) {
+        return MFD_ERROR;
+    }
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsTable_indexes_set */
+
+
+/*---------------------------------------------------------------------
+ * EtherLike-MIB::dot3StatsEntry.dot3StatsAlignmentErrors
+ * dot3StatsAlignmentErrors is subid 2 of dot3StatsEntry.
+ * Its status is Current, and its access level is ReadOnly.
+ * OID: .1.3.6.1.2.1.10.7.2.1.2
+ * Description:
+A count of frames received on a particular
+                    interface that are not an integral number of
+                    octets in length and do not pass the FCS check.
+
+                    The count represented by an instance of this
+                    object is incremented when the alignmentError
+                    status is returned by the MAC service to the
+                    LLC (or other MAC user). Received frames for
+                    which multiple error conditions pertain are,
+                    according to the conventions of IEEE 802.3
+                    Layer Management, counted exclusively according
+
+                    to the error status presented to the LLC.
+
+                    This counter does not increment for group
+                    encoding schemes greater than 4 bits per group.
+
+                    For interfaces operating at 10 Gb/s, this
+                    counter can roll over in less than 5 minutes if
+                    it is incrementing at its maximum rate.  Since
+                    that amount of time could be less than a
+                    management station's poll cycle time, in order
+                    to avoid a loss of information, a management
+                    station is advised to poll the
+                    dot3HCStatsAlignmentErrors object for 10 Gb/s
+                    or faster interfaces.
+
+                    Discontinuities in the value of this counter can
+                    occur at re-initialization of the management
+                    system, and at other times as indicated by the
+                    value of ifCounterDiscontinuityTime.
+ *
+ * Attributes:
+ *   accessible 1     isscalar 0     enums  0      hasdefval 0
+ *   readable   1     iscolumn 1     ranges 0      hashint   0
+ *   settable   0
+ *
+ *
+ * Its syntax is COUNTER (based on perltype COUNTER)
+ * The net-snmp type is ASN_COUNTER. The C type decl is u_long (u_long)
+ */
+/**
+ * Extract the current value of the dot3StatsAlignmentErrors data.
+ *
+ * Set a value using the data context for the row.
+ *
+ * @param rowreq_ctx
+ *        Pointer to the row request context.
+ * @param dot3StatsAlignmentErrors_val_ptr
+ *        Pointer to storage for a u_long variable
+ *
+ * @retval MFD_SUCCESS         : success
+ * @retval MFD_SKIP            : skip this node (no value for now)
+ * @retval MFD_ERROR           : Any other error
+ */
+int
+dot3StatsAlignmentErrors_get(dot3StatsTable_rowreq_ctx * rowreq_ctx,
+                             u_long * dot3StatsAlignmentErrors_val_ptr)
+{
+   /** we should have a non-NULL pointer */
+    netsnmp_assert(NULL != dot3StatsAlignmentErrors_val_ptr);
+
+
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsAlignmentErrors_get",
+                "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    /*
+     * TODO:231:o: |-> Extract the current value of the dot3StatsAlignmentErrors data.
+     * copy (* dot3StatsAlignmentErrors_val_ptr ) from rowreq_ctx->data
+     */
+    (*dot3StatsAlignmentErrors_val_ptr) =
+        rowreq_ctx->data.dot3StatsAlignmentErrors;
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsAlignmentErrors_get */
+
+/*---------------------------------------------------------------------
+ * EtherLike-MIB::dot3StatsEntry.dot3StatsFCSErrors
+ * dot3StatsFCSErrors is subid 3 of dot3StatsEntry.
+ * Its status is Current, and its access level is ReadOnly.
+ * OID: .1.3.6.1.2.1.10.7.2.1.3
+ * Description:
+A count of frames received on a particular
+                    interface that are an integral number of octets
+                    in length but do not pass the FCS check.  This
+                    count does not include frames received with
+                    frame-too-long or frame-too-short error.
+
+                    The count represented by an instance of this
+                    object is incremented when the frameCheckError
+                    status is returned by the MAC service to the
+                    LLC (or other MAC user). Received frames for
+                    which multiple error conditions pertain are,
+                    according to the conventions of IEEE 802.3
+                    Layer Management, counted exclusively according
+                    to the error status presented to the LLC.
+
+                    Note:  Coding errors detected by the physical
+                    layer for speeds above 10 Mb/s will cause the
+                    frame to fail the FCS check.
+
+                    For interfaces operating at 10 Gb/s, this
+                    counter can roll over in less than 5 minutes if
+
+                    it is incrementing at its maximum rate.  Since
+                    that amount of time could be less than a
+                    management station's poll cycle time, in order
+                    to avoid a loss of information, a management
+                    station is advised to poll the
+                    dot3HCStatsFCSErrors object for 10 Gb/s or
+                    faster interfaces.
+
+                    Discontinuities in the value of this counter can
+                    occur at re-initialization of the management
+                    system, and at other times as indicated by the
+                    value of ifCounterDiscontinuityTime.
+ *
+ * Attributes:
+ *   accessible 1     isscalar 0     enums  0      hasdefval 0
+ *   readable   1     iscolumn 1     ranges 0      hashint   0
+ *   settable   0
+ *
+ *
+ * Its syntax is COUNTER (based on perltype COUNTER)
+ * The net-snmp type is ASN_COUNTER. The C type decl is u_long (u_long)
+ */
+/**
+ * Extract the current value of the dot3StatsFCSErrors data.
+ *
+ * Set a value using the data context for the row.
+ *
+ * @param rowreq_ctx
+ *        Pointer to the row request context.
+ * @param dot3StatsFCSErrors_val_ptr
+ *        Pointer to storage for a u_long variable
+ *
+ * @retval MFD_SUCCESS         : success
+ * @retval MFD_SKIP            : skip this node (no value for now)
+ * @retval MFD_ERROR           : Any other error
+ */
+int
+dot3StatsFCSErrors_get(dot3StatsTable_rowreq_ctx * rowreq_ctx,
+                       u_long * dot3StatsFCSErrors_val_ptr)
+{
+   /** we should have a non-NULL pointer */
+    netsnmp_assert(NULL != dot3StatsFCSErrors_val_ptr);
+
+
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsFCSErrors_get",
+                "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    /*
+     * TODO:231:o: |-> Extract the current value of the dot3StatsFCSErrors data.
+     * copy (* dot3StatsFCSErrors_val_ptr ) from rowreq_ctx->data
+     */
+    (*dot3StatsFCSErrors_val_ptr) = rowreq_ctx->data.dot3StatsFCSErrors;
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsFCSErrors_get */
+
+/*---------------------------------------------------------------------
+ * EtherLike-MIB::dot3StatsEntry.dot3StatsSingleCollisionFrames
+ * dot3StatsSingleCollisionFrames is subid 4 of dot3StatsEntry.
+ * Its status is Current, and its access level is ReadOnly.
+ * OID: .1.3.6.1.2.1.10.7.2.1.4
+ * Description:
+A count of frames that are involved in a single
+                    collision, and are subsequently transmitted
+                    successfully.
+
+                    A frame that is counted by an instance of this
+                    object is also counted by the corresponding
+                    instance of either the ifOutUcastPkts,
+                    ifOutMulticastPkts, or ifOutBroadcastPkts,
+                    and is not counted by the corresponding
+                    instance of the dot3StatsMultipleCollisionFrames
+                    object.
+
+                    This counter does not increment when the
+                    interface is operating in full-duplex mode.
+
+                    Discontinuities in the value of this counter can
+                    occur at re-initialization of the management
+                    system, and at other times as indicated by the
+                    value of ifCounterDiscontinuityTime.
+ *
+ * Attributes:
+ *   accessible 1     isscalar 0     enums  0      hasdefval 0
+ *   readable   1     iscolumn 1     ranges 0      hashint   0
+ *   settable   0
+ *
+ *
+ * Its syntax is COUNTER (based on perltype COUNTER)
+ * The net-snmp type is ASN_COUNTER. The C type decl is u_long (u_long)
+ */
+/**
+ * Extract the current value of the dot3StatsSingleCollisionFrames data.
+ *
+ * Set a value using the data context for the row.
+ *
+ * @param rowreq_ctx
+ *        Pointer to the row request context.
+ * @param dot3StatsSingleCollisionFrames_val_ptr
+ *        Pointer to storage for a u_long variable
+ *
+ * @retval MFD_SUCCESS         : success
+ * @retval MFD_SKIP            : skip this node (no value for now)
+ * @retval MFD_ERROR           : Any other error
+ */
+int
+dot3StatsSingleCollisionFrames_get(dot3StatsTable_rowreq_ctx * rowreq_ctx,
+                                   u_long *
+                                   dot3StatsSingleCollisionFrames_val_ptr)
+{
+   /** we should have a non-NULL pointer */
+    netsnmp_assert(NULL != dot3StatsSingleCollisionFrames_val_ptr);
+
+
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsSingleCollisionFrames_get", "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    /*
+     * TODO:231:o: |-> Extract the current value of the dot3StatsSingleCollisionFrames data.
+     * copy (* dot3StatsSingleCollisionFrames_val_ptr ) from rowreq_ctx->data
+     */
+    (*dot3StatsSingleCollisionFrames_val_ptr) =
+        rowreq_ctx->data.dot3StatsSingleCollisionFrames;
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsSingleCollisionFrames_get */
+
+/*---------------------------------------------------------------------
+ * EtherLike-MIB::dot3StatsEntry.dot3StatsMultipleCollisionFrames
+ * dot3StatsMultipleCollisionFrames is subid 5 of dot3StatsEntry.
+ * Its status is Current, and its access level is ReadOnly.
+ * OID: .1.3.6.1.2.1.10.7.2.1.5
+ * Description:
+A count of frames that are involved in more
+
+                    than one collision and are subsequently
+                    transmitted successfully.
+
+                    A frame that is counted by an instance of this
+                    object is also counted by the corresponding
+                    instance of either the ifOutUcastPkts,
+                    ifOutMulticastPkts, or ifOutBroadcastPkts,
+                    and is not counted by the corresponding
+                    instance of the dot3StatsSingleCollisionFrames
+                    object.
+
+                    This counter does not increment when the
+                    interface is operating in full-duplex mode.
+
+                    Discontinuities in the value of this counter can
+                    occur at re-initialization of the management
+                    system, and at other times as indicated by the
+                    value of ifCounterDiscontinuityTime.
+ *
+ * Attributes:
+ *   accessible 1     isscalar 0     enums  0      hasdefval 0
+ *   readable   1     iscolumn 1     ranges 0      hashint   0
+ *   settable   0
+ *
+ *
+ * Its syntax is COUNTER (based on perltype COUNTER)
+ * The net-snmp type is ASN_COUNTER. The C type decl is u_long (u_long)
+ */
+/**
+ * Extract the current value of the dot3StatsMultipleCollisionFrames data.
+ *
+ * Set a value using the data context for the row.
+ *
+ * @param rowreq_ctx
+ *        Pointer to the row request context.
+ * @param dot3StatsMultipleCollisionFrames_val_ptr
+ *        Pointer to storage for a u_long variable
+ *
+ * @retval MFD_SUCCESS         : success
+ * @retval MFD_SKIP            : skip this node (no value for now)
+ * @retval MFD_ERROR           : Any other error
+ */
+int
+dot3StatsMultipleCollisionFrames_get(dot3StatsTable_rowreq_ctx *
+                                     rowreq_ctx,
+                                     u_long *
+                                     dot3StatsMultipleCollisionFrames_val_ptr)
+{
+   /** we should have a non-NULL pointer */
+    netsnmp_assert(NULL != dot3StatsMultipleCollisionFrames_val_ptr);
+
+
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsMultipleCollisionFrames_get", "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    /*
+     * TODO:231:o: |-> Extract the current value of the dot3StatsMultipleCollisionFrames data.
+     * copy (* dot3StatsMultipleCollisionFrames_val_ptr ) from rowreq_ctx->data
+     */
+    (*dot3StatsMultipleCollisionFrames_val_ptr) =
+        rowreq_ctx->data.dot3StatsMultipleCollisionFrames;
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsMultipleCollisionFrames_get */
+
+/*---------------------------------------------------------------------
+ * EtherLike-MIB::dot3StatsEntry.dot3StatsSQETestErrors
+ * dot3StatsSQETestErrors is subid 6 of dot3StatsEntry.
+ * Its status is Current, and its access level is ReadOnly.
+ * OID: .1.3.6.1.2.1.10.7.2.1.6
+ * Description:
+A count of times that the SQE TEST ERROR
+                    is received on a particular interface. The
+                    SQE TEST ERROR is set in accordance with the
+                    rules for verification of the SQE detection
+                    mechanism in the PLS Carrier Sense Function as
+                    described in IEEE Std. 802.3, 2000 Edition,
+                    section 7.2.4.6.
+
+                    This counter does not increment on interfaces
+                    operating at speeds greater than 10 Mb/s, or on
+                    interfaces operating in full-duplex mode.
+
+                    Discontinuities in the value of this counter can
+                    occur at re-initialization of the management
+                    system, and at other times as indicated by the
+                    value of ifCounterDiscontinuityTime.
+ *
+ * Attributes:
+ *   accessible 1     isscalar 0     enums  0      hasdefval 0
+ *   readable   1     iscolumn 1     ranges 0      hashint   0
+ *   settable   0
+ *
+ *
+ * Its syntax is COUNTER (based on perltype COUNTER)
+ * The net-snmp type is ASN_COUNTER. The C type decl is u_long (u_long)
+ */
+/**
+ * Extract the current value of the dot3StatsSQETestErrors data.
+ *
+ * Set a value using the data context for the row.
+ *
+ * @param rowreq_ctx
+ *        Pointer to the row request context.
+ * @param dot3StatsSQETestErrors_val_ptr
+ *        Pointer to storage for a u_long variable
+ *
+ * @retval MFD_SUCCESS         : success
+ * @retval MFD_SKIP            : skip this node (no value for now)
+ * @retval MFD_ERROR           : Any other error
+ */
+int
+dot3StatsSQETestErrors_get(dot3StatsTable_rowreq_ctx * rowreq_ctx,
+                           u_long * dot3StatsSQETestErrors_val_ptr)
+{
+   /** we should have a non-NULL pointer */
+    netsnmp_assert(NULL != dot3StatsSQETestErrors_val_ptr);
+
+
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsSQETestErrors_get",
+                "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    /*
+     * TODO:231:o: |-> Extract the current value of the dot3StatsSQETestErrors data.
+     * copy (* dot3StatsSQETestErrors_val_ptr ) from rowreq_ctx->data
+     */
+    (*dot3StatsSQETestErrors_val_ptr) =
+        rowreq_ctx->data.dot3StatsSQETestErrors;
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsSQETestErrors_get */
+
+/*---------------------------------------------------------------------
+ * EtherLike-MIB::dot3StatsEntry.dot3StatsDeferredTransmissions
+ * dot3StatsDeferredTransmissions is subid 7 of dot3StatsEntry.
+ * Its status is Current, and its access level is ReadOnly.
+ * OID: .1.3.6.1.2.1.10.7.2.1.7
+ * Description:
+A count of frames for which the first
+                    transmission attempt on a particular interface
+                    is delayed because the medium is busy.
+
+                    The count represented by an instance of this
+                    object does not include frames involved in
+                    collisions.
+
+                    This counter does not increment when the
+                    interface is operating in full-duplex mode.
+
+                    Discontinuities in the value of this counter can
+                    occur at re-initialization of the management
+                    system, and at other times as indicated by the
+                    value of ifCounterDiscontinuityTime.
+ *
+ * Attributes:
+ *   accessible 1     isscalar 0     enums  0      hasdefval 0
+ *   readable   1     iscolumn 1     ranges 0      hashint   0
+ *   settable   0
+ *
+ *
+ * Its syntax is COUNTER (based on perltype COUNTER)
+ * The net-snmp type is ASN_COUNTER. The C type decl is u_long (u_long)
+ */
+/**
+ * Extract the current value of the dot3StatsDeferredTransmissions data.
+ *
+ * Set a value using the data context for the row.
+ *
+ * @param rowreq_ctx
+ *        Pointer to the row request context.
+ * @param dot3StatsDeferredTransmissions_val_ptr
+ *        Pointer to storage for a u_long variable
+ *
+ * @retval MFD_SUCCESS         : success
+ * @retval MFD_SKIP            : skip this node (no value for now)
+ * @retval MFD_ERROR           : Any other error
+ */
+int
+dot3StatsDeferredTransmissions_get(dot3StatsTable_rowreq_ctx * rowreq_ctx,
+                                   u_long *
+                                   dot3StatsDeferredTransmissions_val_ptr)
+{
+   /** we should have a non-NULL pointer */
+    netsnmp_assert(NULL != dot3StatsDeferredTransmissions_val_ptr);
+
+
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsDeferredTransmissions_get", "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    /*
+     * TODO:231:o: |-> Extract the current value of the dot3StatsDeferredTransmissions data.
+     * copy (* dot3StatsDeferredTransmissions_val_ptr ) from rowreq_ctx->data
+     */
+    (*dot3StatsDeferredTransmissions_val_ptr) =
+        rowreq_ctx->data.dot3StatsDeferredTransmissions;
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsDeferredTransmissions_get */
+
+/*---------------------------------------------------------------------
+ * EtherLike-MIB::dot3StatsEntry.dot3StatsLateCollisions
+ * dot3StatsLateCollisions is subid 8 of dot3StatsEntry.
+ * Its status is Current, and its access level is ReadOnly.
+ * OID: .1.3.6.1.2.1.10.7.2.1.8
+ * Description:
+The number of times that a collision is
+                    detected on a particular interface later than
+                    one slotTime into the transmission of a packet.
+
+                    A (late) collision included in a count
+                    represented by an instance of this object is
+                    also considered as a (generic) collision for
+                    purposes of other collision-related
+                    statistics.
+
+                    This counter does not increment when the
+                    interface is operating in full-duplex mode.
+
+                    Discontinuities in the value of this counter can
+                    occur at re-initialization of the management
+                    system, and at other times as indicated by the
+                    value of ifCounterDiscontinuityTime.
+ *
+ * Attributes:
+ *   accessible 1     isscalar 0     enums  0      hasdefval 0
+ *   readable   1     iscolumn 1     ranges 0      hashint   0
+ *   settable   0
+ *
+ *
+ * Its syntax is COUNTER (based on perltype COUNTER)
+ * The net-snmp type is ASN_COUNTER. The C type decl is u_long (u_long)
+ */
+/**
+ * Extract the current value of the dot3StatsLateCollisions data.
+ *
+ * Set a value using the data context for the row.
+ *
+ * @param rowreq_ctx
+ *        Pointer to the row request context.
+ * @param dot3StatsLateCollisions_val_ptr
+ *        Pointer to storage for a u_long variable
+ *
+ * @retval MFD_SUCCESS         : success
+ * @retval MFD_SKIP            : skip this node (no value for now)
+ * @retval MFD_ERROR           : Any other error
+ */
+int
+dot3StatsLateCollisions_get(dot3StatsTable_rowreq_ctx * rowreq_ctx,
+                            u_long * dot3StatsLateCollisions_val_ptr)
+{
+   /** we should have a non-NULL pointer */
+    netsnmp_assert(NULL != dot3StatsLateCollisions_val_ptr);
+
+
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsLateCollisions_get",
+                "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    /*
+     * TODO:231:o: |-> Extract the current value of the dot3StatsLateCollisions data.
+     * copy (* dot3StatsLateCollisions_val_ptr ) from rowreq_ctx->data
+     */
+    (*dot3StatsLateCollisions_val_ptr) =
+        rowreq_ctx->data.dot3StatsLateCollisions;
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsLateCollisions_get */
+
+/*---------------------------------------------------------------------
+ * EtherLike-MIB::dot3StatsEntry.dot3StatsExcessiveCollisions
+ * dot3StatsExcessiveCollisions is subid 9 of dot3StatsEntry.
+ * Its status is Current, and its access level is ReadOnly.
+ * OID: .1.3.6.1.2.1.10.7.2.1.9
+ * Description:
+A count of frames for which transmission on a
+                    particular interface fails due to excessive
+                    collisions.
+
+                    This counter does not increment when the
+                    interface is operating in full-duplex mode.
+
+                    Discontinuities in the value of this counter can
+                    occur at re-initialization of the management
+                    system, and at other times as indicated by the
+                    value of ifCounterDiscontinuityTime.
+ *
+ * Attributes:
+ *   accessible 1     isscalar 0     enums  0      hasdefval 0
+ *   readable   1     iscolumn 1     ranges 0      hashint   0
+ *   settable   0
+ *
+ *
+ * Its syntax is COUNTER (based on perltype COUNTER)
+ * The net-snmp type is ASN_COUNTER. The C type decl is u_long (u_long)
+ */
+/**
+ * Extract the current value of the dot3StatsExcessiveCollisions data.
+ *
+ * Set a value using the data context for the row.
+ *
+ * @param rowreq_ctx
+ *        Pointer to the row request context.
+ * @param dot3StatsExcessiveCollisions_val_ptr
+ *        Pointer to storage for a u_long variable
+ *
+ * @retval MFD_SUCCESS         : success
+ * @retval MFD_SKIP            : skip this node (no value for now)
+ * @retval MFD_ERROR           : Any other error
+ */
+int
+dot3StatsExcessiveCollisions_get(dot3StatsTable_rowreq_ctx * rowreq_ctx,
+                                 u_long *
+                                 dot3StatsExcessiveCollisions_val_ptr)
+{
+   /** we should have a non-NULL pointer */
+    netsnmp_assert(NULL != dot3StatsExcessiveCollisions_val_ptr);
+
+
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsExcessiveCollisions_get",
+                "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    /*
+     * TODO:231:o: |-> Extract the current value of the dot3StatsExcessiveCollisions data.
+     * copy (* dot3StatsExcessiveCollisions_val_ptr ) from rowreq_ctx->data
+     */
+    (*dot3StatsExcessiveCollisions_val_ptr) =
+        rowreq_ctx->data.dot3StatsExcessiveCollisions;
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsExcessiveCollisions_get */
+
+/*---------------------------------------------------------------------
+ * EtherLike-MIB::dot3StatsEntry.dot3StatsInternalMacTransmitErrors
+ * dot3StatsInternalMacTransmitErrors is subid 10 of dot3StatsEntry.
+ * Its status is Current, and its access level is ReadOnly.
+ * OID: .1.3.6.1.2.1.10.7.2.1.10
+ * Description:
+A count of frames for which transmission on a
+                    particular interface fails due to an internal
+                    MAC sublayer transmit error. A frame is only
+                    counted by an instance of this object if it is
+                    not counted by the corresponding instance of
+                    either the dot3StatsLateCollisions object, the
+                    dot3StatsExcessiveCollisions object, or the
+                    dot3StatsCarrierSenseErrors object.
+
+                    The precise meaning of the count represented by
+                    an instance of this object is implementation-
+                    specific.  In particular, an instance of this
+                    object may represent a count of transmission
+                    errors on a particular interface that are not
+                    otherwise counted.
+
+                    For interfaces operating at 10 Gb/s, this
+                    counter can roll over in less than 5 minutes if
+                    it is incrementing at its maximum rate.  Since
+                    that amount of time could be less than a
+                    management station's poll cycle time, in order
+                    to avoid a loss of information, a management
+                    station is advised to poll the
+                    dot3HCStatsInternalMacTransmitErrors object for
+                    10 Gb/s or faster interfaces.
+
+                    Discontinuities in the value of this counter can
+
+                    occur at re-initialization of the management
+                    system, and at other times as indicated by the
+                    value of ifCounterDiscontinuityTime.
+ *
+ * Attributes:
+ *   accessible 1     isscalar 0     enums  0      hasdefval 0
+ *   readable   1     iscolumn 1     ranges 0      hashint   0
+ *   settable   0
+ *
+ *
+ * Its syntax is COUNTER (based on perltype COUNTER)
+ * The net-snmp type is ASN_COUNTER. The C type decl is u_long (u_long)
+ */
+/**
+ * Extract the current value of the dot3StatsInternalMacTransmitErrors data.
+ *
+ * Set a value using the data context for the row.
+ *
+ * @param rowreq_ctx
+ *        Pointer to the row request context.
+ * @param dot3StatsInternalMacTransmitErrors_val_ptr
+ *        Pointer to storage for a u_long variable
+ *
+ * @retval MFD_SUCCESS         : success
+ * @retval MFD_SKIP            : skip this node (no value for now)
+ * @retval MFD_ERROR           : Any other error
+ */
+int
+dot3StatsInternalMacTransmitErrors_get(dot3StatsTable_rowreq_ctx *
+                                       rowreq_ctx,
+                                       u_long *
+                                       dot3StatsInternalMacTransmitErrors_val_ptr)
+{
+   /** we should have a non-NULL pointer */
+    netsnmp_assert(NULL != dot3StatsInternalMacTransmitErrors_val_ptr);
+
+
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsInternalMacTransmitErrors_get", "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    /*
+     * TODO:231:o: |-> Extract the current value of the dot3StatsInternalMacTransmitErrors data.
+     * copy (* dot3StatsInternalMacTransmitErrors_val_ptr ) from rowreq_ctx->data
+     */
+    (*dot3StatsInternalMacTransmitErrors_val_ptr) =
+        rowreq_ctx->data.dot3StatsInternalMacTransmitErrors;
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsInternalMacTransmitErrors_get */
+
+/*---------------------------------------------------------------------
+ * EtherLike-MIB::dot3StatsEntry.dot3StatsCarrierSenseErrors
+ * dot3StatsCarrierSenseErrors is subid 11 of dot3StatsEntry.
+ * Its status is Current, and its access level is ReadOnly.
+ * OID: .1.3.6.1.2.1.10.7.2.1.11
+ * Description:
+The number of times that the carrier sense
+                    condition was lost or never asserted when
+                    attempting to transmit a frame on a particular
+                    interface.
+
+                    The count represented by an instance of this
+                    object is incremented at most once per
+                    transmission attempt, even if the carrier sense
+                    condition fluctuates during a transmission
+                    attempt.
+
+                    This counter does not increment when the
+                    interface is operating in full-duplex mode.
+
+                    Discontinuities in the value of this counter can
+                    occur at re-initialization of the management
+                    system, and at other times as indicated by the
+                    value of ifCounterDiscontinuityTime.
+ *
+ * Attributes:
+ *   accessible 1     isscalar 0     enums  0      hasdefval 0
+ *   readable   1     iscolumn 1     ranges 0      hashint   0
+ *   settable   0
+ *
+ *
+ * Its syntax is COUNTER (based on perltype COUNTER)
+ * The net-snmp type is ASN_COUNTER. The C type decl is u_long (u_long)
+ */
+/**
+ * Extract the current value of the dot3StatsCarrierSenseErrors data.
+ *
+ * Set a value using the data context for the row.
+ *
+ * @param rowreq_ctx
+ *        Pointer to the row request context.
+ * @param dot3StatsCarrierSenseErrors_val_ptr
+ *        Pointer to storage for a u_long variable
+ *
+ * @retval MFD_SUCCESS         : success
+ * @retval MFD_SKIP            : skip this node (no value for now)
+ * @retval MFD_ERROR           : Any other error
+ */
+int
+dot3StatsCarrierSenseErrors_get(dot3StatsTable_rowreq_ctx * rowreq_ctx,
+                                u_long *
+                                dot3StatsCarrierSenseErrors_val_ptr)
+{
+   /** we should have a non-NULL pointer */
+    netsnmp_assert(NULL != dot3StatsCarrierSenseErrors_val_ptr);
+
+
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsCarrierSenseErrors_get",
+                "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    /*
+     * TODO:231:o: |-> Extract the current value of the dot3StatsCarrierSenseErrors data.
+     * copy (* dot3StatsCarrierSenseErrors_val_ptr ) from rowreq_ctx->data
+     */
+    (*dot3StatsCarrierSenseErrors_val_ptr) =
+        rowreq_ctx->data.dot3StatsCarrierSenseErrors;
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsCarrierSenseErrors_get */
+
+/*---------------------------------------------------------------------
+ * EtherLike-MIB::dot3StatsEntry.dot3StatsFrameTooLongs
+ * dot3StatsFrameTooLongs is subid 13 of dot3StatsEntry.
+ * Its status is Current, and its access level is ReadOnly.
+ * OID: .1.3.6.1.2.1.10.7.2.1.13
+ * Description:
+A count of frames received on a particular
+                    interface that exceed the maximum permitted
+                    frame size.
+
+                    The count represented by an instance of this
+                    object is incremented when the frameTooLong
+                    status is returned by the MAC service to the
+                    LLC (or other MAC user). Received frames for
+                    which multiple error conditions pertain are,
+                    according to the conventions of IEEE 802.3
+                    Layer Management, counted exclusively according
+                    to the error status presented to the LLC.
+
+                    For interfaces operating at 10 Gb/s, this
+                    counter can roll over in less than 80 minutes if
+                    it is incrementing at its maximum rate.  Since
+                    that amount of time could be less than a
+                    management station's poll cycle time, in order
+                    to avoid a loss of information, a management
+                    station is advised to poll the
+                    dot3HCStatsFrameTooLongs object for 10 Gb/s
+                    or faster interfaces.
+
+                    Discontinuities in the value of this counter can
+                    occur at re-initialization of the management
+                    system, and at other times as indicated by the
+                    value of ifCounterDiscontinuityTime.
+ *
+ * Attributes:
+ *   accessible 1     isscalar 0     enums  0      hasdefval 0
+ *   readable   1     iscolumn 1     ranges 0      hashint   0
+ *   settable   0
+ *
+ *
+ * Its syntax is COUNTER (based on perltype COUNTER)
+ * The net-snmp type is ASN_COUNTER. The C type decl is u_long (u_long)
+ */
+/**
+ * Extract the current value of the dot3StatsFrameTooLongs data.
+ *
+ * Set a value using the data context for the row.
+ *
+ * @param rowreq_ctx
+ *        Pointer to the row request context.
+ * @param dot3StatsFrameTooLongs_val_ptr
+ *        Pointer to storage for a u_long variable
+ *
+ * @retval MFD_SUCCESS         : success
+ * @retval MFD_SKIP            : skip this node (no value for now)
+ * @retval MFD_ERROR           : Any other error
+ */
+int
+dot3StatsFrameTooLongs_get(dot3StatsTable_rowreq_ctx * rowreq_ctx,
+                           u_long * dot3StatsFrameTooLongs_val_ptr)
+{
+   /** we should have a non-NULL pointer */
+    netsnmp_assert(NULL != dot3StatsFrameTooLongs_val_ptr);
+
+
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsFrameTooLongs_get",
+                "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    /*
+     * TODO:231:o: |-> Extract the current value of the dot3StatsFrameTooLongs data.
+     * copy (* dot3StatsFrameTooLongs_val_ptr ) from rowreq_ctx->data
+     */
+    (*dot3StatsFrameTooLongs_val_ptr) =
+        rowreq_ctx->data.dot3StatsFrameTooLongs;
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsFrameTooLongs_get */
+
+/*---------------------------------------------------------------------
+ * EtherLike-MIB::dot3StatsEntry.dot3StatsInternalMacReceiveErrors
+ * dot3StatsInternalMacReceiveErrors is subid 16 of dot3StatsEntry.
+ * Its status is Current, and its access level is ReadOnly.
+ * OID: .1.3.6.1.2.1.10.7.2.1.16
+ * Description:
+A count of frames for which reception on a
+                    particular interface fails due to an internal
+                    MAC sublayer receive error. A frame is only
+                    counted by an instance of this object if it is
+                    not counted by the corresponding instance of
+                    either the dot3StatsFrameTooLongs object, the
+                    dot3StatsAlignmentErrors object, or the
+                    dot3StatsFCSErrors object.
+
+                    The precise meaning of the count represented by
+                    an instance of this object is implementation-
+                    specific.  In particular, an instance of this
+                    object may represent a count of receive errors
+                    on a particular interface that are not
+                    otherwise counted.
+
+                    For interfaces operating at 10 Gb/s, this
+                    counter can roll over in less than 5 minutes if
+
+                    it is incrementing at its maximum rate.  Since
+                    that amount of time could be less than a
+                    management station's poll cycle time, in order
+                    to avoid a loss of information, a management
+                    station is advised to poll the
+                    dot3HCStatsInternalMacReceiveErrors object for
+                    10 Gb/s or faster interfaces.
+
+                    Discontinuities in the value of this counter can
+                    occur at re-initialization of the management
+                    system, and at other times as indicated by the
+                    value of ifCounterDiscontinuityTime.
+ *
+ * Attributes:
+ *   accessible 1     isscalar 0     enums  0      hasdefval 0
+ *   readable   1     iscolumn 1     ranges 0      hashint   0
+ *   settable   0
+ *
+ *
+ * Its syntax is COUNTER (based on perltype COUNTER)
+ * The net-snmp type is ASN_COUNTER. The C type decl is u_long (u_long)
+ */
+/**
+ * Extract the current value of the dot3StatsInternalMacReceiveErrors data.
+ *
+ * Set a value using the data context for the row.
+ *
+ * @param rowreq_ctx
+ *        Pointer to the row request context.
+ * @param dot3StatsInternalMacReceiveErrors_val_ptr
+ *        Pointer to storage for a u_long variable
+ *
+ * @retval MFD_SUCCESS         : success
+ * @retval MFD_SKIP            : skip this node (no value for now)
+ * @retval MFD_ERROR           : Any other error
+ */
+int
+dot3StatsInternalMacReceiveErrors_get(dot3StatsTable_rowreq_ctx *
+                                      rowreq_ctx,
+                                      u_long *
+                                      dot3StatsInternalMacReceiveErrors_val_ptr)
+{
+   /** we should have a non-NULL pointer */
+    netsnmp_assert(NULL != dot3StatsInternalMacReceiveErrors_val_ptr);
+
+
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsInternalMacReceiveErrors_get", "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    /*
+     * TODO:231:o: |-> Extract the current value of the dot3StatsInternalMacReceiveErrors data.
+     * copy (* dot3StatsInternalMacReceiveErrors_val_ptr ) from rowreq_ctx->data
+     */
+    (*dot3StatsInternalMacReceiveErrors_val_ptr) =
+        rowreq_ctx->data.dot3StatsInternalMacReceiveErrors;
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsInternalMacReceiveErrors_get */
+
+/*---------------------------------------------------------------------
+ * EtherLike-MIB::dot3StatsEntry.dot3StatsEtherChipSet
+ * dot3StatsEtherChipSet is subid 17 of dot3StatsEntry.
+ * Its status is Deprecated, and its access level is ReadOnly.
+ * OID: .1.3.6.1.2.1.10.7.2.1.17
+ * Description:
+******** THIS OBJECT IS DEPRECATED ********
+
+                    This object contains an OBJECT IDENTIFIER
+                    which identifies the chipset used to
+                    realize the interface. Ethernet-like
+                    interfaces are typically built out of
+                    several different chips. The MIB implementor
+                    is presented with a decision of which chip
+                    to identify via this object. The implementor
+                    should identify the chip which is usually
+                    called the Medium Access Control chip.
+                    If no such chip is easily identifiable,
+                    the implementor should identify the chip
+                    which actually gathers the transmit
+                    and receive statistics and error
+                    indications. This would allow a
+                    manager station to correlate the
+                    statistics and the chip generating
+                    them, giving it the ability to take
+                    into account any known anomalies
+                    in the chip.
+
+                    This object has been deprecated.  Implementation
+                    feedback indicates that it is of limited use for
+                    debugging network problems in the field, and
+                    the administrative overhead involved in
+                    maintaining a registry of chipset OIDs is not
+                    justified.
+ *
+ * Attributes:
+ *   accessible 1     isscalar 0     enums  0      hasdefval 0
+ *   readable   1     iscolumn 1     ranges 0      hashint   0
+ *   settable   0
+ *
+ *
+ * Its syntax is OBJECTID (based on perltype OBJECTID)
+ * The net-snmp type is ASN_OBJECT_ID. The C type decl is oid (oid)
+ * This data type requires a length.
+ */
+/**
+ * Extract the current value of the dot3StatsEtherChipSet data.
+ *
+ * Set a value using the data context for the row.
+ *
+ * @param rowreq_ctx
+ *        Pointer to the row request context.
+ * @param dot3StatsEtherChipSet_val_ptr_ptr
+ *        Pointer to storage for a oid variable
+ * @param dot3StatsEtherChipSet_val_ptr_len_ptr
+ *        Pointer to a size_t. On entry, it will contain the size (in bytes)
+ *        pointed to by dot3StatsEtherChipSet.
+ *        On exit, this value should contain the data size (in bytes).
+ *
+ * @retval MFD_SUCCESS         : success
+ * @retval MFD_SKIP            : skip this node (no value for now)
+ * @retval MFD_ERROR           : Any other error
+*
+ * @note If you need more than (*dot3StatsEtherChipSet_val_ptr_len_ptr) bytes of memory,
+ *       allocate it using malloc() and update dot3StatsEtherChipSet_val_ptr_ptr.
+ *       <b>DO NOT</b> free the previous pointer.
+ *       The MFD helper will release the memory you allocate.
+ *
+ * @remark If you call this function yourself, you are responsible
+ *         for checking if the pointer changed, and freeing any
+ *         previously allocated memory. (Not necessary if you pass
+ *         in a pointer to static memory, obviously.)
+ */
+int
+dot3StatsEtherChipSet_get(dot3StatsTable_rowreq_ctx * rowreq_ctx,
+                          oid ** dot3StatsEtherChipSet_val_ptr_ptr,
+                          size_t *dot3StatsEtherChipSet_val_ptr_len_ptr)
+{
+   /** we should have a non-NULL pointer and enough storage */
+    netsnmp_assert((NULL != dot3StatsEtherChipSet_val_ptr_ptr)
+                   && (NULL != *dot3StatsEtherChipSet_val_ptr_ptr));
+    netsnmp_assert(NULL != dot3StatsEtherChipSet_val_ptr_len_ptr);
+
+
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsEtherChipSet_get",
+                "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    /*
+     * TODO:231:o: |-> Extract the current value of the dot3StatsEtherChipSet data.
+     * copy (* dot3StatsEtherChipSet_val_ptr_ptr ) data and (* dot3StatsEtherChipSet_val_ptr_len_ptr ) from rowreq_ctx->data
+     */
+    /*
+     * make sure there is enough space for dot3StatsEtherChipSet data
+     */
+    if ((NULL == (*dot3StatsEtherChipSet_val_ptr_ptr)) ||
+        ((*dot3StatsEtherChipSet_val_ptr_len_ptr) <
+         (rowreq_ctx->data.dot3StatsEtherChipSet_len *
+          sizeof(rowreq_ctx->data.dot3StatsEtherChipSet[0])))) {
+        /*
+         * allocate space for dot3StatsEtherChipSet data
+         */
+        (*dot3StatsEtherChipSet_val_ptr_ptr) =
+            malloc(rowreq_ctx->data.dot3StatsEtherChipSet_len *
+                   sizeof(rowreq_ctx->data.dot3StatsEtherChipSet[0]));
+        if (NULL == (*dot3StatsEtherChipSet_val_ptr_ptr)) {
+            snmp_log(LOG_ERR, "could not allocate memory\n");
+            return MFD_ERROR;
+        }
+    }
+    (*dot3StatsEtherChipSet_val_ptr_len_ptr) =
+        rowreq_ctx->data.dot3StatsEtherChipSet_len *
+        sizeof(rowreq_ctx->data.dot3StatsEtherChipSet[0]);
+    memcpy((*dot3StatsEtherChipSet_val_ptr_ptr),
+           rowreq_ctx->data.dot3StatsEtherChipSet,
+           rowreq_ctx->data.dot3StatsEtherChipSet_len *
+           sizeof(rowreq_ctx->data.dot3StatsEtherChipSet[0]));
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsEtherChipSet_get */
+
+/*---------------------------------------------------------------------
+ * EtherLike-MIB::dot3StatsEntry.dot3StatsSymbolErrors
+ * dot3StatsSymbolErrors is subid 18 of dot3StatsEntry.
+ * Its status is Current, and its access level is ReadOnly.
+ * OID: .1.3.6.1.2.1.10.7.2.1.18
+ * Description:
+For an interface operating at 100 Mb/s, the
+                    number of times there was an invalid data symbol
+                    when a valid carrier was present.
+
+                    For an interface operating in half-duplex mode
+                    at 1000 Mb/s, the number of times the receiving
+                    media is non-idle (a carrier event) for a period
+                    of time equal to or greater than slotTime, and
+                    during which there was at least one occurrence
+                    of an event that causes the PHY to indicate
+                    'Data reception error' or 'carrier extend error'
+                    on the GMII.
+
+                    For an interface operating in full-duplex mode
+                    at 1000 Mb/s, the number of times the receiving
+                    media is non-idle (a carrier event) for a period
+                    of time equal to or greater than minFrameSize,
+                    and during which there was at least one
+                    occurrence of an event that causes the PHY to
+                    indicate 'Data reception error' on the GMII.
+
+                    For an interface operating at 10 Gb/s, the
+                    number of times the receiving media is non-idle
+                    (a carrier event) for a period of time equal to
+                    or greater than minFrameSize, and during which
+                    there was at least one occurrence of an event
+                    that causes the PHY to indicate 'Receive Error'
+                    on the XGMII.
+
+                    The count represented by an instance of this
+                    object is incremented at most once per carrier
+                    event, even if multiple symbol errors occur
+                    during the carrier event.  This count does
+                    not increment if a collision is present.
+
+                    This counter does not increment when the
+                    interface is operating at 10 Mb/s.
+
+                    For interfaces operating at 10 Gb/s, this
+                    counter can roll over in less than 5 minutes if
+                    it is incrementing at its maximum rate.  Since
+                    that amount of time could be less than a
+
+                    management station's poll cycle time, in order
+                    to avoid a loss of information, a management
+                    station is advised to poll the
+                    dot3HCStatsSymbolErrors object for 10 Gb/s
+                    or faster interfaces.
+
+                    Discontinuities in the value of this counter can
+                    occur at re-initialization of the management
+                    system, and at other times as indicated by the
+                    value of ifCounterDiscontinuityTime.
+ *
+ * Attributes:
+ *   accessible 1     isscalar 0     enums  0      hasdefval 0
+ *   readable   1     iscolumn 1     ranges 0      hashint   0
+ *   settable   0
+ *
+ *
+ * Its syntax is COUNTER (based on perltype COUNTER)
+ * The net-snmp type is ASN_COUNTER. The C type decl is u_long (u_long)
+ */
+/**
+ * Extract the current value of the dot3StatsSymbolErrors data.
+ *
+ * Set a value using the data context for the row.
+ *
+ * @param rowreq_ctx
+ *        Pointer to the row request context.
+ * @param dot3StatsSymbolErrors_val_ptr
+ *        Pointer to storage for a u_long variable
+ *
+ * @retval MFD_SUCCESS         : success
+ * @retval MFD_SKIP            : skip this node (no value for now)
+ * @retval MFD_ERROR           : Any other error
+ */
+int
+dot3StatsSymbolErrors_get(dot3StatsTable_rowreq_ctx * rowreq_ctx,
+                          u_long * dot3StatsSymbolErrors_val_ptr)
+{
+   /** we should have a non-NULL pointer */
+    netsnmp_assert(NULL != dot3StatsSymbolErrors_val_ptr);
+
+
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsSymbolErrors_get",
+                "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    /*
+     * TODO:231:o: |-> Extract the current value of the dot3StatsSymbolErrors data.
+     * copy (* dot3StatsSymbolErrors_val_ptr ) from rowreq_ctx->data
+     */
+    (*dot3StatsSymbolErrors_val_ptr) =
+        rowreq_ctx->data.dot3StatsSymbolErrors;
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsSymbolErrors_get */
+
+/*---------------------------------------------------------------------
+ * EtherLike-MIB::dot3StatsEntry.dot3StatsDuplexStatus
+ * dot3StatsDuplexStatus is subid 19 of dot3StatsEntry.
+ * Its status is Current, and its access level is ReadOnly.
+ * OID: .1.3.6.1.2.1.10.7.2.1.19
+ * Description:
+The current mode of operation of the MAC
+                    entity.  'unknown' indicates that the current
+                    duplex mode could not be determined.
+
+                    Management control of the duplex mode is
+                    accomplished through the MAU MIB.  When
+                    an interface does not support autonegotiation,
+                    or when autonegotiation is not enabled, the
+                    duplex mode is controlled using
+                    ifMauDefaultType.  When autonegotiation is
+                    supported and enabled, duplex mode is controlled
+                    using ifMauAutoNegAdvertisedBits.  In either
+                    case, the currently operating duplex mode is
+                    reflected both in this object and in ifMauType.
+
+                    Note that this object provides redundant
+                    information with ifMauType.  Normally, redundant
+                    objects are discouraged.  However, in this
+                    instance, it allows a management application to
+                    determine the duplex status of an interface
+                    without having to know every possible value of
+                    ifMauType.  This was felt to be sufficiently
+                    valuable to justify the redundancy.
+ *
+ * Attributes:
+ *   accessible 1     isscalar 0     enums  1      hasdefval 0
+ *   readable   1     iscolumn 1     ranges 0      hashint   0
+ *   settable   0
+ *
+ * Enum range: 3/8. Values:  unknown(1), halfDuplex(2), fullDuplex(3)
+ *
+ * Its syntax is INTEGER (based on perltype INTEGER)
+ * The net-snmp type is ASN_INTEGER. The C type decl is long (u_long)
+ */
+/**
+ * Extract the current value of the dot3StatsDuplexStatus data.
+ *
+ * Set a value using the data context for the row.
+ *
+ * @param rowreq_ctx
+ *        Pointer to the row request context.
+ * @param dot3StatsDuplexStatus_val_ptr
+ *        Pointer to storage for a long variable
+ *
+ * @retval MFD_SUCCESS         : success
+ * @retval MFD_SKIP            : skip this node (no value for now)
+ * @retval MFD_ERROR           : Any other error
+ */
+int
+dot3StatsDuplexStatus_get(dot3StatsTable_rowreq_ctx * rowreq_ctx,
+                          u_long * dot3StatsDuplexStatus_val_ptr)
+{
+   /** we should have a non-NULL pointer */
+    netsnmp_assert(NULL != dot3StatsDuplexStatus_val_ptr);
+
+
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsDuplexStatus_get",
+                "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    /*
+     * TODO:231:o: |-> Extract the current value of the dot3StatsDuplexStatus data.
+     * copy (* dot3StatsDuplexStatus_val_ptr ) from rowreq_ctx->data
+     */
+    (*dot3StatsDuplexStatus_val_ptr) =
+        rowreq_ctx->data.dot3StatsDuplexStatus;
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsDuplexStatus_get */
+
+/*---------------------------------------------------------------------
+ * EtherLike-MIB::dot3StatsEntry.dot3StatsRateControlAbility
+ * dot3StatsRateControlAbility is subid 20 of dot3StatsEntry.
+ * Its status is Current, and its access level is ReadOnly.
+ * OID: .1.3.6.1.2.1.10.7.2.1.20
+ * Description:
+'true' for interfaces operating at speeds above
+                    1000 Mb/s that support Rate Control through
+                    lowering the average data rate of the MAC
+                    sublayer, with frame granularity, and 'false'
+                    otherwise.
+ *
+ * Attributes:
+ *   accessible 1     isscalar 0     enums  1      hasdefval 0
+ *   readable   1     iscolumn 1     ranges 0      hashint   0
+ *   settable   0
+ *
+ * Enum range: 2/8. Values:  true(1), false(2)
+ *
+ * Its syntax is TruthValue (based on perltype INTEGER)
+ * The net-snmp type is ASN_INTEGER. The C type decl is long (u_long)
+ */
+/**
+ * Extract the current value of the dot3StatsRateControlAbility data.
+ *
+ * Set a value using the data context for the row.
+ *
+ * @param rowreq_ctx
+ *        Pointer to the row request context.
+ * @param dot3StatsRateControlAbility_val_ptr
+ *        Pointer to storage for a long variable
+ *
+ * @retval MFD_SUCCESS         : success
+ * @retval MFD_SKIP            : skip this node (no value for now)
+ * @retval MFD_ERROR           : Any other error
+ */
+int
+dot3StatsRateControlAbility_get(dot3StatsTable_rowreq_ctx * rowreq_ctx,
+                                u_long *
+                                dot3StatsRateControlAbility_val_ptr)
+{
+   /** we should have a non-NULL pointer */
+    netsnmp_assert(NULL != dot3StatsRateControlAbility_val_ptr);
+
+
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsRateControlAbility_get",
+                "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    /*
+     * TODO:231:o: |-> Extract the current value of the dot3StatsRateControlAbility data.
+     * copy (* dot3StatsRateControlAbility_val_ptr ) from rowreq_ctx->data
+     */
+    (*dot3StatsRateControlAbility_val_ptr) =
+        rowreq_ctx->data.dot3StatsRateControlAbility;
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsRateControlAbility_get */
+
+/*---------------------------------------------------------------------
+ * EtherLike-MIB::dot3StatsEntry.dot3StatsRateControlStatus
+ * dot3StatsRateControlStatus is subid 21 of dot3StatsEntry.
+ * Its status is Current, and its access level is ReadOnly.
+ * OID: .1.3.6.1.2.1.10.7.2.1.21
+ * Description:
+The current Rate Control mode of operation of
+                    the MAC sublayer of this interface.
+ *
+ * Attributes:
+ *   accessible 1     isscalar 0     enums  1      hasdefval 0
+ *   readable   1     iscolumn 1     ranges 0      hashint   0
+ *   settable   0
+ *
+ * Enum range: 3/8. Values:  rateControlOff(1), rateControlOn(2), unknown(3)
+ *
+ * Its syntax is INTEGER (based on perltype INTEGER)
+ * The net-snmp type is ASN_INTEGER. The C type decl is long (u_long)
+ */
+/**
+ * Extract the current value of the dot3StatsRateControlStatus data.
+ *
+ * Set a value using the data context for the row.
+ *
+ * @param rowreq_ctx
+ *        Pointer to the row request context.
+ * @param dot3StatsRateControlStatus_val_ptr
+ *        Pointer to storage for a long variable
+ *
+ * @retval MFD_SUCCESS         : success
+ * @retval MFD_SKIP            : skip this node (no value for now)
+ * @retval MFD_ERROR           : Any other error
+ */
+int
+dot3StatsRateControlStatus_get(dot3StatsTable_rowreq_ctx * rowreq_ctx,
+                               u_long * dot3StatsRateControlStatus_val_ptr)
+{
+   /** we should have a non-NULL pointer */
+    netsnmp_assert(NULL != dot3StatsRateControlStatus_val_ptr);
+
+
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsRateControlStatus_get",
+                "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    /*
+     * TODO:231:o: |-> Extract the current value of the dot3StatsRateControlStatus data.
+     * copy (* dot3StatsRateControlStatus_val_ptr ) from rowreq_ctx->data
+     */
+    (*dot3StatsRateControlStatus_val_ptr) =
+        rowreq_ctx->data.dot3StatsRateControlStatus;
+
+    return MFD_SUCCESS;
+}                               /* dot3StatsRateControlStatus_get */
+
+
+
+/** @} */
diff --git a/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_get.h b/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_get.h
new file mode 100644
index 0000000..e543cd3
--- /dev/null
+++ b/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_get.h
@@ -0,0 +1,143 @@
+/*
+ * Note: this file originally auto-generated by mib2c using
+ *       version : 12088 $ of $
+ *
+ * $Id:$
+ *
+ * @file dot3StatsTable_data_get.h
+ *
+ * @addtogroup get
+ *
+ * Prototypes for get functions
+ *
+ * @{
+ */
+#ifndef DOT3STATSTABLE_DATA_GET_H
+#define DOT3STATSTABLE_DATA_GET_H
+
+#ifdef __cplusplus
+extern          "C" {
+#endif
+
+    /*
+     *********************************************************************
+     * GET function declarations
+     */
+
+    /*
+     *********************************************************************
+     * GET Table declarations
+     */
+/**********************************************************************
+ **********************************************************************
+ ***
+ *** Table dot3StatsTable
+ ***
+ **********************************************************************
+ **********************************************************************/
+    /*
+     * EtherLike-MIB::dot3StatsTable is subid 2 of dot3.
+     * Its status is Current.
+     * OID: .1.3.6.1.2.1.10.7.2, length: 9
+     */
+    /*
+     * indexes
+     */
+
+    int             dot3StatsAlignmentErrors_get(dot3StatsTable_rowreq_ctx
+                                                 * rowreq_ctx,
+                                                 u_long *
+                                                 dot3StatsAlignmentErrors_val_ptr);
+    int             dot3StatsFCSErrors_get(dot3StatsTable_rowreq_ctx *
+                                           rowreq_ctx,
+                                           u_long *
+                                           dot3StatsFCSErrors_val_ptr);
+    int            
+        dot3StatsSingleCollisionFrames_get(dot3StatsTable_rowreq_ctx *
+                                           rowreq_ctx,
+                                           u_long *
+                                           dot3StatsSingleCollisionFrames_val_ptr);
+    int            
+        dot3StatsMultipleCollisionFrames_get(dot3StatsTable_rowreq_ctx *
+                                             rowreq_ctx,
+                                             u_long *
+                                             dot3StatsMultipleCollisionFrames_val_ptr);
+    int             dot3StatsSQETestErrors_get(dot3StatsTable_rowreq_ctx *
+                                               rowreq_ctx,
+                                               u_long *
+                                               dot3StatsSQETestErrors_val_ptr);
+    int            
+        dot3StatsDeferredTransmissions_get(dot3StatsTable_rowreq_ctx *
+                                           rowreq_ctx,
+                                           u_long *
+                                           dot3StatsDeferredTransmissions_val_ptr);
+    int             dot3StatsLateCollisions_get(dot3StatsTable_rowreq_ctx *
+                                                rowreq_ctx,
+                                                u_long *
+                                                dot3StatsLateCollisions_val_ptr);
+    int            
+        dot3StatsExcessiveCollisions_get(dot3StatsTable_rowreq_ctx *
+                                         rowreq_ctx,
+                                         u_long *
+                                         dot3StatsExcessiveCollisions_val_ptr);
+    int            
+        dot3StatsInternalMacTransmitErrors_get(dot3StatsTable_rowreq_ctx *
+                                               rowreq_ctx,
+                                               u_long *
+                                               dot3StatsInternalMacTransmitErrors_val_ptr);
+    int            
+        dot3StatsCarrierSenseErrors_get(dot3StatsTable_rowreq_ctx *
+                                        rowreq_ctx,
+                                        u_long *
+                                        dot3StatsCarrierSenseErrors_val_ptr);
+    int             dot3StatsFrameTooLongs_get(dot3StatsTable_rowreq_ctx *
+                                               rowreq_ctx,
+                                               u_long *
+                                               dot3StatsFrameTooLongs_val_ptr);
+    int            
+        dot3StatsInternalMacReceiveErrors_get(dot3StatsTable_rowreq_ctx *
+                                              rowreq_ctx,
+                                              u_long *
+                                              dot3StatsInternalMacReceiveErrors_val_ptr);
+    int             dot3StatsEtherChipSet_get(dot3StatsTable_rowreq_ctx *
+                                              rowreq_ctx,
+                                              oid **
+                                              dot3StatsEtherChipSet_val_ptr_ptr,
+                                              size_t
+                                              *dot3StatsEtherChipSet_val_ptr_len_ptr);
+    int             dot3StatsSymbolErrors_get(dot3StatsTable_rowreq_ctx *
+                                              rowreq_ctx,
+                                              u_long *
+                                              dot3StatsSymbolErrors_val_ptr);
+    int             dot3StatsDuplexStatus_get(dot3StatsTable_rowreq_ctx *
+                                              rowreq_ctx,
+                                              u_long *
+                                              dot3StatsDuplexStatus_val_ptr);
+    int            
+        dot3StatsRateControlAbility_get(dot3StatsTable_rowreq_ctx *
+                                        rowreq_ctx,
+                                        u_long *
+                                        dot3StatsRateControlAbility_val_ptr);
+    int            
+        dot3StatsRateControlStatus_get(dot3StatsTable_rowreq_ctx *
+                                       rowreq_ctx,
+                                       u_long *
+                                       dot3StatsRateControlStatus_val_ptr);
+
+
+    int            
+        dot3StatsTable_indexes_set_tbl_idx(dot3StatsTable_mib_index *
+                                           tbl_idx,
+                                           long dot3StatsIndex_val);
+    int             dot3StatsTable_indexes_set(dot3StatsTable_rowreq_ctx *
+                                               rowreq_ctx,
+                                               long dot3StatsIndex_val);
+
+
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif                          /* DOT3STATSTABLE_DATA_GET_H */
+/** @} */
diff --git a/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_set.c b/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_set.c
new file mode 100644
index 0000000..44c2da2
--- /dev/null
+++ b/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_set.c
@@ -0,0 +1,28 @@
+/*
+ * Note: this file originally auto-generated by mib2c using
+ *       version : 12077 $ of $
+ *
+ * $Id:$
+ *
+ */
+/*
+ * standard Net-SNMP includes 
+ */
+#include <net-snmp/net-snmp-config.h>
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+/*
+ * include our parent header 
+ */
+#include "dot3StatsTable.h"
+
+
+/** @defgroup data_set data_set: Routines to set data
+ *
+ * These routines are used to set the value for individual objects. The
+ * row context is passed, along with the new value.
+ * 
+ * @{
+ */
+/** @} */
diff --git a/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_set.h b/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_set.h
new file mode 100644
index 0000000..6a03356
--- /dev/null
+++ b/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_data_set.h
@@ -0,0 +1,28 @@
+/*
+ * Note: this file originally auto-generated by mib2c using
+ *       version : 12077 $ of $ 
+ *
+ * $Id:$
+ */
+#ifndef DOT3STATSTABLE_DATA_SET_H
+#define DOT3STATSTABLE_DATA_SET_H
+
+#ifdef __cplusplus
+extern          "C" {
+#endif
+
+    /*
+     *********************************************************************
+     * SET function declarations
+     */
+
+    /*
+     *********************************************************************
+     * SET Table declarations
+     */
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif                          /* DOT3STATSTABLE_DATA_SET_H */
diff --git a/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_enums.h b/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_enums.h
new file mode 100644
index 0000000..88a72e4
--- /dev/null
+++ b/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_enums.h
@@ -0,0 +1,89 @@
+/*
+ * Note: this file originally auto-generated by mib2c using
+ *  : generic-table-enums.m2c 12526 2005-07-15 22:41:16Z rstory $
+ *
+ * $Id:$
+ */
+#ifndef DOT3STATSTABLE_ENUMS_H
+#define DOT3STATSTABLE_ENUMS_H
+
+#ifdef __cplusplus
+extern          "C" {
+#endif
+
+    /*
+     * NOTES on enums
+     * ==============
+     *
+     * Value Mapping
+     * -------------
+     * If the values for your data type don't exactly match the
+     * possible values defined by the mib, you should map them
+     * below. For example, a boolean flag (1/0) is usually represented
+     * as a TruthValue in a MIB, which maps to the values (1/2).
+     *
+     */
+/*************************************************************************
+ *************************************************************************
+ *
+ * enum definitions for table dot3StatsTable
+ *
+ *************************************************************************
+ *************************************************************************/
+
+/*************************************************************
+ * constants for enums for the MIB node
+ * dot3StatsDuplexStatus (INTEGER / ASN_INTEGER)
+ *
+ * since a Textual Convention may be referenced more than once in a
+ * MIB, protect againt redefinitions of the enum values.
+ */
+#ifndef DOT3STATSDUPLEXSTATUS_ENUMS
+#define DOT3STATSDUPLEXSTATUS_ENUMS
+
+#define DOT3STATSDUPLEXSTATUS_UNKNOWN  1
+#define DOT3STATSDUPLEXSTATUS_HALFDUPLEX  2
+#define DOT3STATSDUPLEXSTATUS_FULLDUPLEX  3
+
+#endif                          /* DOT3STATSDUPLEXSTATUS_ENUMS */
+
+
+/*************************************************************
+ * constants for enums for the MIB node
+ * dot3StatsRateControlAbility (TruthValue / ASN_INTEGER)
+ *
+ * since a Textual Convention may be referenced more than once in a
+ * MIB, protect againt redefinitions of the enum values.
+ */
+#ifndef TRUTHVALUE_ENUMS
+#define TRUTHVALUE_ENUMS
+
+#define TRUTHVALUE_TRUE  1
+#define TRUTHVALUE_FALSE  2
+
+#endif                          /* TRUTHVALUE_ENUMS */
+
+
+/*************************************************************
+ * constants for enums for the MIB node
+ * dot3StatsRateControlStatus (INTEGER / ASN_INTEGER)
+ *
+ * since a Textual Convention may be referenced more than once in a
+ * MIB, protect againt redefinitions of the enum values.
+ */
+#ifndef DOT3STATSRATECONTROLSTATUS_ENUMS
+#define DOT3STATSRATECONTROLSTATUS_ENUMS
+
+#define DOT3STATSRATECONTROLSTATUS_RATECONTROLOFF  1
+#define DOT3STATSRATECONTROLSTATUS_RATECONTROLON  2
+#define DOT3STATSRATECONTROLSTATUS_UNKNOWN  3
+
+#endif                          /* DOT3STATSRATECONTROLSTATUS_ENUMS */
+
+
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif                          /* DOT3STATSTABLE_ENUMS_H */
diff --git a/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_interface.c b/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_interface.c
new file mode 100644
index 0000000..f2685cc
--- /dev/null
+++ b/agent/mibgroup/etherlike-mib/dot3StatsTable/dot3StatsTable_interface.c
@@ -0,0 +1,1182 @@
+/*
+ * Note: this file originally auto-generated by mib2c using
+ *       version : 15899 $ of $ 
+ *
+ * $Id:$
+ */
+/*
+ * *********************************************************************
+ * *********************************************************************
+ * *********************************************************************
+ * ***                                                               ***
+ * ***  NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE  ***
+ * ***                                                               ***
+ * ***                                                               ***
+ * ***       THIS FILE DOES NOT CONTAIN ANY USER EDITABLE CODE.      ***
+ * ***                                                               ***
+ * ***                                                               ***
+ * ***       THE GENERATED CODE IS INTERNAL IMPLEMENTATION, AND      ***
+ * ***                                                               ***
+ * ***                                                               ***
+ * ***    IS SUBJECT TO CHANGE WITHOUT WARNING IN FUTURE RELEASES.   ***
+ * ***                                                               ***
+ * ***                                                               ***
+ * *********************************************************************
+ * *********************************************************************
+ * *********************************************************************
+ */
+
+/*
+ * standard Net-SNMP includes 
+ */
+#include <net-snmp/net-snmp-config.h>
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+/*
+ * include our parent header 
+ */
+#include "dot3StatsTable.h"
+
+
+#include <net-snmp/agent/table_container.h>
+#include <net-snmp/library/container.h>
+
+#include "dot3StatsTable_interface.h"
+
+#include <ctype.h>
+
+/**********************************************************************
+ **********************************************************************
+ ***
+ *** Table dot3StatsTable
+ ***
+ **********************************************************************
+ **********************************************************************/
+/*
+ * EtherLike-MIB::dot3StatsTable is subid 2 of dot3.
+ * Its status is Current.
+ * OID: .1.3.6.1.2.1.10.7.2, length: 9
+ */
+typedef struct dot3StatsTable_interface_ctx_s {
+
+    netsnmp_container *container;
+    netsnmp_cache  *cache;
+
+    dot3StatsTable_registration *user_ctx;
+
+    netsnmp_table_registration_info tbl_info;
+
+    netsnmp_baby_steps_access_methods access_multiplexer;
+
+} dot3StatsTable_interface_ctx;
+
+static dot3StatsTable_interface_ctx dot3StatsTable_if_ctx;
+
+static void     _dot3StatsTable_container_init(dot3StatsTable_interface_ctx
+                                               * if_ctx);
+static void    
+_dot3StatsTable_container_shutdown(dot3StatsTable_interface_ctx * if_ctx);
+
+
+netsnmp_container *
+dot3StatsTable_container_get(void)
+{
+    return dot3StatsTable_if_ctx.container;
+}
+
+dot3StatsTable_registration *
+dot3StatsTable_registration_get(void)
+{
+    return dot3StatsTable_if_ctx.user_ctx;
+}
+
+dot3StatsTable_registration *
+dot3StatsTable_registration_set(dot3StatsTable_registration * newreg)
+{
+    dot3StatsTable_registration *old = dot3StatsTable_if_ctx.user_ctx;
+    dot3StatsTable_if_ctx.user_ctx = newreg;
+    return old;
+}
+
+int
+dot3StatsTable_container_size(void)
+{
+    return CONTAINER_SIZE(dot3StatsTable_if_ctx.container);
+}
+
+/*
+ * mfd multiplexer modes
+ */
+static Netsnmp_Node_Handler _mfd_dot3StatsTable_pre_request;
+static Netsnmp_Node_Handler _mfd_dot3StatsTable_post_request;
+static Netsnmp_Node_Handler _mfd_dot3StatsTable_object_lookup;
+static Netsnmp_Node_Handler _mfd_dot3StatsTable_get_values;
+/**
+ * @internal
+ * Initialize the table dot3StatsTable 
+ *    (Define its contents and how it's structured)
+ */
+void
+_dot3StatsTable_initialize_interface(dot3StatsTable_registration * reg_ptr,
+                                     u_long flags)
+{
+    netsnmp_baby_steps_access_methods *access_multiplexer =
+        &dot3StatsTable_if_ctx.access_multiplexer;
+    netsnmp_table_registration_info *tbl_info =
+        &dot3StatsTable_if_ctx.tbl_info;
+    netsnmp_handler_registration *reginfo;
+    netsnmp_mib_handler *handler;
+    int             mfd_modes = 0;
+
+    DEBUGMSGTL(("internal:dot3StatsTable:_dot3StatsTable_initialize_interface", "called\n"));
+
+
+    /*************************************************
+     *
+     * save interface context for dot3StatsTable
+     */
+    /*
+     * Setting up the table's definition
+     */
+    netsnmp_table_helper_add_indexes(tbl_info, ASN_INTEGER,
+                                               /** index: dot3StatsIndex */
+                                     0);
+
+    /*
+     * Define the minimum and maximum accessible columns.  This
+     * optimizes retrival. 
+     */
+    tbl_info->min_column = DOT3STATSTABLE_MIN_COL;
+    tbl_info->max_column = DOT3STATSTABLE_MAX_COL;
+
+    /*
+     * save users context
+     */
+    dot3StatsTable_if_ctx.user_ctx = reg_ptr;
+
+    /*
+     * call data access initialization code
+     */
+    dot3StatsTable_init_data(reg_ptr);
+
+    /*
+     * set up the container
+     */
+    _dot3StatsTable_container_init(&dot3StatsTable_if_ctx);
+    if (NULL == dot3StatsTable_if_ctx.container) {
+        snmp_log(LOG_ERR,
+                 "could not initialize container for dot3StatsTable\n");
+        return;
+    }
+
+    /*
+     * access_multiplexer: REQUIRED wrapper for get request handling
+     */
+    access_multiplexer->object_lookup = _mfd_dot3StatsTable_object_lookup;
+    access_multiplexer->get_values = _mfd_dot3StatsTable_get_values;
+
+    /*
+     * no wrappers yet
+     */
+    access_multiplexer->pre_request = _mfd_dot3StatsTable_pre_request;
+    access_multiplexer->post_request = _mfd_dot3StatsTable_post_request;
+
+
+    /*************************************************
+     *
+     * Create a registration, save our reg data, register table.
+     */
+    DEBUGMSGTL(("dot3StatsTable:init_dot3StatsTable",
+                "Registering dot3StatsTable as a mibs-for-dummies table.\n"));
+    handler =
+        netsnmp_baby_steps_access_multiplexer_get(access_multiplexer);
+    reginfo =
+        netsnmp_handler_registration_create("dot3StatsTable", handler,
+                                            dot3StatsTable_oid,
+                                            dot3StatsTable_oid_size,
+                                            HANDLER_CAN_BABY_STEP |
+                                            HANDLER_CAN_RONLY);
+    if (NULL == reginfo) {
+        snmp_log(LOG_ERR, "error registering table dot3StatsTable\n");
+        return;
+    }
+    reginfo->my_reg_void = &dot3StatsTable_if_ctx;
+
+    /*************************************************
+     *
+     * set up baby steps handler, create it and inject it
+     */
+    if (access_multiplexer->object_lookup)
+        mfd_modes |= BABY_STEP_OBJECT_LOOKUP;
+    if (access_multiplexer->set_values)
+        mfd_modes |= BABY_STEP_SET_VALUES;
+    if (access_multiplexer->irreversible_commit)
+        mfd_modes |= BABY_STEP_IRREVERSIBLE_COMMIT;
+    if (access_multiplexer->object_syntax_checks)
+        mfd_modes |= BABY_STEP_CHECK_OBJECT;
+
+    if (access_multiplexer->pre_request)
+        mfd_modes |= BABY_STEP_PRE_REQUEST;
+    if (access_multiplexer->post_request)
+        mfd_modes |= BABY_STEP_POST_REQUEST;
+
+    if (access_multiplexer->undo_setup)
+        mfd_modes |= BABY_STEP_UNDO_SETUP;
+    if (access_multiplexer->undo_cleanup)
+        mfd_modes |= BABY_STEP_UNDO_CLEANUP;
+    if (access_multiplexer->undo_sets)
+        mfd_modes |= BABY_STEP_UNDO_SETS;
+
+    if (access_multiplexer->row_creation)
+        mfd_modes |= BABY_STEP_ROW_CREATE;
+    if (access_multiplexer->consistency_checks)
+        mfd_modes |= BABY_STEP_CHECK_CONSISTENCY;
+    if (access_multiplexer->commit)
+        mfd_modes |= BABY_STEP_COMMIT;
+    if (access_multiplexer->undo_commit)
+        mfd_modes |= BABY_STEP_UNDO_COMMIT;
+
+    handler = netsnmp_baby_steps_handler_get(mfd_modes);
+    netsnmp_inject_handler(reginfo, handler);
+
+    /*************************************************
+     *
+     * inject row_merge helper with prefix rootoid_len + 2 (entry.col)
+     */
+    handler = netsnmp_get_row_merge_handler(reginfo->rootoid_len + 2);
+    netsnmp_inject_handler(reginfo, handler);
+
+    /*************************************************
+     *
+     * inject container_table helper
+     */
+    handler =
+        netsnmp_container_table_handler_get(tbl_info,
+                                            dot3StatsTable_if_ctx.
+                                            container,
+                                            TABLE_CONTAINER_KEY_NETSNMP_INDEX);
+    netsnmp_inject_handler(reginfo, handler);
+
+    /*************************************************
+     *
+     * inject cache helper
+     */
+    if (NULL != dot3StatsTable_if_ctx.cache) {
+        handler = netsnmp_cache_handler_get(dot3StatsTable_if_ctx.cache);
+        netsnmp_inject_handler(reginfo, handler);
+    }
+
+    /*
+     * register table
+     */
+    netsnmp_register_table(reginfo, tbl_info);
+
+}                               /* _dot3StatsTable_initialize_interface */
+
+/**
+ * @internal
+ * Shutdown the table dot3StatsTable
+ */
+void
+_dot3StatsTable_shutdown_interface(dot3StatsTable_registration * reg_ptr)
+{
+    /*
+     * shutdown the container
+     */
+    _dot3StatsTable_container_shutdown(&dot3StatsTable_if_ctx);
+}
+
+void
+dot3StatsTable_valid_columns_set(netsnmp_column_info *vc)
+{
+    dot3StatsTable_if_ctx.tbl_info.valid_columns = vc;
+}                               /* dot3StatsTable_valid_columns_set */
+
+/**
+ * @internal
+ * convert the index component stored in the context to an oid
+ */
+int
+dot3StatsTable_index_to_oid(netsnmp_index * oid_idx,
+                            dot3StatsTable_mib_index * mib_idx)
+{
+    int             err = SNMP_ERR_NOERROR;
+
+    /*
+     * temp storage for parsing indexes
+     */
+    /*
+     * dot3StatsIndex(1)/InterfaceIndex/ASN_INTEGER/long(long)//l/A/w/e/R/d/H
+     */
+    netsnmp_variable_list var_dot3StatsIndex;
+
+    /*
+     * set up varbinds
+     */
+    memset(&var_dot3StatsIndex, 0x00, sizeof(var_dot3StatsIndex));
+    var_dot3StatsIndex.type = ASN_INTEGER;
+
+    /*
+     * chain temp index varbinds together
+     */
+    var_dot3StatsIndex.next_variable = NULL;
+
+
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsTable_index_to_oid",
+                "called\n"));
+
+    /*
+     * dot3StatsIndex(1)/InterfaceIndex/ASN_INTEGER/long(long)//l/A/w/e/R/d/H 
+     */
+    snmp_set_var_value(&var_dot3StatsIndex,
+                       (u_char *) & mib_idx->dot3StatsIndex,
+                       sizeof(mib_idx->dot3StatsIndex));
+
+
+    err = build_oid_noalloc(oid_idx->oids, oid_idx->len, &oid_idx->len,
+                            NULL, 0, &var_dot3StatsIndex);
+    if (err)
+        snmp_log(LOG_ERR, "error %d converting index to oid\n", err);
+
+    /*
+     * parsing may have allocated memory. free it.
+     */
+    snmp_reset_var_buffers(&var_dot3StatsIndex);
+
+    return err;
+}                               /* dot3StatsTable_index_to_oid */
+
+/**
+ * extract dot3StatsTable indexes from a netsnmp_index
+ *
+ * @retval SNMP_ERR_NOERROR  : no error
+ * @retval SNMP_ERR_GENERR   : error
+ */
+int
+dot3StatsTable_index_from_oid(netsnmp_index * oid_idx,
+                              dot3StatsTable_mib_index * mib_idx)
+{
+    int             err = SNMP_ERR_NOERROR;
+
+    /*
+     * temp storage for parsing indexes
+     */
+    /*
+     * dot3StatsIndex(1)/InterfaceIndex/ASN_INTEGER/long(long)//l/A/w/e/R/d/H
+     */
+    netsnmp_variable_list var_dot3StatsIndex;
+
+    /*
+     * set up varbinds
+     */
+    memset(&var_dot3StatsIndex, 0x00, sizeof(var_dot3StatsIndex));
+    var_dot3StatsIndex.type = ASN_INTEGER;
+
+    /*
+     * chain temp index varbinds together
+     */
+    var_dot3StatsIndex.next_variable = NULL;
+
+
+    DEBUGMSGTL(("verbose:dot3StatsTable:dot3StatsTable_index_from_oid",
+                "called\n"));
+
+    /*
+     * parse the oid into the individual index components
+     */
+    err = parse_oid_indexes(oid_idx->oids, oid_idx->len,
+                            &var_dot3StatsIndex);
+    if (err == SNMP_ERR_NOERROR) {
+        /*
+         * copy out values
+         */
+        mib_idx->dot3StatsIndex =
+            *((long *) var_dot3StatsIndex.val.string);
+
+
+    }
+
+    /*
+     * parsing may have allocated memory. free it.
+     */
+    snmp_reset_var_buffers(&var_dot3StatsIndex);
+
+    return err;
+}                               /* dot3StatsTable_index_from_oid */
+
+
+/*
+ *********************************************************************
+ * @internal
+ * allocate resources for a dot3StatsTable_rowreq_ctx
+ */
+dot3StatsTable_rowreq_ctx *
+dot3StatsTable_allocate_rowreq_ctx(void *user_init_ctx)
+{
+    dot3StatsTable_rowreq_ctx *rowreq_ctx =
+        SNMP_MALLOC_TYPEDEF(dot3StatsTable_rowreq_ctx);
+
+    DEBUGMSGTL(("internal:dot3StatsTable:dot3StatsTable_allocate_rowreq_ctx", "called\n"));
+
+    if (NULL == rowreq_ctx) {
+        snmp_log(LOG_ERR, "Couldn't allocate memory for a "
+                 "dot3StatsTable_rowreq_ctx.\n");
+        return NULL;
+    }
+
+    rowreq_ctx->oid_idx.oids = rowreq_ctx->oid_tmp;
+
+    rowreq_ctx->dot3StatsTable_data_list = NULL;
+
+    /*
+     * if we allocated data, call init routine
+     */
+    if (!(rowreq_ctx->rowreq_flags & MFD_ROW_DATA_FROM_USER)) {
+        if (SNMPERR_SUCCESS !=
+            dot3StatsTable_rowreq_ctx_init(rowreq_ctx, user_init_ctx)) {
+            dot3StatsTable_release_rowreq_ctx(rowreq_ctx);
+            rowreq_ctx = NULL;
+        }
+    }
+
+    return rowreq_ctx;
+}                               /* dot3StatsTable_allocate_rowreq_ctx */
+
+/*
+ * @internal
+ * release resources for a dot3StatsTable_rowreq_ctx
+ */
+void
+dot3StatsTable_release_rowreq_ctx(dot3StatsTable_rowreq_ctx * rowreq_ctx)
+{
+    DEBUGMSGTL(("internal:dot3StatsTable:dot3StatsTable_release_rowreq_ctx", "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    dot3StatsTable_rowreq_ctx_cleanup(rowreq_ctx);
+
+    /*
+     * free index oid pointer
+     */
+    if (rowreq_ctx->oid_idx.oids != rowreq_ctx->oid_tmp)
+        free(rowreq_ctx->oid_idx.oids);
+
+    SNMP_FREE(rowreq_ctx);
+}                               /* dot3StatsTable_release_rowreq_ctx */
+
+/**
+ * @internal
+ * wrapper
+ */
+static int
+_mfd_dot3StatsTable_pre_request(netsnmp_mib_handler *handler,
+                                netsnmp_handler_registration *reginfo,
+                                netsnmp_agent_request_info *agtreq_info,
+                                netsnmp_request_info *requests)
+{
+    int             rc;
+
+    DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_pre_request",
+                "called\n"));
+
+    if (1 != netsnmp_row_merge_status_first(reginfo, agtreq_info)) {
+        DEBUGMSGTL(("internal:dot3StatsTable",
+                    "skipping additional pre_request\n"));
+        return SNMP_ERR_NOERROR;
+    }
+
+    rc = dot3StatsTable_pre_request(dot3StatsTable_if_ctx.user_ctx);
+    if (MFD_SUCCESS != rc) {
+        /*
+         * nothing we can do about it but log it
+         */
+        DEBUGMSGTL(("dot3StatsTable", "error %d from "
+                    "dot3StatsTable_pre_request\n", rc));
+        netsnmp_request_set_error_all(requests, SNMP_VALIDATE_ERR(rc));
+    }
+
+    return SNMP_ERR_NOERROR;
+}                               /* _mfd_dot3StatsTable_pre_request */
+
+/**
+ * @internal
+ * wrapper
+ */
+static int
+_mfd_dot3StatsTable_post_request(netsnmp_mib_handler *handler,
+                                 netsnmp_handler_registration *reginfo,
+                                 netsnmp_agent_request_info *agtreq_info,
+                                 netsnmp_request_info *requests)
+{
+    dot3StatsTable_rowreq_ctx *rowreq_ctx =
+        netsnmp_container_table_row_extract(requests);
+    int             rc, packet_rc;
+
+    DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_post_request",
+                "called\n"));
+
+    /*
+     * release row context, if deleted
+     */
+    if (rowreq_ctx && (rowreq_ctx->rowreq_flags & MFD_ROW_DELETED))
+        dot3StatsTable_release_rowreq_ctx(rowreq_ctx);
+
+    /*
+     * wait for last call before calling user
+     */
+    if (1 != netsnmp_row_merge_status_last(reginfo, agtreq_info)) {
+        DEBUGMSGTL(("internal:dot3StatsTable",
+                    "waiting for last post_request\n"));
+        return SNMP_ERR_NOERROR;
+    }
+
+    packet_rc = netsnmp_check_all_requests_error(agtreq_info->asp, 0);
+    rc = dot3StatsTable_post_request(dot3StatsTable_if_ctx.user_ctx,
+                                     packet_rc);
+    if (MFD_SUCCESS != rc) {
+        /*
+         * nothing we can do about it but log it
+         */
+        DEBUGMSGTL(("dot3StatsTable", "error %d from "
+                    "dot3StatsTable_post_request\n", rc));
+    }
+
+    return SNMP_ERR_NOERROR;
+}                               /* _mfd_dot3StatsTable_post_request */
+
+/**
+ * @internal
+ * wrapper
+ */
+static int
+_mfd_dot3StatsTable_object_lookup(netsnmp_mib_handler *handler,
+                                  netsnmp_handler_registration *reginfo,
+                                  netsnmp_agent_request_info *agtreq_info,
+                                  netsnmp_request_info *requests)
+{
+    int             rc = SNMP_ERR_NOERROR;
+    dot3StatsTable_rowreq_ctx *rowreq_ctx =
+        netsnmp_container_table_row_extract(requests);
+
+    DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_object_lookup", "called\n"));
+
+    /*
+     * get our context from mfd
+     * dot3StatsTable_interface_ctx *if_ctx =
+     *             (dot3StatsTable_interface_ctx *)reginfo->my_reg_void;
+     */
+
+    if (NULL == rowreq_ctx) {
+        rc = SNMP_ERR_NOCREATION;
+    }
+
+    if (MFD_SUCCESS != rc)
+        netsnmp_request_set_error_all(requests, rc);
+    else
+        dot3StatsTable_row_prep(rowreq_ctx);
+
+    return SNMP_VALIDATE_ERR(rc);
+}                               /* _mfd_dot3StatsTable_object_lookup */
+
+/***********************************************************************
+ *
+ * GET processing
+ *
+ ***********************************************************************/
+/*
+ * @internal
+ * Retrieve the value for a particular column
+ */
+NETSNMP_STATIC_INLINE int
+_dot3StatsTable_get_column(dot3StatsTable_rowreq_ctx * rowreq_ctx,
+                           netsnmp_variable_list * var, int column)
+{
+    int             rc = SNMPERR_SUCCESS;
+
+    DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_get_column",
+                "called for %d\n", column));
+
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    switch (column) {
+
+        /*
+         * (INDEX) dot3StatsIndex(1)/InterfaceIndex/ASN_INTEGER/long(long)//l/A/w/e/R/d/H 
+         */
+    case COLUMN_DOT3STATSINDEX:
+        var->type = ASN_INTEGER;
+        var->val_len = sizeof(long);
+        (*var->val.integer) = rowreq_ctx->tbl_idx.dot3StatsIndex;
+        break;
+
+        /*
+         * dot3StatsAlignmentErrors(2)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h 
+         */
+    case COLUMN_DOT3STATSALIGNMENTERRORS:
+        if (!
+            (COLUMN_DOT3STATSALIGNMENTERRORS_FLAG & rowreq_ctx->
+             column_exists_flags)) {
+            DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_get_column", "column %d (dot3StatsAlignmentErrors) doesn't exist\n", column));
+            return MFD_SKIP;
+        }
+
+        var->val_len = sizeof(u_long);
+        var->type = ASN_COUNTER;
+        rc = dot3StatsAlignmentErrors_get(rowreq_ctx,
+                                          (u_long *) var->val.string);
+        break;
+
+        /*
+         * dot3StatsFCSErrors(3)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h 
+         */
+    case COLUMN_DOT3STATSFCSERRORS:
+        if (!
+            (COLUMN_DOT3STATSFCSERRORS_FLAG & rowreq_ctx->
+             column_exists_flags)) {
+            DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_get_column", "column %d (dot3StatsFCSErrors) doesn't exist\n", column));
+            return MFD_SKIP;
+        }
+
+        var->val_len = sizeof(u_long);
+        var->type = ASN_COUNTER;
+        rc = dot3StatsFCSErrors_get(rowreq_ctx,
+                                    (u_long *) var->val.string);
+        break;
+
+        /*
+         * dot3StatsSingleCollisionFrames(4)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h 
+         */
+    case COLUMN_DOT3STATSSINGLECOLLISIONFRAMES:
+        if (!
+            (COLUMN_DOT3STATSSINGLECOLLISIONFRAMES_FLAG & rowreq_ctx->
+             column_exists_flags)) {
+            DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_get_column", "column %d (dot3StatsSingleCollisionFrames) doesn't exist\n", column));
+            return MFD_SKIP;
+        }
+
+        var->val_len = sizeof(u_long);
+        var->type = ASN_COUNTER;
+        rc = dot3StatsSingleCollisionFrames_get(rowreq_ctx,
+                                                (u_long *) var->val.
+                                                string);
+        break;
+
+        /*
+         * dot3StatsMultipleCollisionFrames(5)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h 
+         */
+    case COLUMN_DOT3STATSMULTIPLECOLLISIONFRAMES:
+        if (!
+            (COLUMN_DOT3STATSMULTIPLECOLLISIONFRAMES_FLAG & rowreq_ctx->
+             column_exists_flags)) {
+            DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_get_column", "column %d (dot3StatsMultipleCollisionFrames) doesn't exist\n", column));
+            return MFD_SKIP;
+        }
+
+        var->val_len = sizeof(u_long);
+        var->type = ASN_COUNTER;
+        rc = dot3StatsMultipleCollisionFrames_get(rowreq_ctx,
+                                                  (u_long *) var->val.
+                                                  string);
+        break;
+
+        /*
+         * dot3StatsSQETestErrors(6)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h 
+         */
+    case COLUMN_DOT3STATSSQETESTERRORS:
+        if (!
+            (COLUMN_DOT3STATSSQETESTERRORS_FLAG & rowreq_ctx->
+             column_exists_flags)) {
+            DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_get_column", "column %d (dot3StatsSQETestErrors) doesn't exist\n", column));
+            return MFD_SKIP;
+        }
+
+        var->val_len = sizeof(u_long);
+        var->type = ASN_COUNTER;
+        rc = dot3StatsSQETestErrors_get(rowreq_ctx,
+                                        (u_long *) var->val.string);
+        break;
+
+        /*
+         * dot3StatsDeferredTransmissions(7)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h 
+         */
+    case COLUMN_DOT3STATSDEFERREDTRANSMISSIONS:
+        if (!
+            (COLUMN_DOT3STATSDEFERREDTRANSMISSIONS_FLAG & rowreq_ctx->
+             column_exists_flags)) {
+            DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_get_column", "column %d (dot3StatsDeferredTransmissions) doesn't exist\n", column));
+            return MFD_SKIP;
+        }
+
+        var->val_len = sizeof(u_long);
+        var->type = ASN_COUNTER;
+        rc = dot3StatsDeferredTransmissions_get(rowreq_ctx,
+                                                (u_long *) var->val.
+                                                string);
+        break;
+
+        /*
+         * dot3StatsLateCollisions(8)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h 
+         */
+    case COLUMN_DOT3STATSLATECOLLISIONS:
+        if (!
+            (COLUMN_DOT3STATSLATECOLLISIONS_FLAG & rowreq_ctx->
+             column_exists_flags)) {
+            DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_get_column", "column %d (dot3StatsLateCollisions) doesn't exist\n", column));
+            return MFD_SKIP;
+        }
+
+        var->val_len = sizeof(u_long);
+        var->type = ASN_COUNTER;
+        rc = dot3StatsLateCollisions_get(rowreq_ctx,
+                                         (u_long *) var->val.string);
+        break;
+
+        /*
+         * dot3StatsExcessiveCollisions(9)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h 
+         */
+    case COLUMN_DOT3STATSEXCESSIVECOLLISIONS:
+        if (!
+            (COLUMN_DOT3STATSEXCESSIVECOLLISIONS_FLAG & rowreq_ctx->
+             column_exists_flags)) {
+            DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_get_column", "column %d (dot3StatsExcessiveCollisions) doesn't exist\n", column));
+            return MFD_SKIP;
+        }
+
+        var->val_len = sizeof(u_long);
+        var->type = ASN_COUNTER;
+        rc = dot3StatsExcessiveCollisions_get(rowreq_ctx,
+                                              (u_long *) var->val.string);
+        break;
+
+        /*
+         * dot3StatsInternalMacTransmitErrors(10)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h 
+         */
+    case COLUMN_DOT3STATSINTERNALMACTRANSMITERRORS:
+        if (!
+            (COLUMN_DOT3STATSINTERNALMACTRANSMITERRORS_FLAG & rowreq_ctx->
+             column_exists_flags)) {
+            DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_get_column", "column %d (dot3StatsInternalMacTransmitErrors) doesn't exist\n", column));
+            return MFD_SKIP;
+        }
+
+        var->val_len = sizeof(u_long);
+        var->type = ASN_COUNTER;
+        rc = dot3StatsInternalMacTransmitErrors_get(rowreq_ctx,
+                                                    (u_long *) var->val.
+                                                    string);
+        break;
+
+        /*
+         * dot3StatsCarrierSenseErrors(11)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h 
+         */
+    case COLUMN_DOT3STATSCARRIERSENSEERRORS:
+        if (!
+            (COLUMN_DOT3STATSCARRIERSENSEERRORS_FLAG & rowreq_ctx->
+             column_exists_flags)) {
+            DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_get_column", "column %d (dot3StatsCarrierSenseErrors) doesn't exist\n", column));
+            return MFD_SKIP;
+        }
+
+        var->val_len = sizeof(u_long);
+        var->type = ASN_COUNTER;
+        rc = dot3StatsCarrierSenseErrors_get(rowreq_ctx,
+                                             (u_long *) var->val.string);
+        break;
+
+        /*
+         * dot3StatsFrameTooLongs(13)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h 
+         */
+    case COLUMN_DOT3STATSFRAMETOOLONGS:
+        if (!
+            (COLUMN_DOT3STATSFRAMETOOLONGS_FLAG & rowreq_ctx->
+             column_exists_flags)) {
+            DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_get_column", "column %d (dot3StatsFrameTooLongs) doesn't exist\n", column));
+            return MFD_SKIP;
+        }
+
+        var->val_len = sizeof(u_long);
+        var->type = ASN_COUNTER;
+        rc = dot3StatsFrameTooLongs_get(rowreq_ctx,
+                                        (u_long *) var->val.string);
+        break;
+
+        /*
+         * dot3StatsInternalMacReceiveErrors(16)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h 
+         */
+    case COLUMN_DOT3STATSINTERNALMACRECEIVEERRORS:
+        if (!
+            (COLUMN_DOT3STATSINTERNALMACRECEIVEERRORS_FLAG & rowreq_ctx->
+             column_exists_flags)) {
+            DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_get_column", "column %d (dot3StatsInternalMacReceiveErrors) doesn't exist\n", column));
+            return MFD_SKIP;
+        }
+
+        var->val_len = sizeof(u_long);
+        var->type = ASN_COUNTER;
+        rc = dot3StatsInternalMacReceiveErrors_get(rowreq_ctx,
+                                                   (u_long *) var->val.
+                                                   string);
+        break;
+
+        /*
+         * dot3StatsEtherChipSet(17)/OBJECTID/ASN_OBJECT_ID/oid(oid)//L/A/w/e/r/d/h 
+         */
+    case COLUMN_DOT3STATSETHERCHIPSET:
+        if (!
+            (COLUMN_DOT3STATSETHERCHIPSET_FLAG & rowreq_ctx->
+             column_exists_flags)) {
+            DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_get_column", "column %d (dot3StatsEtherChipSet) doesn't exist\n", column));
+            return MFD_SKIP;
+        }
+
+        var->type = ASN_OBJECT_ID;
+        rc = dot3StatsEtherChipSet_get(rowreq_ctx,
+                                       (oid **) & var->val.string,
+                                       &var->val_len);
+        break;
+
+        /*
+         * dot3StatsSymbolErrors(18)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h 
+         */
+    case COLUMN_DOT3STATSSYMBOLERRORS:
+        if (!
+            (COLUMN_DOT3STATSSYMBOLERRORS_FLAG & rowreq_ctx->
+             column_exists_flags)) {
+            DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_get_column", "column %d (dot3StatsSymbolErrors) doesn't exist\n", column));
+            return MFD_SKIP;
+        }
+
+        var->val_len = sizeof(u_long);
+        var->type = ASN_COUNTER;
+        rc = dot3StatsSymbolErrors_get(rowreq_ctx,
+                                       (u_long *) var->val.string);
+        break;
+
+        /*
+         * dot3StatsDuplexStatus(19)/INTEGER/ASN_INTEGER/long(u_long)//l/A/w/E/r/d/h 
+         */
+    case COLUMN_DOT3STATSDUPLEXSTATUS:
+        if (!
+            (COLUMN_DOT3STATSDUPLEXSTATUS_FLAG & rowreq_ctx->
+             column_exists_flags)) {
+            DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_get_column", "column %d (dot3StatsDuplexStatus) doesn't exist\n", column));
+            return MFD_SKIP;
+        }
+
+        var->val_len = sizeof(u_long);
+        var->type = ASN_INTEGER;
+        rc = dot3StatsDuplexStatus_get(rowreq_ctx,
+                                       (u_long *) var->val.string);
+        break;
+
+        /*
+         * dot3StatsRateControlAbility(20)/TruthValue/ASN_INTEGER/long(u_long)//l/A/w/E/r/d/h 
+         */
+    case COLUMN_DOT3STATSRATECONTROLABILITY:
+        if (!
+            (COLUMN_DOT3STATSRATECONTROLABILITY_FLAG & rowreq_ctx->
+             column_exists_flags)) {
+            DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_get_column", "column %d (dot3StatsRateControlAbility) doesn't exist\n", column));
+            return MFD_SKIP;
+        }
+
+        var->val_len = sizeof(u_long);
+        var->type = ASN_INTEGER;
+        rc = dot3StatsRateControlAbility_get(rowreq_ctx,
+                                             (u_long *) var->val.string);
+        break;
+
+        /*
+         * dot3StatsRateControlStatus(21)/INTEGER/ASN_INTEGER/long(u_long)//l/A/w/E/r/d/h 
+         */
+    case COLUMN_DOT3STATSRATECONTROLSTATUS:
+        if (!
+            (COLUMN_DOT3STATSRATECONTROLSTATUS_FLAG & rowreq_ctx->
+             column_exists_flags)) {
+            DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_get_column", "column %d (dot3StatsRateControlStatus) doesn't exist\n", column));
+            return MFD_SKIP;
+        }
+
+        var->val_len = sizeof(u_long);
+        var->type = ASN_INTEGER;
+        rc = dot3StatsRateControlStatus_get(rowreq_ctx,
+                                            (u_long *) var->val.string);
+        break;
+
+    default:
+        if (DOT3STATSTABLE_MIN_COL <= column
+            && column <= DOT3STATSTABLE_MAX_COL) {
+            DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_get_column", "assume column %d is reserved\n", column));
+            rc = MFD_SKIP;
+        } else {
+            snmp_log(LOG_ERR,
+                     "unknown column %d in _dot3StatsTable_get_column\n",
+                     column);
+        }
+        break;
+    }
+
+    return rc;
+}                               /* _dot3StatsTable_get_column */
+
+int
+_mfd_dot3StatsTable_get_values(netsnmp_mib_handler *handler,
+                               netsnmp_handler_registration *reginfo,
+                               netsnmp_agent_request_info *agtreq_info,
+                               netsnmp_request_info *requests)
+{
+    dot3StatsTable_rowreq_ctx *rowreq_ctx =
+        netsnmp_container_table_row_extract(requests);
+    netsnmp_table_request_info *tri;
+    u_char         *old_string;
+    void            (*dataFreeHook) (void *);
+    int             rc;
+
+    DEBUGMSGTL(("internal:dot3StatsTable:_mfd_dot3StatsTable_get_values",
+                "called\n"));
+
+    netsnmp_assert(NULL != rowreq_ctx);
+
+    DEBUGMSGTL(("9:dot3StatsTable:_mfd_dot3StatsTable_get_values",
+                "exists %u\n", rowreq_ctx->column_exists_flags));
+
+    for (; requests; requests = requests->next) {
+        /*
+         * save old pointer, so we can free it if replaced
+         */
+        old_string = requests->requestvb->val.string;
+        dataFreeHook = requests->requestvb->dataFreeHook;
+        if (NULL == requests->requestvb->val.string) {
+            requests->requestvb->val.string = requests->requestvb->buf;
+            requests->requestvb->val_len =
+                sizeof(requests->requestvb->buf);
+        } else if (requests->requestvb->buf ==
+                   requests->requestvb->val.string) {
+            if (requests->requestvb->val_len !=
+                sizeof(requests->requestvb->buf))
+                requests->requestvb->val_len =
+                    sizeof(requests->requestvb->buf);
+        }
+
+        /*
+         * get column data
+         */
+        tri = netsnmp_extract_table_info(requests);
+        if (NULL == tri)
+            continue;
+
+        rc = _dot3StatsTable_get_column(rowreq_ctx, requests->requestvb,
+                                        tri->colnum);
+        if (rc) {
+            if (MFD_SKIP == rc) {
+                requests->requestvb->type = SNMP_NOSUCHINSTANCE;
+                rc = SNMP_ERR_NOERROR;
+            }
+        } else if (NULL == requests->requestvb->val.string) {
+            snmp_log(LOG_ERR, "NULL varbind data pointer!\n");
+            rc = SNMP_ERR_GENERR;
+        }
+        if (rc)
+            netsnmp_request_set_error(requests, SNMP_VALIDATE_ERR(rc));
+
+        /*
+         * if the buffer wasn't used previously for the old data (i.e. it
+         * was allcoated memory)  and the get routine replaced the pointer,
+         * we need to free the previous pointer.
+         */
+        if (old_string && (old_string != requests->requestvb->buf) &&
+            (requests->requestvb->val.string != old_string)) {
+            if (dataFreeHook)
+                (*dataFreeHook) (old_string);
+            else
+                free(old_string);
+        }
+    }                           /* for results */
+
+    return SNMP_ERR_NOERROR;
+}                               /* _mfd_dot3StatsTable_get_values */
+
+
+/***********************************************************************
+ *
+ * SET processing
+ *
+ ***********************************************************************/
+
+/*
+ * SET PROCESSING NOT APPLICABLE (per MIB or user setting)
+ */
+/***********************************************************************
+ *
+ * DATA ACCESS
+ *
+ ***********************************************************************/
+static void     _container_free(netsnmp_container * container);
+
+/**
+ * @internal
+ */
+static int
+_cache_load(netsnmp_cache * cache, void *vmagic)
+{
+    DEBUGMSGTL(("internal:dot3StatsTable:_cache_load", "called\n"));
+
+    if ((NULL == cache) || (NULL == cache->magic)) {
+        snmp_log(LOG_ERR, "invalid cache for dot3StatsTable_cache_load\n");
+        return -1;
+    }
+
+    /** should only be called for an invalid or expired cache */
+    netsnmp_assert((0 == cache->valid) || (1 == cache->expired));
+
+    /*
+     * call user code
+     */
+    return dot3StatsTable_container_load((netsnmp_container *) cache->
+                                         magic);
+}                               /* _cache_load */
+
+/**
+ * @internal
+ */
+static void
+_cache_free(netsnmp_cache * cache, void *magic)
+{
+    netsnmp_container *container;
+
+    DEBUGMSGTL(("internal:dot3StatsTable:_cache_free", "called\n"));
+
+    if ((NULL == cache) || (NULL == cache->magic)) {
+        snmp_log(LOG_ERR, "invalid cache in dot3StatsTable_cache_free\n");
+        return;
+    }
+
+    container = (netsnmp_container *) cache->magic;
+
+    _container_free(container);
+}                               /* _cache_free */
+
+/**
+ * @internal
+ */
+static void
+_container_item_free(dot3StatsTable_rowreq_ctx * rowreq_ctx, void *context)
+{
+    DEBUGMSGTL(("internal:dot3StatsTable:_container_item_free",
+                "called\n"));
+
+    if (NULL == rowreq_ctx)
+        return;
+
+    dot3StatsTable_release_rowreq_ctx(rowreq_ctx);
+}                               /* _container_item_free */
+
+/**
+ * @internal
+ */
+static void
+_container_free(netsnmp_container * container)
+{
+    DEBUGMSGTL(("internal:dot3StatsTable:_container_free", "called\n"));
+
+    if (NULL == container) {
+        snmp_log(LOG_ERR,
+                 "invalid container in dot3StatsTable_container_free\n");
+        return;
+    }
+
+    /*
+     * call user code
+     */
+    dot3StatsTable_container_free(container);
+
+    /*
+     * free all items. inefficient, but easy.
+     */
+    CONTAINER_CLEAR(container,
+                    (netsnmp_container_obj_func *) _container_item_free,
+                    NULL);
+}                               /* _container_free */
+
+/**
+ * @internal
+ * initialize the container with functions or wrappers
+ */
+void
+_dot3StatsTable_container_init(dot3StatsTable_interface_ctx * if_ctx)
+{
+    DEBUGMSGTL(("internal:dot3StatsTable:_dot3StatsTable_container_init",
+                "called\n"));
+
+    /*
+     * cache init
+     */
+    if_ctx->cache = netsnmp_cache_create(30,    /* timeout in seconds */
+                                         _cache_load, _cache_free,
+                                         dot3StatsTable_oid,
+                                         dot3StatsTable_oid_size);
+
+    if (NULL == if_ctx->cache) {
+        snmp_log(LOG_ERR, "error creating cache for dot3StatsTable\n");
+        return;
+    }
+
+    if_ctx->cache->flags = NETSNMP_CACHE_DONT_INVALIDATE_ON_SET;
+
+    dot3StatsTable_container_init(&if_ctx->container, if_ctx->cache);
+    if (NULL == if_ctx->container)
+        if_ctx->container =
+            netsnmp_container_find("dot3StatsTable:table_container");
+    if (NULL == if_ctx->container) {
+        snmp_log(LOG_ERR, "error creating container in "
+                 "dot3StatsTable_container_init\n");
+        return;
+    }
+
+    if (NULL != if_ctx->cache)
+        if_ctx->cache->magic = (void *) if_ctx->container;
+}                               /* _dot3StatsTable_container_init */
+
+/**
+ * @internal
+ * shutdown the container with functions or wrappers
+ */
+void
+_dot3StatsTable_container_shutdown(dot3StatsTable_interface_ctx * if_ctx)
+{
+    DEBUGMSGTL(("internal:dot3StatsTable:_dot3StatsTable_container_shutdown", "called\n"));
+
+    dot3StatsTable_container_shutdown(if_ctx->container);
+
+    _container_free(if_ctx->container);
+
+}