mark 2nd maint properly

2 files changed, 5 insertions, 3 deletions

diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index 4a30848eb..d48df260c 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -542,7 +542,7 @@ stop_service (struct GNUNET_SERVER_Client *client,
       pos->kill_continuation_cls = client;
       GNUNET_SERVER_client_keep (client);
       GNUNET_SCHEDULER_add_delayed (sched,
-                                    MAINT_FAST_FREQUENCY, &maint, NULL);
+                                    MAINT_FAST_FREQUENCY, &maint, "non-null");
     }
   else
     {
@@ -678,8 +678,10 @@ maint (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 #if DEBUG_ARM
           GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
                       "ARM service terminates.\n");
-#endif  
+#endif
+          GNUNET_assert (server != NULL);
           GNUNET_SERVER_destroy (server);
+          server = NULL;
           return; /* we are done! */      
         }
       GNUNET_SCHEDULER_add_delayed (tc->sched,
diff --git a/src/arm/test_gnunet_arm.sh b/src/arm/test_gnunet_arm.sh
index 4c3edb249..d36c2ca38 100755
--- a/src/arm/test_gnunet_arm.sh
+++ b/src/arm/test_gnunet_arm.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-exe="valgrind --trace-children=yes ./gnunet-arm -c test_arm_api_data.conf"
+exe="./gnunet-arm -c test_arm_api_data.conf"
 out=`mktemp /tmp/test-gnunet-arm-logXXXXXXXX`
 #DEBUG="-L DEBUG"