Don't require STRONGSWAN_CONF to be defined.
authorTobias Brunner <tobias@strongswan.org>
Fri, 10 Feb 2012 13:16:54 +0000 (14:16 +0100)
committerTobias Brunner <tobias@strongswan.org>
Wed, 8 Aug 2012 13:07:42 +0000 (15:07 +0200)
src/libstrongswan/settings.c

index b26fbeb..8977cd9 100644 (file)
@@ -1117,14 +1117,21 @@ static bool load_files_internal(private_settings_t *this, section_t *parent,
                                                                char *pattern, bool merge)
 {
        char *text;
-       linked_list_t *contents = linked_list_create();
-       section_t *section = section_create(NULL);
+       linked_list_t *contents;
+       section_t *section;
 
        if (pattern == NULL)
        {
+#ifdef 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))
        {
                contents->destroy_function(contents, (void*)free);