diff options
| author | Martin Willi <martin@revosec.ch> | 2011-04-12 11:15:54 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2011-04-15 10:07:13 +0200 |
| commit | fd3c12bf06a09c091d4bc57b5b3531a0148975f2 (patch) | |
| tree | 7f0dc0fda2ccd0a8e7842634978e19177ba756d8 | |
| parent | 32973044b0cf27d1eb764761459939424117b511 (diff) | |
| download | strongswan-fd3c12bf06a09c091d4bc57b5b3531a0148975f2.tar.bz2 strongswan-fd3c12bf06a09c091d4bc57b5b3531a0148975f2.tar.xz | |
Accept NULL files in load_files[_section] as we do in constructor
| -rw-r--r-- | src/libstrongswan/settings.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libstrongswan/settings.c b/src/libstrongswan/settings.c index c26a74a3e..8a2248b46 100644 --- a/src/libstrongswan/settings.c +++ b/src/libstrongswan/settings.c @@ -1119,6 +1119,11 @@ static bool load_files_internal(private_settings_t *this, section_t *parent, linked_list_t *contents = linked_list_create(); section_t *section = section_create(NULL); + if (pattern == NULL) + { + pattern = STRONGSWAN_CONF; + } + if (!parse_files(contents, NULL, 0, pattern, section)) { contents->destroy_function(contents, (void*)free); @@ -1207,11 +1212,6 @@ settings_t *settings_create(char *file) .lock = rwlock_create(RWLOCK_TYPE_DEFAULT), ); - if (file == NULL) - { - file = STRONGSWAN_CONF; - } - load_files(this, file, FALSE); return &this->public; |