summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2011-04-17 22:42:41 +0000
committerdjm <djm@openbsd.org>2011-04-17 22:42:41 +0000
commit3dee30d2b4c6b95f16ad2dd6caf8ffd9a46c9c8f (patch)
tree0e2f327ea8190570988139a4c809fed62270fd0d /usr.bin/ssh/ssh.c
parentReplaced by src/libexec/security a few minutes ago; (diff)
downloadwireguard-openbsd-3dee30d2b4c6b95f16ad2dd6caf8ffd9a46c9c8f.tar.xz
wireguard-openbsd-3dee30d2b4c6b95f16ad2dd6caf8ffd9a46c9c8f.zip
allow graceful shutdown of multiplexing: request that a mux server removes
its listener socket and refuse future multiplexing requests; ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
-rw-r--r--usr.bin/ssh/ssh.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index 4da221e9a2e..dd3b6b426c6 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.356 2011/01/06 22:23:53 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.357 2011/04/17 22:42:42 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -333,6 +333,8 @@ main(int ac, char **av)
muxclient_command = SSHMUX_COMMAND_FORWARD;
else if (strcmp(optarg, "exit") == 0)
muxclient_command = SSHMUX_COMMAND_TERMINATE;
+ else if (strcmp(optarg, "stop") == 0)
+ muxclient_command = SSHMUX_COMMAND_STOP;
else
fatal("Invalid multiplex command.");
break;