summaryrefslogtreecommitdiff
path: root/clientloop.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2005-05-30 22:13:03 +0000
committerColin Watson <cjwatson@debian.org>2005-05-30 22:13:03 +0000
commit4e1e258d1f5745f3dc05ead3cb834c445e6e8818 (patch)
treebfbc91107d6bfe7b2a68d8701562e59856116a6a /clientloop.c
parent4a20a0b23bd0e1db5e69f27c65aaa11a5a2eacd0 (diff)
parenta55bd782aa819b7f5ae716de000f19f4f531850e (diff)
Merge 4.1p1 to the trunk.
Diffstat (limited to 'clientloop.c')
-rw-r--r--clientloop.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/clientloop.c b/clientloop.c
index 90bdcbc39..d36d816de 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
59 */ 59 */
60 60
61#include "includes.h" 61#include "includes.h"
62RCSID("$OpenBSD: clientloop.c,v 1.135 2005/03/01 10:09:52 djm Exp $"); 62RCSID("$OpenBSD: clientloop.c,v 1.136 2005/03/10 22:01:05 deraadt Exp $");
63 63
64#include "ssh.h" 64#include "ssh.h"
65#include "ssh1.h" 65#include "ssh1.h"
@@ -632,7 +632,7 @@ client_process_control(fd_set * readset)
632 "to %s? ", host); 632 "to %s? ", host);
633 if (allowed) 633 if (allowed)
634 quit_pending = 1; 634 quit_pending = 1;
635 /* FALLTHROUGH */ 635 /* FALLTHROUGH */
636 case SSHMUX_COMMAND_ALIVE_CHECK: 636 case SSHMUX_COMMAND_ALIVE_CHECK:
637 /* Reply for SSHMUX_COMMAND_TERMINATE and ALIVE_CHECK */ 637 /* Reply for SSHMUX_COMMAND_TERMINATE and ALIVE_CHECK */
638 buffer_clear(&m); 638 buffer_clear(&m);