From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 18 Nov 2010 12:47:43 +0000 (+0100)
Subject: Compare shorter "boolean" values first.
X-Git-Tag: 4.5.1~449
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=011f901d55f0ded2579cc113ff2ddaf096f6eb0b;p=thirdparty%2Fstrongswan.git

Compare shorter "boolean" values first.
---

diff --git a/src/libstrongswan/settings.c b/src/libstrongswan/settings.c
index a7766643e1..0ecc5b58d9 100644
--- a/src/libstrongswan/settings.c
+++ b/src/libstrongswan/settings.c
@@ -359,17 +359,17 @@ inline bool settings_value_as_bool(char *value, bool def)
 {
 	if (value)
 	{
-		if (strcaseeq(value, "true") ||
-			strcaseeq(value, "enabled") ||
+		if (strcaseeq(value, "1") ||
 			strcaseeq(value, "yes") ||
-			strcaseeq(value, "1"))
+			strcaseeq(value, "true") ||
+			strcaseeq(value, "enabled"))
 		{
 			return TRUE;
 		}
-		else if (strcaseeq(value, "false") ||
-				 strcaseeq(value, "disabled") ||
+		else if (strcaseeq(value, "0") ||
 				 strcaseeq(value, "no") ||
-				 strcaseeq(value, "0"))
+				 strcaseeq(value, "false") ||
+				 strcaseeq(value, "disabled"))
 		{
 			return FALSE;
 		}