mirror of
https://github.com/Cacti/spine.git
synced 2026-10-23 03:27:10 +09:00
Fixing spine capabilities (#493)
In my SQL buffers commit, I had broken spine capabilities. Should learn not to code after a long days work and visiting with loved ones.
This commit is contained in:
1 parent
9a2f304f2c
commit
1cc6168bc9
1 file changed
+14
-13
@@ -342,10 +342,14 @@ void read_config_options() {
|
||||
char sqlbuf[HUGE_BUFSIZE];
|
||||
char *sqlp = sqlbuf;
|
||||
const char *res;
|
||||
char spine_priv[BUFSIZE];
|
||||
char spine_auth[BUFSIZE];
|
||||
char spine_capabilities[BUFSIZE];
|
||||
|
||||
/* publish spine snmpv3 capabilities to the database */
|
||||
memset(spine_capabilities, 0, sizeof(spine_capabilities));
|
||||
memset(spine_priv, 0, sizeof(spine_priv));
|
||||
memset(spine_auth, 0, sizeof(spine_auth));
|
||||
|
||||
db_connect(LOCAL, &mysql);
|
||||
|
||||
@@ -744,43 +748,40 @@ void read_config_options() {
|
||||
/* log the snmp_max_get_size variable */
|
||||
SPINE_LOG_DEBUG(("DEBUG: The Maximum SNMP OID Get Size is %i", set.snmp_max_get_size));
|
||||
|
||||
strcat(spine_capabilities, "{ authProtocols: \"");
|
||||
#ifndef NETSNMP_DISABLE_MD5
|
||||
strcat(spine_capabilities, "MD5");
|
||||
strcat(spine_auth, "MD5");
|
||||
#endif
|
||||
|
||||
strcat(spine_capabilities, (strlen(spine_capabilities) > 0 ? ",SHA":"SHA"));
|
||||
strcat(spine_auth, (strlen(spine_auth) > 0 ? ",SHA":"SHA"));
|
||||
|
||||
#if defined(NETSNMP_USMAUTH_HMAC128SHA224)
|
||||
strcat(spine_capabilities, ",SHA224,SHA256");
|
||||
strcat(spine_auth, ",SHA224,SHA256");
|
||||
#endif
|
||||
|
||||
#if defined(NETSNMP_USMAUTH_HMAC192SHA256)
|
||||
strcat(spine_capabilities, ",SHA384,SHA512");
|
||||
strcat(spine_auth, ",SHA384,SHA512");
|
||||
#endif
|
||||
strcat(spine_capabilities, "\"");
|
||||
|
||||
strcat(spine_capabilities, ", privProtocols: \"");
|
||||
|
||||
#ifndef NETSNMP_DISABLE_DES
|
||||
strcat(spine_capabilities, "DES");
|
||||
strcat(spine_priv, "DES");
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_AES
|
||||
// cppcheck-suppress knownConditionTrueFalse
|
||||
strcat(spine_capabilities, (strlen(spine_capabilities) > 0 ? ",AES128":"AES128"));
|
||||
strcat(spine_priv, (strlen(spine_priv) > 0 ? ",AES128":"AES128"));
|
||||
#endif
|
||||
|
||||
#if defined(NETSNMP_DRAFT_BLUMENTHAL_AES_04)
|
||||
// cppcheck-suppress knownConditionTrueFalse
|
||||
strcat(spine_capabilities, (strlen(spine_capabilities) > 0 ? ",AES192":"AES192"));
|
||||
strcat(spine_priv, (strlen(spine_priv) > 0 ? ",AES192":"AES192"));
|
||||
#endif
|
||||
|
||||
#if defined(NETSNMP_DRAFT_BLUMENTHAL_AES_04)
|
||||
// cppcheck-suppress knownConditionTrueFalse
|
||||
strcat(spine_capabilities, (strlen(spine_capabilities) > 0 ? ",AES256":"AES256"));
|
||||
strcat(spine_priv, (strlen(spine_priv) > 0 ? ",AES256":"AES256"));
|
||||
#endif
|
||||
strcat(spine_capabilities, "\" }");
|
||||
|
||||
snprintf(spine_capabilities, BUFSIZE, "{ authProtocols: \"%s\", privProtocols: \"%s\" }", spine_auth, spine_priv);
|
||||
|
||||
if (set.poller_id == 1) {
|
||||
putsetting(&mysql, LOCAL, "spine_capabilities", spine_capabilities);
|
||||
|
||||
Reference in new issue
Block a user