aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2014-08-25 10:36:01 +0200
committerMartin Willi <martin@revosec.ch>2014-09-22 13:40:39 +0200
commitd8ad0fc35175cd82b998648028938c8d6a8b0581 (patch)
tree53afcc5dd1250264fe22b85d2bfb5831a30c0e0f
parent68da3bad57b0105724e8e8393fee6ecdc6caca20 (diff)
downloadstrongswan-d8ad0fc35175cd82b998648028938c8d6a8b0581.tar.bz2
strongswan-d8ad0fc35175cd82b998648028938c8d6a8b0581.tar.xz
settings: Make loading a NULL or empty pattern a (nop-)success
-rw-r--r--src/libstrongswan/settings/settings.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstrongswan/settings/settings.c b/src/libstrongswan/settings/settings.c
index e235e3c51..acf9160d2 100644
--- a/src/libstrongswan/settings/settings.c
+++ b/src/libstrongswan/settings/settings.c
@@ -856,7 +856,7 @@ static bool load_files_internal(private_settings_t *this, section_t *parent,
if (pattern == NULL || !pattern[0])
{ /* TODO: Clear parent if merge is FALSE? */
- return FALSE;
+ return TRUE;
}
section = settings_section_create(NULL);