1From 5ad4eab43c1ea63ff343bba64d576440e8783e75 Mon Sep 17 00:00:00 2001
2From: Zheng Ruoqin <zhengrq.fnst@fujitsu.com>
3Date: Wed, 9 Jun 2021 15:47:30 +0900
4Subject: [PATCH] net snmp: fix engineBoots value on SIGHUP
5
6Upstream-Status: Pending
7
8Signed-off-by: Marian Florea <marian.florea@windriver.com>
9Signed-off-by: Li Zhou <li.zhou@windriver.com>
10Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
11
12---
13 agent/snmpd.c    | 1 +
14 snmplib/snmpv3.c | 4 ++--
15 2 files changed, 3 insertions(+), 2 deletions(-)
16
17diff --git a/agent/snmpd.c b/agent/snmpd.c
18index 90de12d..1ccc4db 100644
19--- a/agent/snmpd.c
20+++ b/agent/snmpd.c
21@@ -1169,6 +1169,7 @@ snmpd_reconfig(void)
22     snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n",
23              netsnmp_get_version());
24     update_config();
25+    snmp_store(app_name);
26     send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3);
27 #ifdef HAVE_SIGPROCMASK
28     ret = sigprocmask(SIG_UNBLOCK, &set, NULL);
29diff --git a/snmplib/snmpv3.c b/snmplib/snmpv3.c
30index 7b1746b..4a17e0d 100644
31--- a/snmplib/snmpv3.c
32+++ b/snmplib/snmpv3.c
33@@ -1059,9 +1059,9 @@ init_snmpv3_post_config(int majorid, int minorid, void *serverarg,
34     /*
35      * if our engineID has changed at all, the boots record must be set to 1
36      */
37-    if (engineIDLen != oldEngineIDLength ||
38+    if (oldEngineIDLength != (size_t)0 && (engineIDLen != oldEngineIDLength ||
39         oldEngineID == NULL || c_engineID == NULL ||
40-        memcmp(oldEngineID, c_engineID, engineIDLen) != 0) {
41+        memcmp(oldEngineID, c_engineID, engineIDLen) != 0)) {
42         engineBoots = 1;
43     }
44
45