1 files changed, 5 insertions, 48 deletions

diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index 547f7441..1f5bc0a4 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -330,7 +330,7 @@ load_options ()
 /**
  * Write final configuration to disk.
  *
- * @return GNUNET_OK on success
+ * @return #GNUNET_OK on success
  */
 static int
 write_configuration ()
@@ -602,54 +602,11 @@ run (void *cls,
 
   option_cfg_name = GNUNET_GTK_main_loop_get_configuration_file (ml);
   cfg = GNUNET_CONFIGURATION_create ();
-
-#ifndef MINGW
-  if ( (0 != my_uid) &&
-       (NULL != gnunet_pw) &&
-       (my_uid != gnunet_pw->pw_uid) )
-  {
-    /* load system defaults, system/'gnunet' user's configuration and THEN
-       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
-      struct passwd *pw;
-
-      pw = getpwnam ("gnunet");
-      if (NULL != pw)
-      {
-        char *gnunet_user_cfgname;
-
-        GNUNET_asprintf (&gnunet_user_cfgname,
-                         "%s%s%s",
-                         pw->pw_dir,
-                         DIR_SEPARATOR_STR,
-                         ".config/gnunet.conf");
-        if (GNUNET_YES ==
-            GNUNET_DISK_file_test (gnunet_user_cfgname))
-          (void) GNUNET_CONFIGURATION_load (cfg, gnunet_user_cfgname);
-        GNUNET_free (gnunet_user_cfgname);
-      }
-#endif
-    }
-    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 */
-    if (GNUNET_YES ==
-        GNUNET_DISK_file_test (option_cfg_name))
+  if (GNUNET_YES ==
+      GNUNET_DISK_file_test (option_cfg_name))
     (void) GNUNET_CONFIGURATION_load (cfg, option_cfg_name);
-  }
+  else
+    (void) GNUNET_CONFIGURATION_load (cfg, NULL);
   main_window = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_dialog"));
   main_window = GNUNET_GTK_plug_me ("GNUNET_FS_GTK_PLUG",
                                     main_window);