[GNUnet-SVN] r996 - in GNUnet/src: applications/topology_default util

[grothoff]

Author: grothoff
Date: 2005-06-25 05:34:10 -0700 (Sat, 25 Jun 2005)
New Revision: 996

Modified:
   GNUnet/src/applications/topology_default/topology.c
   GNUnet/src/util/configuration.c
Log:
leak

Modified: GNUnet/src/applications/topology_default/topology.c
===================================================================
--- GNUnet/src/applications/topology_default/topology.c 2005-06-25 12:17:03 UTC 
(rev 995)
+++ GNUnet/src/applications/topology_default/topology.c 2005-06-25 12:34:10 UTC 
(rev 996)
@@ -309,7 +309,6 @@
          PACKAGE_VERSION,
          data);
       FREE(data);
-      BREAK();
       delCronJob(&cronCheckLiveness,
                 5 * cronSECONDS,
                 NULL);

Modified: GNUnet/src/util/configuration.c
===================================================================
--- GNUnet/src/util/configuration.c     2005-06-25 12:17:03 UTC (rev 995)
+++ GNUnet/src/util/configuration.c     2005-06-25 12:34:10 UTC (rev 996)
@@ -413,10 +413,10 @@
   cfgName = getConfigurationString("FILES",
                                   "gnunet.conf");
   if (cfgName == NULL) {
-    eName = expandFileName("~/.gnunet/gnunetd.conf");
     if (testConfigurationString("GNUNETD",
                                "_MAGIC_",
                                "YES")) {
+      eName = expandFileName("~/.gnunet/gnunetd.conf");
       expCfgName = getenv("GNUNETD_CONFIG");
       if (expCfgName == NULL) {
        /* pick default, but try to pick it so