diff options
Diffstat (limited to 'lib/utils_base.c')
-rw-r--r-- | lib/utils_base.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/utils_base.c b/lib/utils_base.c index 08fa215c..c458cf61 100644 --- a/lib/utils_base.c +++ b/lib/utils_base.c | |||
@@ -24,7 +24,7 @@ | |||
24 | * | 24 | * |
25 | *****************************************************************************/ | 25 | *****************************************************************************/ |
26 | 26 | ||
27 | #include "common.h" | 27 | #include "../plugins/common.h" |
28 | #include <stdarg.h> | 28 | #include <stdarg.h> |
29 | #include "utils_base.h" | 29 | #include "utils_base.h" |
30 | #include <ctype.h> | 30 | #include <ctype.h> |
@@ -319,18 +319,18 @@ char *np_extract_value(const char *varlist, const char *name, char sep) { | |||
319 | 319 | ||
320 | while (1) { | 320 | while (1) { |
321 | /* Strip any leading space */ | 321 | /* Strip any leading space */ |
322 | for (varlist; isspace(varlist[0]); varlist++); | 322 | for (; isspace(varlist[0]); varlist++); |
323 | 323 | ||
324 | if (strncmp(name, varlist, strlen(name)) == 0) { | 324 | if (strncmp(name, varlist, strlen(name)) == 0) { |
325 | varlist += strlen(name); | 325 | varlist += strlen(name); |
326 | /* strip trailing spaces */ | 326 | /* strip trailing spaces */ |
327 | for (varlist; isspace(varlist[0]); varlist++); | 327 | for (; isspace(varlist[0]); varlist++); |
328 | 328 | ||
329 | if (varlist[0] == '=') { | 329 | if (varlist[0] == '=') { |
330 | /* We matched the key, go past the = sign */ | 330 | /* We matched the key, go past the = sign */ |
331 | varlist++; | 331 | varlist++; |
332 | /* strip leading spaces */ | 332 | /* strip leading spaces */ |
333 | for (varlist; isspace(varlist[0]); varlist++); | 333 | for (; isspace(varlist[0]); varlist++); |
334 | 334 | ||
335 | if (tmp = index(varlist, sep)) { | 335 | if (tmp = index(varlist, sep)) { |
336 | /* Value is delimited by a comma */ | 336 | /* Value is delimited by a comma */ |
@@ -402,20 +402,20 @@ int mp_translate_state (char *state_text) { | |||
402 | * parse of argv, so that uniqueness in parameters are reflected there. | 402 | * parse of argv, so that uniqueness in parameters are reflected there. |
403 | */ | 403 | */ |
404 | char *_np_state_generate_key() { | 404 | char *_np_state_generate_key() { |
405 | struct sha1_ctx ctx; | 405 | struct sha256_ctx ctx; |
406 | int i; | 406 | int i; |
407 | char **argv = this_monitoring_plugin->argv; | 407 | char **argv = this_monitoring_plugin->argv; |
408 | unsigned char result[20]; | 408 | unsigned char result[20]; |
409 | char keyname[41]; | 409 | char keyname[41]; |
410 | char *p=NULL; | 410 | char *p=NULL; |
411 | 411 | ||
412 | sha1_init_ctx(&ctx); | 412 | sha256_init_ctx(&ctx); |
413 | 413 | ||
414 | for(i=0; i<this_monitoring_plugin->argc; i++) { | 414 | for(i=0; i<this_monitoring_plugin->argc; i++) { |
415 | sha1_process_bytes(argv[i], strlen(argv[i]), &ctx); | 415 | sha256_process_bytes(argv[i], strlen(argv[i]), &ctx); |
416 | } | 416 | } |
417 | 417 | ||
418 | sha1_finish_ctx(&ctx, &result); | 418 | sha256_finish_ctx(&ctx, &result); |
419 | 419 | ||
420 | for (i=0; i<20; ++i) { | 420 | for (i=0; i<20; ++i) { |
421 | sprintf(&keyname[2*i], "%02x", result[i]); | 421 | sprintf(&keyname[2*i], "%02x", result[i]); |