From c85b61bbd0a95182b68d96ee94912d69cec5224a Mon Sep 17 00:00:00 2001
From: "Eric A. Miller" <emiller@cpan.org>
Date: Thu, 18 Dec 2014 22:05:33 -0500
Subject: [PATCH] Fix single instance leafs defined in %FUNCS to behave like
 table leafs;  return a reference to a hash and don't add zero instance
 identifier

---
 ChangeLog | 14 ++++++++++----
 Info.pm   |  3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 734d569d..05661bab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 SNMP::Info - Friendly OO-style interface to Network devices using SNMP.
 
+version 3.24
+
+   [BUG FIXES]
+
+    * Fix single instance leafs defined in %FUNCS to behave like table leafs
+
 version 3.23 (2014-12-09)
 
    [ENHANCEMENTS]
@@ -15,17 +21,17 @@ version 3.23 (2014-12-09)
 
 version 3.22 (2014-12-02)
 
-   [ENHANCEMENTS]
+   [NEW FEATURES]
 
-    * Include LLDP support in base Layer2 and Layer3 classes. Due to the
-      widespread adoption of LLDP, this should improve mapping networks
-      when devices aren't supported in a more specific class.
     * Support obtaining FDB in Avaya SPBM edge deployments in L2::Baystack
       NOTE: This requires a RAPID-CITY MIB with the rcBridgeSpbmMacTable
     * Support for Fortinet devices in new class L3::Fortinet
 
    [ENHANCEMENTS]
 
+    * Include LLDP support in base Layer2 and Layer3 classes. Due to the
+      widespread adoption of LLDP, this should improve mapping networks
+      when devices aren't supported in a more specific class.
     * No longer ignore interfaces based on name, in base L2/L3/L7 device
       classes. For several device classes SNMP::Info will now return tunnel
       interfaces and/or loopbacks, if present.
diff --git a/Info.pm b/Info.pm
index 655ab5f5..71044356 100644
--- a/Info.pm
+++ b/Info.pm
@@ -4545,7 +4545,8 @@ sub _validate_autoload_method {
     my $table_leaf = 0;
 
     if ( !$globals->{$attr}
-        && ( defined $indexes && scalar( @{$indexes} ) > 0 ) )
+        && ( ( defined $indexes && scalar( @{$indexes} ) > 0 )
+            || $funcs->{$attr} ))
     {
         $table_leaf = 1;
     }