1 files changed, 20 insertions, 11 deletions

diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index 99f6a9fc..547f7441 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -27,7 +27,6 @@
 #include "gnunet-setup-transport.h"
 #include "gnunet-setup-options.h"
 #include <gnunet/gnunet_constants.h>
-#include <gnunet/gnunet_directories.h>
 #include <regex.h>
 #if ENABLE_NLS
 #include <locale.h>
@@ -42,7 +41,7 @@ static struct GNUNET_GTK_MainLoop *ml;
 /**
  * Name of the configuration file.
  */
-static const char *cfgName;
+static const char *option_cfg_name;
 
 /**
  * Our configuration.
@@ -341,7 +340,8 @@ write_configuration ()
 
   cfgDefault = GNUNET_CONFIGURATION_create ();
   (void) GNUNET_CONFIGURATION_load (cfgDefault, NULL);  /* load defaults only */
-  ret = GNUNET_CONFIGURATION_write_diffs (cfgDefault, cfg, cfgName);
+  ret = GNUNET_CONFIGURATION_write_diffs (cfgDefault, cfg,
+                                          option_cfg_name);
   GNUNET_CONFIGURATION_destroy (cfgDefault);
   return ret;
 }
@@ -542,7 +542,7 @@ GNUNET_setup_launch_edit_friends_button_clicked_cb (GtkButton *button,
                                   GNUNET_OS_INHERIT_STD_ALL,
                                   NULL, NULL,
                                   "gnunet-peerinfo-gtk",
-                                  "-c", cfgName,
+                                  "-c", option_cfg_name,
                                   NULL);
   if (NULL == proc)
   {
@@ -600,7 +600,7 @@ run (void *cls,
   if (GNUNET_OK != GNUNET_GTK_main_loop_build_window (ml, NULL))
     return;
 
-  cfgName = GNUNET_GTK_main_loop_get_configuration_file (ml);
+  option_cfg_name = GNUNET_GTK_main_loop_get_configuration_file (ml);
   cfg = GNUNET_CONFIGURATION_create ();
 
 #ifndef MINGW
@@ -612,7 +612,9 @@ run (void *cls,
        our configuration file */
     if (GNUNET_YES ==
         GNUNET_DISK_file_test ("/etc/gnunet.conf"))
+    {
       (void) GNUNET_CONFIGURATION_load (cfg, "/etc/gnunet.conf");
+    }
     else
     {
 #if HAVE_GETPWNAM
@@ -621,25 +623,32 @@ run (void *cls,
       pw = getpwnam ("gnunet");
       if (NULL != pw)
       {
-        char *cfgname;
+        char *gnunet_user_cfgname;
 
-        GNUNET_asprintf (&cfgname,
+        GNUNET_asprintf (&gnunet_user_cfgname,
                          "%s%s%s",
                          pw->pw_dir,
                          DIR_SEPARATOR_STR,
                          ".config/gnunet.conf");
-        (void) GNUNET_CONFIGURATION_load (cfg, cfgname);
-        GNUNET_free (cfgname);
+        if (GNUNET_YES ==
+            GNUNET_DISK_file_test (gnunet_user_cfgname))
+          (void) GNUNET_CONFIGURATION_load (cfg, gnunet_user_cfgname);
+        GNUNET_free (gnunet_user_cfgname);
       }
 #endif
     }
-    (void) GNUNET_CONFIGURATION_parse (cfg, cfgName);
+    if (GNUNET_YES ==
+        GNUNET_DISK_file_test (option_cfg_name))
+      (void) GNUNET_CONFIGURATION_parse (cfg,
+                                         option_cfg_name);
   }
   else
 #endif
   {
     /* only load system defaults and our configuration file */
-    (void) GNUNET_CONFIGURATION_load (cfg, cfgName);
+    if (GNUNET_YES ==
+        GNUNET_DISK_file_test (option_cfg_name))
+    (void) GNUNET_CONFIGURATION_load (cfg, option_cfg_name);
   }
   main_window = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_dialog"));
   main_window = GNUNET_GTK_plug_me ("GNUNET_FS_GTK_PLUG",