From 0b6423f9c99d9edf8c96fefd0f6c453859395aa1 Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Mon, 30 Sep 2013 00:03:24 +0200 Subject: Import Nagios Plugins site Import the Nagios Plugins web site, Cronjobs, infrastructure scripts, and configuration files. --- web/attachments/345604-check_mount_opts.patch | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 web/attachments/345604-check_mount_opts.patch (limited to 'web/attachments/345604-check_mount_opts.patch') diff --git a/web/attachments/345604-check_mount_opts.patch b/web/attachments/345604-check_mount_opts.patch new file mode 100644 index 0000000..c2b517c --- /dev/null +++ b/web/attachments/345604-check_mount_opts.patch @@ -0,0 +1,27 @@ +diff -rupN nagios-plugins-1.4.14.orig/gl/mountlist.c nagios-plugins-1.4.14/gl/mountlist.c +--- nagios-plugins-1.4.14.orig/gl/mountlist.c 2009-05-21 23:11:51.000000000 +0200 ++++ nagios-plugins-1.4.14/gl/mountlist.c 2009-10-07 10:57:16.000000000 +0200 +@@ -156,6 +156,11 @@ + || strcmp (Fs_type, "ignore") == 0) + #endif + ++#ifndef ME_DUMMY_OPTS ++# define ME_DUMMY_OPTS(mount_options) \ ++(strstr(mount_options, ",bind")) ++#endif ++ + #ifndef ME_REMOTE + /* A file system is `remote' if its Fs_name contains a `:' + or if (it is of type (smbfs or cifs) and its Fs_name starts with `//'). */ +@@ -388,7 +393,11 @@ read_file_system_list (bool need_fs_type + me->me_mountdir = xstrdup (mnt->mnt_dir); + me->me_type = xstrdup (mnt->mnt_type); + me->me_type_malloced = 1; ++ #ifndef __linux__ + me->me_dummy = ME_DUMMY (me->me_devname, me->me_type); ++ #else ++ me->me_dummy = ME_DUMMY (me->me_devname, me->me_type) || ME_DUMMY_OPTS(mnt->mnt_opts); ++ #endif + me->me_remote = ME_REMOTE (me->me_devname, me->me_type); + me->me_dev = dev_from_mount_options (mnt->mnt_opts); + -- cgit v1.2.3-74-g34f1