diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-02-10 14:16:54 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-08-08 15:07:42 +0200 |
| commit | 4528e74a5cd6ced7d6f7cb841e6f9a7d8d131719 (patch) | |
| tree | 0eb283ea4c4bf9d0b95b07b7e11129fc6ca5495b /src/libstrongswan | |
| parent | a9f169f699c4ec297641656b6b1d2b3f737b88bd (diff) | |
| download | strongswan-4528e74a5cd6ced7d6f7cb841e6f9a7d8d131719.tar.bz2 strongswan-4528e74a5cd6ced7d6f7cb841e6f9a7d8d131719.tar.xz | |
Don't require STRONGSWAN_CONF to be defined.
Diffstat (limited to 'src/libstrongswan')
| -rw-r--r-- | src/libstrongswan/settings.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/libstrongswan/settings.c b/src/libstrongswan/settings.c index b26fbebb4..8977cd9ed 100644 --- a/src/libstrongswan/settings.c +++ b/src/libstrongswan/settings.c @@ -1117,14 +1117,21 @@ static bool load_files_internal(private_settings_t *this, section_t *parent, char *pattern, bool merge) { char *text; - linked_list_t *contents = linked_list_create(); - section_t *section = section_create(NULL); + linked_list_t *contents; + section_t *section; if (pattern == NULL) { +#ifdef STRONGSWAN_CONF pattern = STRONGSWAN_CONF; +#else + return FALSE; +#endif } + contents = linked_list_create(); + section = section_create(NULL); + if (!parse_files(contents, NULL, 0, pattern, section)) { contents->destroy_function(contents, (void*)free); |