3 files changed, 12 insertions, 12 deletions

diff --git a/src/hostlist/gnunet-daemon-hostlist.c b/src/hostlist/gnunet-daemon-hostlist.c
index f25e4f6ca..cf0f646ed 100644
--- a/src/hostlist/gnunet-daemon-hostlist.c
+++ b/src/hostlist/gnunet-daemon-hostlist.c
@@ -234,7 +234,12 @@ static void
 cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Hostlist daemon is shutting down\n");
+              "Hostlist daemon is shutting down\n");
+  if (core != NULL)
+    {
+      GNUNET_CORE_disconnect (core);
+      core = NULL;
+    }
   if (bootstrapping)
     {
       GNUNET_HOSTLIST_client_stop ();
@@ -245,11 +250,6 @@ cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
       GNUNET_HOSTLIST_server_stop ();
     }
 #endif
-  if (core != NULL)
-    {
-      GNUNET_CORE_disconnect (core);
-      core = NULL;
-    }
   if (stats != NULL)
     {
       GNUNET_STATISTICS_destroy (stats,
@@ -259,11 +259,7 @@ cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   if (cfg != NULL)
     {
       GNUNET_CONFIGURATION_destroy(cfg);
-    }
-  if (tc->sched!=NULL)
-    {
-      GNUNET_SCHEDULER_shutdown (tc->sched);
-
+      cfg = NULL;
     }
 }
 
diff --git a/src/hostlist/hostlist-server.c b/src/hostlist/hostlist-server.c
index 53f2470a7..055c90bab 100644
--- a/src/hostlist/hostlist-server.c
+++ b/src/hostlist/hostlist-server.c
@@ -738,6 +738,8 @@ GNUNET_HOSTLIST_server_stop ()
     }
   cfg = NULL;
   sched = NULL;
+  stats = NULL;
+  core = NULL;
 }
 
 /* end of hostlist-server.c */
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
index c08af48fb..799c99cb6 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -50,6 +50,7 @@ static int learned_hostlist_downloaded;
 
 static char * current_adv_uri;
 
+static struct GNUNET_CONFIGURATION_Handle *cfg;
 static struct GNUNET_SCHEDULER_Handle *sched;
 
 static GNUNET_SCHEDULER_TaskIdentifier timeout_task;
@@ -445,7 +446,7 @@ run (void *cls,
      struct GNUNET_SCHEDULER_Handle *s,
      char *const *args,
      const char *cfgfile, 
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *c)
 {
   timeout = GNUNET_NO;
   adv_sent =GNUNET_NO;
@@ -454,6 +455,7 @@ run (void *cls,
   learned_hostlist_saved = GNUNET_NO;
   learned_hostlist_downloaded = GNUNET_NO;
 
+  cfg = c;
   sched = s;
 
   check_task = GNUNET_SCHEDULER_add_delayed (sched,