summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorTon Voon <tonvoon@users.sourceforge.net>2005-01-14 14:13:10 (GMT)
committerTon Voon <tonvoon@users.sourceforge.net>2005-01-14 14:13:10 (GMT)
commitcb17e8af43ae0c3687e969b7268c1c6a31cb35b3 (patch)
treedad63eb170918c1fd1f87271da3159897bfff759 /plugins
parente80519b91b0100ad47c376b6567f407629d09741 (diff)
downloadmonitoring-plugins-cb17e8af43ae0c3687e969b7268c1c6a31cb35b3.tar.gz
Fix logic error with -e switch where result not set (Daniel Austin - 1102012)archive/release-1.3.0
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/branches/release-1.3.0@1082 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'plugins')
-rw-r--r--plugins/check_disk.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 9a2f174..d2546b9 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -118,6 +118,8 @@ main (int argc, char **argv)
118 if (strcmp (file_system, "none") == 0) 118 if (strcmp (file_system, "none") == 0)
119 strncpy (file_system, mntp, MAX_INPUT_BUFFER-1); 119 strncpy (file_system, mntp, MAX_INPUT_BUFFER-1);
120 120
121 result = max_state (result, disk_result);
122
121 if (disk_result==STATE_OK && erronly && !verbose) 123 if (disk_result==STATE_OK && erronly && !verbose)
122 continue; 124 continue;
123 125
@@ -125,7 +127,6 @@ main (int argc, char **argv)
125 asprintf (&output, "%s [%.0f kB (%d%%) free on %s]", output, 127 asprintf (&output, "%s [%.0f kB (%d%%) free on %s]", output,
126 free_disk, 100 - usp, display_mntp ? mntp : file_system); 128 free_disk, 100 - usp, display_mntp ? mntp : file_system);
127 129
128 result = max_state (result, disk_result);
129 } 130 }
130 131
131 else { 132 else {