From b8f83ab72333e6872eb0d978638ab5b7812bfecf Mon Sep 17 00:00:00 2001 From: Kannan KVS Date: Mon, 16 Sep 2019 13:23:39 -0700 Subject: [PATCH] resolving conflict on series file based on recent commit --- ...e-all-requests-that-use-this-session.patch | 26 ------------------- .../0007-Linux-VRF-5.7.3-Support.patch | 2 +- src/snmpd/patch-5.7.3+dfsg/series | 2 +- 3 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 src/snmpd/patch-5.7.3+dfsg/0006-Release-all-requests-that-use-this-session.patch diff --git a/src/snmpd/patch-5.7.3+dfsg/0006-Release-all-requests-that-use-this-session.patch b/src/snmpd/patch-5.7.3+dfsg/0006-Release-all-requests-that-use-this-session.patch deleted file mode 100644 index 66a18eb17245..000000000000 --- a/src/snmpd/patch-5.7.3+dfsg/0006-Release-all-requests-that-use-this-session.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 84846206c7ee230bd7b6274af98513952c4a7a7f Mon Sep 17 00:00:00 2001 -From: Renuka Manavalan -Date: Wed, 7 Aug 2019 21:48:33 +0000 -Subject: [PATCH] Release all requests that use this session. - ---- - agent/snmp_agent.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/agent/snmp_agent.c b/agent/snmp_agent.c -index b96d650..ee3b0da 100644 ---- a/agent/snmp_agent.c -+++ b/agent/snmp_agent.c -@@ -1542,7 +1542,8 @@ netsnmp_remove_delegated_requests_for_session(netsnmp_session *sess) - * check each request - */ - netsnmp_request_info *request; -- for(request = asp->requests; request; request = request->next) { -+ int i; -+ for(i = 0, request = asp->requests; i < asp->vbcount; ++i, ++request) { - /* - * check session - */ --- -2.17.1 - diff --git a/src/snmpd/patch-5.7.3+dfsg/0007-Linux-VRF-5.7.3-Support.patch b/src/snmpd/patch-5.7.3+dfsg/0007-Linux-VRF-5.7.3-Support.patch index b59291811a25..f0c902d6d481 100755 --- a/src/snmpd/patch-5.7.3+dfsg/0007-Linux-VRF-5.7.3-Support.patch +++ b/src/snmpd/patch-5.7.3+dfsg/0007-Linux-VRF-5.7.3-Support.patch @@ -1,7 +1,7 @@ From 49ce7fc078dfa8c1a1688e05de4e2d151dbcd76a Mon Sep 17 00:00:00 2001 From: Harish Venkatraman Date: Wed, 17 Oct 2018 15:22:04 -0700 -Subject: [PATCH] Linux-VRF 5.7.3 Support +Subject: [PATCH] Linux-VRF 5.7.3 Support from https://sourceforge.net/p/net-snmp/patches/1376/ --- agent/agent_trap.c | 20 ++++++++++-- diff --git a/src/snmpd/patch-5.7.3+dfsg/series b/src/snmpd/patch-5.7.3+dfsg/series index facfae92ae00..a8741fb5bb9d 100644 --- a/src/snmpd/patch-5.7.3+dfsg/series +++ b/src/snmpd/patch-5.7.3+dfsg/series @@ -3,5 +3,5 @@ 0003-CHANGES-BUG-2743-snmpd-crashes-when-receiving-a-GetN.patch 0004-Disable-SNMPv1.patch 0005-Port-OpenSSL-1.1.0-with-support-for-1.0.2.patch -0006-Release-all-requests-that-use-this-session.patch +0006-From-Jiri-Cervenka-snmpd-Fixed-agentx-crashing-and-or-freezing-on-timeout.patch 0007-Linux-VRF-5.7.3-Support.patch