From 1c15848c479e682ba5e7c3c8446650d2ad00f251 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Mon, 18 Jun 2012 15:12:54 +0000 Subject: Sync OpenBSD patchset 1134: Add -a for kill-session, from Thomas Adam. --- cmd-kill-session.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'cmd-kill-session.c') diff --git a/cmd-kill-session.c b/cmd-kill-session.c index da56a263..0ce65e6d 100644 --- a/cmd-kill-session.c +++ b/cmd-kill-session.c @@ -31,8 +31,8 @@ int cmd_kill_session_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_kill_session_entry = { "kill-session", NULL, - "t:", 0, 0, - CMD_TARGET_SESSION_USAGE, + "at:", 0, 0, + "[-a] " CMD_TARGET_SESSION_USAGE, 0, NULL, NULL, @@ -43,13 +43,21 @@ int cmd_kill_session_exec(struct cmd *self, struct cmd_ctx *ctx) { struct args *args = self->args; - struct session *s; + struct session *s, *s2, *s3; if ((s = cmd_find_session(ctx, args_get(args, 't'), 0)) == NULL) return (-1); - server_destroy_session(s); - session_destroy(s); - + if (args_has(args, 'a')) { + RB_FOREACH_SAFE(s2, sessions, &sessions, s3) { + if (s != s2) { + server_destroy_session(s2); + session_destroy(s2); + } + } + } else { + server_destroy_session(s); + session_destroy(s); + } return (0); } -- cgit