summaryrefslogtreecommitdiffstats
path: root/web/attachments/345604-check_mount_opts.patch
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2013-09-29 22:03:24 (GMT)
committerHolger Weiss <holger@zedat.fu-berlin.de>2013-09-29 22:03:24 (GMT)
commit0b6423f9c99d9edf8c96fefd0f6c453859395aa1 (patch)
tree1c2b6b21704a294940f87c7892676998d8371707 /web/attachments/345604-check_mount_opts.patch
downloadsite-0b6423f9c99d9edf8c96fefd0f6c453859395aa1.tar.gz
Import Nagios Plugins site
Import the Nagios Plugins web site, Cronjobs, infrastructure scripts, and configuration files.
Diffstat (limited to 'web/attachments/345604-check_mount_opts.patch')
-rw-r--r--web/attachments/345604-check_mount_opts.patch27
1 files changed, 27 insertions, 0 deletions
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 @@
1diff -rupN nagios-plugins-1.4.14.orig/gl/mountlist.c nagios-plugins-1.4.14/gl/mountlist.c
2--- nagios-plugins-1.4.14.orig/gl/mountlist.c 2009-05-21 23:11:51.000000000 +0200
3+++ nagios-plugins-1.4.14/gl/mountlist.c 2009-10-07 10:57:16.000000000 +0200
4@@ -156,6 +156,11 @@
5 || strcmp (Fs_type, "ignore") == 0)
6 #endif
7
8+#ifndef ME_DUMMY_OPTS
9+# define ME_DUMMY_OPTS(mount_options) \
10+(strstr(mount_options, ",bind"))
11+#endif
12+
13 #ifndef ME_REMOTE
14 /* A file system is `remote' if its Fs_name contains a `:'
15 or if (it is of type (smbfs or cifs) and its Fs_name starts with `//'). */
16@@ -388,7 +393,11 @@ read_file_system_list (bool need_fs_type
17 me->me_mountdir = xstrdup (mnt->mnt_dir);
18 me->me_type = xstrdup (mnt->mnt_type);
19 me->me_type_malloced = 1;
20+ #ifndef __linux__
21 me->me_dummy = ME_DUMMY (me->me_devname, me->me_type);
22+ #else
23+ me->me_dummy = ME_DUMMY (me->me_devname, me->me_type) || ME_DUMMY_OPTS(mnt->mnt_opts);
24+ #endif
25 me->me_remote = ME_REMOTE (me->me_devname, me->me_type);
26 me->me_dev = dev_from_mount_options (mnt->mnt_opts);
27