From fdead26ffe1da8501a6ff5e0639a6f44c723e763 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Thu, 21 Apr 2011 10:57:17 +0200 Subject: [PATCH] If key not found, strdup default value, too --- src/libstrongswan/settings.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/libstrongswan/settings.c b/src/libstrongswan/settings.c index 395ae65e3..941eb0514 100644 --- a/src/libstrongswan/settings.c +++ b/src/libstrongswan/settings.c @@ -453,14 +453,10 @@ METHOD(settings_t, alloc_str, char*, va_start(args, def); /* additional lock to savely strdup */ this->lock->read_lock(this->lock); - value = strdupnull(find_value(this, this->top, key, args)); + value = strdupnull(find_value(this, this->top, key, args) ?: def); this->lock->unlock(this->lock); va_end(args); - if (value) - { - return value; - } - return def; + return value; } /**