aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/include/gnunet_directories.h.in3
-rw-r--r--src/util/service.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/include/gnunet_directories.h.in b/src/include/gnunet_directories.h.in
index b05b6d9ce..3f6898a5e 100644
--- a/src/include/gnunet_directories.h.in
+++ b/src/include/gnunet_directories.h.in
@@ -28,7 +28,6 @@
28#ifndef GNUNET_DIRECTORIES 28#ifndef GNUNET_DIRECTORIES
29#define GNUNET_DIRECTORIES 29#define GNUNET_DIRECTORIES
30 30
31#define GNUNET_DEFAULT_CLIENT_CONFIG_FILE "@GN_USER_HOME_DIR@/gnunet.conf" 31#define GNUNET_DEFAULT_USER_CONFIG_FILE "@GN_USER_HOME_DIR@/gnunet.conf"
32#define GNUNET_DEFAULT_DAEMON_CONFIG_FILE "@GN_DAEMON_CONFIG_DIR@/gnunetd.conf"
33 32
34#endif 33#endif
diff --git a/src/util/service.c b/src/util/service.c
index b4e4a5528..f64734b8f 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -1405,7 +1405,7 @@ GNUNET_SERVICE_run (int argc,
1405 do_daemonize = 0; 1405 do_daemonize = 0;
1406 logfile = NULL; 1406 logfile = NULL;
1407 loglev = GNUNET_strdup ("WARNING"); 1407 loglev = GNUNET_strdup ("WARNING");
1408 cfg_fn = GNUNET_strdup (GNUNET_DEFAULT_DAEMON_CONFIG_FILE); 1408 cfg_fn = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE);
1409 memset (&sctx, 0, sizeof (sctx)); 1409 memset (&sctx, 0, sizeof (sctx));
1410 sctx.options = opt; 1410 sctx.options = opt;
1411 sctx.ready_confirm_fd = -1; 1411 sctx.ready_confirm_fd = -1;