change default config file name

diff --git a/src/include/gnunet_directories.h.in b/src/include/gnunet_directories.h.in
index b05b6d9ce97cf4a431f1937e3e1e367b735e3835..3f6898a5eeb5b2d62483ebfb29f3c4db69d651bf 100644 (file)
--- a/src/include/gnunet_directories.h.in
+++ b/src/include/gnunet_directories.h.in
@@ -28,7 +28,6 @@
 #ifndef GNUNET_DIRECTORIES
 #define GNUNET_DIRECTORIES
 
-#define GNUNET_DEFAULT_CLIENT_CONFIG_FILE "@GN_USER_HOME_DIR@/gnunet.conf"
-#define GNUNET_DEFAULT_DAEMON_CONFIG_FILE "@GN_DAEMON_CONFIG_DIR@/gnunetd.conf"
+#define GNUNET_DEFAULT_USER_CONFIG_FILE "@GN_USER_HOME_DIR@/gnunet.conf"
 
 #endif

diff --git a/src/util/service.c b/src/util/service.c
index b4e4a552829737016695da5c593b5be80c2af83e..f64734b8faa7330fed8aa12cc86a448da4481f19 100644 (file)
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -1405,7 +1405,7 @@ GNUNET_SERVICE_run (int argc,
   do_daemonize = 0;
   logfile = NULL;
   loglev = GNUNET_strdup ("WARNING");
-  cfg_fn = GNUNET_strdup (GNUNET_DEFAULT_DAEMON_CONFIG_FILE);
+  cfg_fn = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE);
   memset (&sctx, 0, sizeof (sctx));
   sctx.options = opt;
   sctx.ready_confirm_fd = -1;