forked from pool/collectd
Thomas Renninger
930b12b681
- Update to version 5.12.0.130.g2f3c12e: * Fix formatting in mdadm events table * Add new exec-borg script to contrib/ * ChangeLog: v5.12 milestone: Fix issue #3127 * use derive_t instead of int inside ovs_stats_get_port_stat_value * In macOS 12, `IOMasterPort` is deprecated in favor of `IOMainPort` * - allow alertmanager correlation and resolve - fix meta names with ':' * fix drop probability * add config option to write metadata - Fix build issue if net-snmp has NETSNMP_DISABLE_MD5 set: A Fix-compile-issue-if-net-snmp-has-NETSNMP_DISABLE_MD5-set.patch - Use autosetup and adopt patches from -p0 to -p1: M collectd-fix-config.patch M collectd-fix_spamassassin_doc.patch - Use obs_scm and others in _service file: A _service A _servicedata A collectd.obsinfo OBS-URL: https://build.opensuse.org/request/show/1062318 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=178
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From: Thomas Renninger <trenn@suse.com>
|
|
Subject: Fix compile issue if net-snmp has NETSNMP_DISABLE_MD5 set
|
|
References:
|
|
Patch-Mainline:
|
|
Git-commit: be1a9d5975e4568774a46711d1366086978e9347
|
|
Git-repo: git@github.com:watologo1/collectd.git.git
|
|
|
|
Otherwise one gets:
|
|
src/snmp.c: In function 'csnmp_config_add_host_auth_protocol':
|
|
src/snmp.c:678:25: error: 'usmHMACMD5AuthProtocol' undeclared (first use in this function); did you mean 'usmHMACSHA1AuthProtocol'?
|
|
678 | hd->auth_protocol = usmHMACMD5AuthProtocol;
|
|
| ^~~~~~~~~~~~~~~~~~~~~~
|
|
| usmHMACSHA1AuthProtocol
|
|
|
|
|
|
Signed-off-by: <trenn@suse.com>
|
|
diff --git a/src/snmp.c b/src/snmp.c
|
|
index 827d62eb..078ef3ee 100644
|
|
--- a/src/snmp.c
|
|
+++ b/src/snmp.c
|
|
@@ -677,7 +677,7 @@ static int csnmp_config_add_host_auth_protocol(host_definition_t *hd,
|
|
if (status != 0)
|
|
return status;
|
|
|
|
-#ifdef NETSNMP_USMAUTH_HMACMD5
|
|
+#ifndef NETSNMP_DISABLE_MD5
|
|
if (strcasecmp("MD5", buffer) == 0) {
|
|
hd->auth_protocol = usmHMACMD5AuthProtocol;
|
|
hd->auth_protocol_len = sizeof(usmHMACMD5AuthProtocol) / sizeof(oid);
|