Merge remote-tracking branch 'origin/master' into feature_check_disk_add_ignore_missing_option

5 files changed, 15 insertions, 9 deletions

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_utils.c b/lib/tests/test_utils.c
index f35b7e2..bc00fac 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);
diff --git a/lib/utils_base.c b/lib/utils_base.c
index 08fa215..eb1823b 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -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_disk.c b/lib/utils_disk.c
index a1181d3..468769b 100644
--- a/lib/utils_disk.c
+++ b/lib/utils_disk.c
@@ -28,6 +28,7 @@
 
 #include "common.h"
 #include "utils_disk.h"
+#include "gl/fsusage.h"
 
 void
 np_add_name (struct name_list **list, const char *name)
@@ -142,9 +143,12 @@ np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list
       size_t name_len = strlen(d->name);
       size_t best_match_len = 0;
       struct mount_entry *best_match = NULL;
+      struct fs_usage fsp;
 
       /* set best match if path name exactly matches a mounted device name */
       for (me = mount_list; me; me = me->me_next) {
+        if (get_fs_usage(me->me_mountdir, me->me_devname, &fsp) < 0)
+          continue; /* skip if permissions do not suffice for accessing device */
         if (strcmp(me->me_devname, d->name)==0)
           best_match = me;
       }
@@ -152,6 +156,8 @@ np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list
       /* set best match by directory name if no match was found by devname */
       if (! best_match) {
         for (me = mount_list; me; me = me->me_next) {
+          if (get_fs_usage(me->me_mountdir, me->me_devname, &fsp) < 0)
+            continue; /* skip if permissions do not suffice for accessing device */
           size_t len = strlen (me->me_mountdir);
           if ((exact == FALSE && (best_match_len <= len && len <= name_len &&
              (len == 1 || strncmp (me->me_mountdir, d->name, len) == 0)))