diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2014-05-14 16:05:02 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2014-05-15 11:28:10 +0200 |
| commit | 4b670a20a9ee0ac5efd806ff804e75fe00509826 (patch) | |
| tree | caec3a95b3990471e64a40c346b01d8a166359af /src/libstrongswan/settings/settings.c | |
| parent | da45f9e994f61324a058def37fbafd5cce75b5f3 (diff) | |
| download | strongswan-4b670a20.tar.bz2 strongswan-4b670a20.tar.xz | |
settings: strongswan.conf must be loaded explicitly
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); |