1From 2a0fe384eec254643ca2176ccfcbbd036a5aad06 Mon Sep 17 00:00:00 2001 2From: Luca Ceresoli <luca@lucaceresoli.net> 3Date: Tue, 14 Jul 2020 10:30:10 +0200 4Subject: [PATCH] Fix build when SNMPv3 is disabled 5 6agentpp has ifdefs to disable v3 code when SNMPv3 is disabled. However it 7is missing one and it has a few ones in excess. Fix them. 8 9Upstream is aware, says "will fix in later version", but thinks to make v3 10mandatory. See discussion at 11https://forum.snmp.app/t/agent-compile-fails-if-snmp-has-disable-snmpv3/326 12 13Upstream status: none, upstream is not welcoming contributions. 14 15Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> 16--- 17 include/agent_pp/notification_log_mib.h | 4 ++-- 18 include/agent_pp/notification_originator.h | 2 ++ 19 include/agent_pp/snmp_community_mib.h | 4 ++-- 20 src/notification_originator.cpp | 2 ++ 21 4 files changed, 8 insertions(+), 4 deletions(-) 22 23diff --git a/include/agent_pp/notification_log_mib.h b/include/agent_pp/notification_log_mib.h 24index ddac05e515d9..8fd8cfec32ca 100644 25--- a/include/agent_pp/notification_log_mib.h 26+++ b/include/agent_pp/notification_log_mib.h 27@@ -22,7 +22,7 @@ 28 29 //--AgentGen BEGIN=_BEGIN 30 #include <agent_pp/agent++.h> 31-#ifdef _SNMPv3 32+// #ifdef _SNMPv3 // This file deos not look SNMPv3-specific 33 #include <agent_pp/mib_complex_entry.h> 34 //--AgentGen END 35 36@@ -688,6 +688,6 @@ protected: 37 */ 38 39 40-#endif 41+// #endif // _SNMPv3 42 43 44diff --git a/include/agent_pp/notification_originator.h b/include/agent_pp/notification_originator.h 45index 95e8b4e1836d..6f50cd52625b 100644 46--- a/include/agent_pp/notification_originator.h 47+++ b/include/agent_pp/notification_originator.h 48@@ -307,7 +307,9 @@ class AGENTPP_DECL NotificationOriginator: public NotificationSender { 49 */ 50 virtual nlmLogEntry* get_nlm_log_entry(); 51 52+#ifdef _SNMPv3 53 virtual v3MP* get_v3mp(); 54+#endif 55 56 protected: 57 58diff --git a/include/agent_pp/snmp_community_mib.h b/include/agent_pp/snmp_community_mib.h 59index 7d5c4558f36d..d9eb2b4a87ec 100644 60--- a/include/agent_pp/snmp_community_mib.h 61+++ b/include/agent_pp/snmp_community_mib.h 62@@ -49,7 +49,7 @@ namespace Agentpp { 63 #define oidSnmpTrapAddress "1.3.6.1.6.3.18.1.3.0" 64 #define oidSnmpTrapCommunity "1.3.6.1.6.3.18.1.4.0" 65 66-#ifdef _SNMPv3 67+// #ifdef _SNMPv3 // This file deos not look SNMPv3-specific 68 69 /** 70 * snmpCommunityName 71@@ -346,7 +346,7 @@ class AGENTPP_DECL snmp_community_mib: public MibGroup 72 static void add_public(); 73 static void add_public(Mib* mib); 74 }; 75-#endif 76+// #endif // _SNMPv3 77 78 #ifdef AGENTPP_NAMESPACE 79 } 80diff --git a/src/notification_originator.cpp b/src/notification_originator.cpp 81index d7d566869998..39ddbe08cdeb 100644 82--- a/src/notification_originator.cpp 83+++ b/src/notification_originator.cpp 84@@ -237,6 +237,7 @@ nlmLogEntry* NotificationOriginator::get_nlm_log_entry() { 85 return nlmLogEntry::instance; 86 } 87 88+#ifdef _SNMPv3 89 v3MP* NotificationOriginator::get_v3mp() { 90 if (mib) { 91 return mib->get_request_list()->get_v3mp(); 92@@ -244,6 +245,7 @@ v3MP* NotificationOriginator::get_v3mp() { 93 return v3MP::I; 94 } 95 } 96+#endif 97 98 99 bool NotificationOriginator::check_access(ListCursor<MibTableRow>& cur, 100-- 1012.27.0 102 103