12 files changed, 46 insertions, 30 deletions

diff --git a/lib/parse_ini.c b/lib/parse_ini.c
index 25abc89..547af43 100644
--- a/lib/parse_ini.c
+++ b/lib/parse_ini.c
@@ -78,7 +78,7 @@ static char *default_file_in_path(void);
 /*
  * Parse_locator decomposes a string of the form
  *      [stanza][@filename]
- * into its seperate parts.
+ * into its separate parts.
  */
 static void
 parse_locator(const char *locator, const char *def_stanza, np_ini_info *i)
@@ -169,7 +169,7 @@ read_defaults(FILE *f, const char *stanza, np_arg_list **opts)
                 if (isspace(c))
                         continue;
                 switch (c) {
-                        /* globble up coment lines */
+                        /* globble up comment lines */
                 case ';':
                 case '#':
                         GOBBLE_TO(f, c, '\n');
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index a8d7ade..31d79df 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -27,7 +27,7 @@ endif
 
 AM_CFLAGS = -g -I$(top_srcdir)/lib -I$(top_srcdir)/gl $(tap_cflags)
 AM_LDFLAGS = $(tap_ldflags) -ltap
-LDADD = $(top_srcdir)/lib/libmonitoringplug.a $(top_srcdir)/gl/libgnu.a
+LDADD = $(top_srcdir)/lib/libmonitoringplug.a $(top_srcdir)/gl/libgnu.a $(LIB_CRYPTO)
 
 SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini1.c test_ini3.c test_opts1.c test_opts2.c test_opts3.c
 
diff --git a/lib/tests/test_cmd.c b/lib/tests/test_cmd.c
index 29ca42a..4bb60aa 100644
--- a/lib/tests/test_cmd.c
+++ b/lib/tests/test_cmd.c
@@ -176,14 +176,14 @@ main (int argc, char **argv)
         ok (result == UNSET, "(initialised) Checking exit code is reset");
 
         command = (char *)malloc(COMMAND_LINE);
-        strcpy(command, "/bin/echo3456 non-existant command");
+        strcpy(command, "/bin/echo3456 non-existent command");
         result = cmd_run (command, &chld_out, &chld_err, 0);
 
         ok (chld_out.lines == 0,
-                        "Non existant command, so no output");
+                        "Non existent command, so no output");
         ok (chld_err.lines == 0,
                         "No stderr either");
-        ok (result == 3, "Get return code 3 (?) for non-existant command");
+        ok (result == 3, "Get return code 3 (?) for non-existent command");
 
 
         /* ensure everything is empty again */
@@ -192,14 +192,14 @@ main (int argc, char **argv)
         result = UNSET;
 
         command = (char *)malloc(COMMAND_LINE);
-        strcpy(command, "/bin/sh non-existant-file");
+        strcpy(command, "/bin/sh non-existent-file");
         result = cmd_run (command, &chld_out, &chld_err, 0);
 
         ok (chld_out.lines == 0,
                         "/bin/sh returns no stdout when file is missing...");
         ok (chld_err.lines == 1,
                         "...but does give an error line");
-        ok (strstr(chld_err.line[0],"non-existant-file") != NULL, "And missing filename is in error message");
+        ok (strstr(chld_err.line[0],"non-existent-file") != NULL, "And missing filename is in error message");
         ok (result != 0, "Get non-zero return code from /bin/sh");
 
 
@@ -219,11 +219,11 @@ main (int argc, char **argv)
         result = UNSET;
 
         command = (char *)malloc(COMMAND_LINE);
-        strcpy(command, "/bin/non-existant-command");
+        strcpy(command, "/bin/non-existent-command");
         result = cmd_run (command, &chld_out, &chld_err, 0);
 
         ok (chld_out.lines == 0,
-                        "/bin/non-existant-command returns no stdout...");
+                        "/bin/non-existent-command returns no stdout...");
         ok (chld_err.lines == 0,
                         "...and no stderr output either");
         ok (result == 3, "Get return code 3 = UNKNOWN when command does not exist");
diff --git a/lib/tests/test_disk.c b/lib/tests/test_disk.c
index f6477ac..9bd68c7 100644
--- a/lib/tests/test_disk.c
+++ b/lib/tests/test_disk.c
@@ -88,10 +88,10 @@ main (int argc, char **argv)
                                   cflags, 3,strdup("regex on dev names:"));
         np_test_mount_entry_regex(dummy_mount_list, strdup("/foo"),
                                   cflags, 0,
-                                  strdup("regex on non existant dev/path:"));
+                                  strdup("regex on non existent dev/path:"));
         np_test_mount_entry_regex(dummy_mount_list, strdup("/Foo"),
                                   cflags | REG_ICASE,0,
-                                  strdup("regi on non existant dev/path:"));
+                                  strdup("regi on non existent dev/path:"));
         np_test_mount_entry_regex(dummy_mount_list, strdup("/c.t0"),
                                   cflags, 3,
                                   strdup("partial devname regex match:"));
