From 824c06e61fbd03c1680379670fb72dfc3a0f79ca Mon Sep 17 00:00:00 2001 From: "Nathan S. Evans" Date: Mon, 1 Feb 2010 12:32:23 +0000 Subject: [PATCH] change default config file name --- src/include/gnunet_directories.h.in | 3 +-- src/util/service.c | 2 +- 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 @@ #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 b4e4a5528..f64734b8f 100644 --- 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; -- 2.25.1