$OpenBSD: patch-apps_silcd_server_c,v 1.6 2009/09/27 19:25:02 sthen Exp $
--- apps/silcd/server.c.orig	Sun Sep 27 11:20:35 2009
+++ apps/silcd/server.c	Sun Sep 27 11:25:03 2009
@@ -3128,6 +3128,11 @@ void silc_server_disconnect_remote(SilcServer server,
   if (!sock)
     return;
 
+  silc_schedule_task_del_by_all(server->schedule, 0, silc_server_do_rekey,
+				sock);
+  silc_schedule_task_del_by_all(server->schedule, 0, silc_server_do_heartbeat,
+				sock);
+
   SILC_LOG_DEBUG(("Disconnecting remote host, sock %p, status %d", sock,
 		  status));