[GNUnet-SVN] r10181 - in gnunet/src: include util

[gnunet]

Author: nevans
Date: 2010-02-01 13:32:23 +0100 (Mon, 01 Feb 2010)
New Revision: 10181

Modified:
   gnunet/src/include/gnunet_directories.h.in
   gnunet/src/util/service.c
Log:
change default config file name

Modified: gnunet/src/include/gnunet_directories.h.in
===================================================================
--- gnunet/src/include/gnunet_directories.h.in  2010-02-01 12:28:34 UTC (rev 
10180)
+++ gnunet/src/include/gnunet_directories.h.in  2010-02-01 12:32:23 UTC (rev 
10181)
@@ -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

Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c   2010-02-01 12:28:34 UTC (rev 10180)
+++ gnunet/src/util/service.c   2010-02-01 12:32:23 UTC (rev 10181)
@@ -1405,7 +1405,7 @@
   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;