[Nagiosplug-checkins] nagiosplug/plugins check_disk.c,1.7.2.4,1.7.2.5

[Ton Voon]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11163

Modified Files:
      Tag: r1_3_0
	check_disk.c 
Log Message:
Fix logic error with -e switch where result not set (Daniel Austin - 1102012)


Index: check_disk.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_disk.c,v
retrieving revision 1.7.2.4
retrieving revision 1.7.2.5
diff -u -d -r1.7.2.4 -r1.7.2.5
--- check_disk.c	1 Jul 2003 09:27:56 -0000	1.7.2.4
+++ check_disk.c	14 Jan 2005 14:13:10 -0000	1.7.2.5
@@ -118,6 +118,8 @@
 			if (strcmp (file_system, "none") == 0)
 				strncpy (file_system, mntp, MAX_INPUT_BUFFER-1);
 
+			result = max_state (result, disk_result);
+
 			if (disk_result==STATE_OK && erronly && !verbose)
 				continue;
 
@@ -125,7 +127,6 @@
 				asprintf (&output, "%s [%.0f kB (%d%%) free on %s]", output,
 				          free_disk, 100 - usp, display_mntp ? mntp : file_system);
 
-			result = max_state (result, disk_result);
 		}
 
 		else {