denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't require STRONGSWAN_CONF to be defined.

Browse Source
This commit is contained in:
Tobias Brunner
2012-08-08 15:07:42 +02:00
parent a9f169f699
commit 4528e74a5c
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/settings.c
+9 -2
View File
@@ -1117,14 +1117,21 @@ static bool load_files_internal(private_settings_t *this, section_t *parent,
char *pattern, bool merge) char *pattern, bool merge)
{ {
char *text; char *text;
linked_list_t *contents = linked_list_create(); linked_list_t *contents;
section_t *section = section_create(NULL); section_t *section;
if (pattern == NULL) if (pattern == NULL)
{ {
#ifdef STRONGSWAN_CONF
pattern = 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)) if (!parse_files(contents, NULL, 0, pattern, section))
{ {
contents->destroy_function(contents, (void*)free); contents->destroy_function(contents, (void*)free);