diff options
Diffstat (limited to 'src/libstrongswan/settings/settings.c')
| -rw-r--r-- | src/libstrongswan/settings/settings.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/libstrongswan/settings/settings.c b/src/libstrongswan/settings/settings.c index e467d8821..6c69782ec 100644 --- a/src/libstrongswan/settings/settings.c +++ b/src/libstrongswan/settings/settings.c @@ -839,13 +839,9 @@ static bool load_files_internal(private_settings_t *this, section_t *parent, { section_t *section; - if (pattern == NULL) - { -#ifdef STRONGSWAN_CONF - pattern = STRONGSWAN_CONF; -#else + if (pattern == NULL || !pattern[0]) + { /* TODO: Clear parent if merge is FALSE? */ return FALSE; -#endif } section = settings_section_create(NULL); |