settings: strongswan.conf must be loaded explicitly

src/charon-cmd/charon-cmd.c

@@ -126,12 +126,15 @@ static int run()
 			{
 				DBG1(DBG_DMN, "signal of type SIGHUP received. Reloading "
 					 "configuration");
-				if (lib->settings->load_files(lib->settings, NULL, FALSE))
+#ifdef STRONGSWAN_CONF
+				if (lib->settings->load_files(lib->settings, STRONGSWAN_CONF,
+											  FALSE))
 				{
 					charon->load_loggers(charon, levels, TRUE);
 					lib->plugins->reload(lib->plugins, NULL);
 				}
 				else
+#endif
 				{
 					DBG1(DBG_DMN, "reloading config failed, keeping old");
 				}

src/charon/charon.c

@@ -122,12 +122,15 @@ static void run()
 			{
 				DBG1(DBG_DMN, "signal of type SIGHUP received. Reloading "
 					 "configuration");
-				if (lib->settings->load_files(lib->settings, NULL, FALSE))
+#ifdef STRONGSWAN_CONF
+				if (lib->settings->load_files(lib->settings, STRONGSWAN_CONF,
+											  FALSE))
 				{
 					charon->load_loggers(charon, levels, !use_syslog);
 					lib->plugins->reload(lib->plugins, NULL);
 				}
 				else
+#endif
 				{
 					DBG1(DBG_DMN, "reloading config failed, keeping old");
 				}

src/libstrongswan/library.c

@@ -298,6 +298,13 @@ bool library_init(char *settings, const char *namespace)
 
 	this->objects = hashtable_create((hashtable_hash_t)hash,
 									 (hashtable_equals_t)equals, 4);
+
+#ifdef STRONGSWAN_CONF
+	if (!settings)
+	{
+		settings = STRONGSWAN_CONF;
+	}
+#endif
 	this->public.settings = settings_create(settings);
 	/* all namespace settings may fall back to libstrongswan */
 	lib->settings->add_fallback(lib->settings, lib->ns, "libstrongswan");

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)
+	if (pattern == NULL || !pattern[0])
-	{
+	{	/* TODO: Clear parent if merge is FALSE? */
-#ifdef STRONGSWAN_CONF
-		pattern = STRONGSWAN_CONF;
-#else
 		return FALSE;
-#endif
 	}
 
 	section = settings_section_create(NULL);

src/libstrongswan/settings/settings.h

@@ -343,7 +343,9 @@ struct settings_t {
 /**
  * Load settings from a file.
  *
- * @param file			file to read settings from, NULL for default
+ * @note If parsing the file fails the object is still created.
+ *
+ * @param file			optional file to read settings from
  * @return				settings object
  */
 settings_t *settings_create(char *file);