summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-05-05 14:16:22 +1000
committerDamien Miller <djm@mindrot.org>2011-05-05 14:16:22 +1000
commit6c3eec7ab23d58157ded8a0e6283f93e45390d07 (patch)
tree3beb55b3ca050613a158865ec350008dcdd0ab72 /ssh.c
parentad21032e656aefcddb2cc52f014885026ba82d56 (diff)
- djm@cvs.openbsd.org 2011/04/17 22:42:42
[PROTOCOL.mux clientloop.c clientloop.h mux.c ssh.1 ssh.c] allow graceful shutdown of multiplexing: request that a mux server removes its listener socket and refuse future multiplexing requests; ok markus@
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ssh.c b/ssh.c
index b543c6117..4fd131c20 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.356 2011/01/06 22:23:53 djm Exp $ */ 1/* $OpenBSD: ssh.c,v 1.357 2011/04/17 22:42:42 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -345,6 +345,8 @@ main(int ac, char **av)
345 muxclient_command = SSHMUX_COMMAND_FORWARD; 345 muxclient_command = SSHMUX_COMMAND_FORWARD;
346 else if (strcmp(optarg, "exit") == 0) 346 else if (strcmp(optarg, "exit") == 0)
347 muxclient_command = SSHMUX_COMMAND_TERMINATE; 347 muxclient_command = SSHMUX_COMMAND_TERMINATE;
348 else if (strcmp(optarg, "stop") == 0)
349 muxclient_command = SSHMUX_COMMAND_STOP;
348 else 350 else
349 fatal("Invalid multiplex command."); 351 fatal("Invalid multiplex command.");
350 break; 352 break;