settings: strongswan.conf must be loaded explicitly

2014-05-15 11:28:10 +02:00
parent da45f9e994
commit 4b670a20a9
5 changed files with 20 additions and 9 deletions
@@ -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);