diff --git a/lib/tests/test_ini3.t b/lib/tests/test_ini3.t
index a2ca94a..41169db 100755
--- a/lib/tests/test_ini3.t
+++ b/lib/tests/test_ini3.t
@@ -10,7 +10,7 @@ if (! -e "./test_ini3") {
 # array of argument arrays
 #   - First value is the expected return code
 #   - 2nd value is the NAGIOS_CONFIG_PATH
-#     TODO: looks like we look in default path after looking trough this variable - shall we?
+#     TODO: looks like we look in default path after looking through this variable - shall we?
 #   - 3rd value is the plugin name
 #   - 4th is the ini locator
 my @TESTS = (
diff --git a/lib/tests/test_opts3.t b/lib/tests/test_opts3.t
index 8d974ca..d77a35c 100755
--- a/lib/tests/test_opts3.t
+++ b/lib/tests/test_opts3.t
@@ -10,7 +10,7 @@ if (! -e "./test_opts3") {
 # array of argument arrays
 #   - First value is the expected return code
 #   - 2nd value is the NAGIOS_CONFIG_PATH
-#     TODO: looks like we look in default path after looking trough this variable - shall we?
+#     TODO: looks like we look in default path after looking through this variable - shall we?
 #   - 3rd value is the plugin name
 #   - 4th and up are arguments
 my @TESTS = (
diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c
index f35b7e2..7b10494 100644
--- a/lib/tests/test_utils.c
+++ b/lib/tests/test_utils.c
@@ -309,7 +309,7 @@ main (int argc, char **argv)
 
         /* This is the result of running ./test_utils */
         temp_string = (char *) _np_state_generate_key();
-        ok(!strcmp(temp_string, "83d877b6cdfefb5d6f06101fd6fe76762f21792c"), "Got hash with exe and no parameters" ) || 
+        ok(!strcmp(temp_string, "e2d17f995fd4c020411b85e3e3d0ff7306d4147e"), "Got hash with exe and no parameters" ) ||
         diag( "You are probably running in wrong directory. Must run as ./test_utils" );
 
 
@@ -319,7 +319,7 @@ main (int argc, char **argv)
         this_monitoring_plugin->argv[2] = "--and";
         this_monitoring_plugin->argv[3] = "now";
         temp_string = (char *) _np_state_generate_key();
-        ok(!strcmp(temp_string, "94b5e17bf5abf51cb15aff5f69b96f2f8dac5ecd"), "Got based on expected argv" );
+        ok(!strcmp(temp_string, "bd72da9f78ff1419fad921ea5e43ce56508aef6c"), "Got based on expected argv" );
 
         unsetenv("MP_STATE_PATH");
         temp_string = (char *) _np_state_calculate_location_prefix();
@@ -342,7 +342,7 @@ main (int argc, char **argv)
         np_enable_state(NULL, 51);
         temp_state_key = this_monitoring_plugin->state;
         ok( !strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name" );
-        ok( !strcmp(temp_state_key->name, "83d877b6cdfefb5d6f06101fd6fe76762f21792c"), "Got generated filename" );
+        ok( !strcmp(temp_state_key->name, "e2d17f995fd4c020411b85e3e3d0ff7306d4147e"), "Got generated filename" );
 
 
         np_enable_state("allowedchars_in_keyname", 77);
@@ -395,7 +395,7 @@ main (int argc, char **argv)
         ok( temp_state_data==NULL, "Older data version gives NULL" );
         temp_state_key->data_version=54;
 
-        temp_state_key->_filename="var/nonexistant";
+        temp_state_key->_filename="var/nonexistent";
         temp_state_data = np_state_read();
         ok( temp_state_data==NULL, "Missing file gives NULL" );
         ok( this_monitoring_plugin->state->state_data==NULL, "No state information" );
diff --git a/lib/utils_base.c b/lib/utils_base.c
index 08fa215..c458cf6 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -24,7 +24,7 @@
 *
 *****************************************************************************/
 
-#include "common.h"
+#include "../plugins/common.h"
 #include <stdarg.h>
 #include "utils_base.h"
 #include <ctype.h>
@@ -319,18 +319,18 @@ char *np_extract_value(const char *varlist, const char *name, char sep) {
 
         while (1) {
                 /* Strip any leading space */
-                for (varlist; isspace(varlist[0]); varlist++);
+                for (; isspace(varlist[0]); varlist++);
 
                 if (strncmp(name, varlist, strlen(name)) == 0) {
                         varlist += strlen(name);
                         /* strip trailing spaces */
-                        for (varlist; isspace(varlist[0]); varlist++);
+                        for (; isspace(varlist[0]); varlist++);
 
                         if (varlist[0] == '=') {
                                 /* We matched the key, go past the = sign */
                                 varlist++;
                                 /* strip leading spaces */
-                                for (varlist; isspace(varlist[0]); varlist++);
+                                for (; isspace(varlist[0]); varlist++);
 
                                 if (tmp = index(varlist, sep)) {
                                         /* Value is delimited by a comma */
@@ -402,20 +402,20 @@ int mp_translate_state (char *state_text) {
  * parse of argv, so that uniqueness in parameters are reflected there.
  */
 char *_np_state_generate_key() {
-        struct sha1_ctx ctx;
+        struct sha256_ctx ctx;
         int i;
         char **argv = this_monitoring_plugin->argv;
         unsigned char result[20];
         char keyname[41];
         char *p=NULL;
 
-        sha1_init_ctx(&ctx);
+        sha256_init_ctx(&ctx);
         
         for(i=0; i<this_monitoring_plugin->argc; i++) {
-                sha1_process_bytes(argv[i], strlen(argv[i]), &ctx);
+                sha256_process_bytes(argv[i], strlen(argv[i]), &ctx);
         }
 
-        sha1_finish_ctx(&ctx, &result);
+        sha256_finish_ctx(&ctx, &result);
         
         for (i=0; i<20; ++i) {
                 sprintf(&keyname[2*i], "%02x", result[i]);
diff --git a/lib/utils_base.h b/lib/utils_base.h
index 9482f23..5906550 100644
--- a/lib/utils_base.h
+++ b/lib/utils_base.h
@@ -2,7 +2,7 @@
 #define _UTILS_BASE_
 /* Header file for Monitoring Plugins utils_base.c */
 
-#include "sha1.h"
+#include "sha256.h"
 
 /* This file holds header information for thresholds - use this in preference to 
    individual plugin logic */
diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c
index 795840d..8b8e570 100644
--- a/lib/utils_cmd.c
+++ b/lib/utils_cmd.c
@@ -161,7 +161,7 @@ _cmd_open (char *const *argv, int *pfd, int *pfderr)
         }
 
         /* parent picks up execution here */
-        /* close childs descriptors in our address space */
+        /* close children descriptors in our address space */
         close (pfd[1]);
         close (pfderr[1]);
 
diff --git a/lib/utils_disk.c b/lib/utils_disk.c
index 4f16068..468769b 100644
--- a/lib/utils_disk.c
+++ b/lib/utils_disk.c
@@ -47,9 +47,10 @@ np_add_parameter(struct parameter_list **list, const char *name)
   struct parameter_list *current = *list;
   struct parameter_list *new_path;
   new_path = (struct parameter_list *) malloc (sizeof *new_path);
-  new_path->name = (char *) name;
+  new_path->name = (char *) malloc(strlen(name) + 1);
   new_path->best_match = NULL;
   new_path->name_next = NULL;
+  new_path->name_prev = NULL;
   new_path->freespace_bytes = NULL;
   new_path->freespace_units = NULL;
   new_path->freespace_percent = NULL;
@@ -75,13 +76,17 @@ np_add_parameter(struct parameter_list **list, const char *name)
   new_path->dused_inodes_percent = 0;
   new_path->dfree_inodes_percent = 0;
 
+  strcpy(new_path->name, name);
+
   if (current == NULL) {
     *list = new_path;
+    new_path->name_prev = NULL;
   } else {
     while (current->name_next) {
       current = current->name_next;
     }
     current->name_next = new_path;
+    new_path->name_prev = current;
   }
   return new_path;
 }
@@ -90,6 +95,9 @@ np_add_parameter(struct parameter_list **list, const char *name)
 struct parameter_list *
 np_del_parameter(struct parameter_list *item, struct parameter_list *prev)
 {
+  if (item == NULL) {
+    return NULL;
+  }
   struct parameter_list *next;
 
   if (item->name_next)
@@ -97,10 +105,17 @@ np_del_parameter(struct parameter_list *item, struct parameter_list *prev)
   else
     next = NULL;
 
-  free(item);
+  if (next)
+    next->name_prev = prev;
+
   if (prev)
     prev->name_next = next;
 
+  if (item->name) {
+    free(item->name);
+  }
+  free(item);
+
   return next;
 }
 
diff --git a/lib/utils_disk.h b/lib/utils_disk.h
index bf52e4c..3b5a45f 100644
--- a/lib/utils_disk.h
+++ b/lib/utils_disk.h
@@ -24,6 +24,7 @@ struct parameter_list
   char *group;
   struct mount_entry *best_match;
   struct parameter_list *name_next;
+  struct parameter_list *name_prev;
   uintmax_t total, available, available_to_root, used,
     inodes_free, inodes_free_to_root, inodes_used, inodes_total;
   double dfree_pct, dused_pct;