From fd3c12bf06a09c091d4bc57b5b3531a0148975f2 Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@revosec.ch>
Date: Tue, 12 Apr 2011 11:15:54 +0200
Subject: [PATCH] Accept NULL files in load_files[_section] as we do in
 constructor

---
 src/libstrongswan/settings.c | 10 +++++-----
 1 file 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;