0001-Fix-build-when-SNMPv3-is-disabled.patch 3.2 KB

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