fixing bad fix

2 files changed, 1 insertions, 6 deletions

diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index ec41a7c60..6d6cb978f 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -143,11 +143,6 @@ service_shutdown_handler (void *cls, const struct GNUNET_MessageHeader *msg)
       shutdown_ctx->confirmed = GNUNET_YES;
       GNUNET_CLIENT_receive (shutdown_ctx->sock, &service_shutdown_handler,
                              shutdown_ctx, GNUNET_TIME_UNIT_FOREVER_REL);
-      if (shutdown_ctx->cont != NULL)
-        shutdown_ctx->cont (shutdown_ctx->cont_cls, GNUNET_NO);
-      GNUNET_SCHEDULER_cancel (shutdown_ctx->cancel_task);
-      GNUNET_CLIENT_disconnect (shutdown_ctx->sock, GNUNET_NO);
-      GNUNET_free (shutdown_ctx);
       break;
     default:
 #if DEBUG_ARM
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index 7e108cb41..061bb65d0 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -34,7 +34,7 @@
 /**
  * Timeout for stopping services.  Long to give some services a real chance.
  */
-#define STOP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
+#define STOP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
 
 /**
  * Timeout for stopping ARM.  Extra-long since ARM needs to stop everyone else.