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