From: Ton Voon <tonvoon@users.sourceforge.net>
Date: Tue, 11 Nov 2003 10:19:29 +0000 (+0000)
Subject: Fixed if only absolute warn/crit set
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8c24fba55cb9df7a6bddcc07fdee64b588f6c1ed;p=nagiosplug.git

Fixed if only absolute warn/crit set


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@760 f882894a-f735-0410-b71e-b25c423dba1c
---

diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index 367c720..b8f82db 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -40,8 +40,8 @@ int validate_arguments (void);
 void print_usage (void);
 void print_help (void);
 
-int warn_percent = 200;
-int crit_percent = 200;
+int warn_percent = 0;
+int crit_percent = 0;
 long unsigned int warn_size = 0;
 long unsigned int crit_size = 0;
 int verbose;
@@ -233,11 +233,12 @@ int
 check_swap (int usp, long unsigned int free_swap)
 {
 	int result = STATE_UNKNOWN;
-	if (usp >= 0 && usp >= (100.0 - crit_percent))
+	free_swap = free_swap * 1024;		/* Convert back to bytes as warn and crit specified in bytes */
+	if (usp >= 0 && crit_percent != 0 && usp >= (100.0 - crit_percent))
 		result = STATE_CRITICAL;
 	else if (crit_size > 0 && free_swap <= crit_size)
 		result = STATE_CRITICAL;
-	else if (usp >= 0 && usp >= (100.0 - warn_percent))
+	else if (usp >= 0 && warn_percent != 0 && usp >= (100.0 - warn_percent))
 		result = STATE_WARNING;
 	else if (warn_size > 0 && free_swap <= warn_size)
 		result = STATE_WARNING;