From 011f901d55f0ded2579cc113ff2ddaf096f6eb0b Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 18 Nov 2010 13:47:43 +0100 Subject: [PATCH] Compare shorter "boolean" values first. --- src/libstrongswan/settings.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libstrongswan/settings.c b/src/libstrongswan/settings.c index a7766643e..0ecc5b58d 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; }