From 34464da8d3f762ccca3ebfdc418e93f4c02997f1 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Sat, 26 Jun 2010 23:55:50 +0000
Subject: [PATCH] Use server_destroy_session() for kill-session.

---
 cmd-kill-session.c | 12 +-----------
 server-fn.c        |  1 +
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/cmd-kill-session.c b/cmd-kill-session.c
index 26331b79..efd91801 100644
--- a/cmd-kill-session.c
+++ b/cmd-kill-session.c
@@ -45,21 +45,11 @@ cmd_kill_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct cmd_target_data	*data = self->data;
 	struct session		*s;
-	struct client		*c;
-	u_int			 i;
 
 	if ((s = cmd_find_session(ctx, data->target)) == NULL)
 		return (-1);
 
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c != NULL && c->session == s) {
-			c->session = NULL;
-			server_write_client(c, MSG_EXIT, NULL, 0);
-		}
-	}
-	recalculate_sizes();
-
+	server_destroy_session(s);
 	session_destroy(s);
 
 	return (0);
diff --git a/server-fn.c b/server-fn.c
index da156e46..3a713686 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -371,6 +371,7 @@ server_destroy_session(struct session *s)
 		c->session = NULL;
 		server_write_client(c, MSG_EXIT, NULL, 0);
 	}
+	recalculate_sizes();
 }
 
 void