1 files changed, 19 insertions, 1 deletions

diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index 2bfc0b36..dfa0d71d 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -514,7 +514,25 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
         GNUNET_DISK_file_test ("/etc/gnunet.conf"))
       (void) GNUNET_CONFIGURATION_load (cfg, "/etc/gnunet.conf");
     else
-      (void) GNUNET_CONFIGURATION_load (cfg, "~gnunet/.gnunet/gnunet.conf");
+    {
+#if HAVE_GETPWNAM
+      struct passwd *pw;
+
+      pw = getpwnam ("gnunet");
+      if (NULL != pw)
+      {
+        char *cfgname;
+
+        GNUNET_asprintf (&cfgname,
+                         "%s%s%s",
+                         pw->pw_dir,
+                         DIR_SEPARATOR_STR,
+                         ".gnunet/gnunet.conf");
+        (void) GNUNET_CONFIGURATION_load (cfg, cfgname);
+        GNUNET_free (cfgname);
+      }
+#endif
+    }
     (void) GNUNET_CONFIGURATION_parse (cfg, cfgName);
   }
   else