summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-09-14 09:49:19 +1000
committerDamien Miller <djm@mindrot.org>2013-09-14 09:49:19 +1000
commit70182522a47d283513a010338cd028cb80dac2ab (patch)
treed19113bd25d5be2434fab34f03ce8811ce16e76a
parentff9d6c2a4171ee32e8fe28fc3b86eb33bd5c845b (diff)
- djm@cvs.openbsd.org 2013/09/12 01:41:12
[clientloop.c] fix connection crash when sending break (~B) on ControlPersist'd session; ok dtucker@
-rw-r--r--ChangeLog4
-rw-r--r--clientloop.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ee7c6690c..b12c307c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,10 @@
28 kerberos support is currently not enabled in ssh in OpenBSD. Discussed with 28 kerberos support is currently not enabled in ssh in OpenBSD. Discussed with
29 various people; ok deraadt@ 29 various people; ok deraadt@
30 ID SYNC ONLY for portable; kerberos/gssapi is still pretty popular 30 ID SYNC ONLY for portable; kerberos/gssapi is still pretty popular
31 - djm@cvs.openbsd.org 2013/09/12 01:41:12
32 [clientloop.c]
33 fix connection crash when sending break (~B) on ControlPersist'd session;
34 ok dtucker@
31 35
3220130828 3620130828
33 - (djm) [openbsd-compat/bsd-snprintf.c] teach our local snprintf code the 37 - (djm) [openbsd-compat/bsd-snprintf.c] teach our local snprintf code the
diff --git a/clientloop.c b/clientloop.c
index 7c1f8abba..45a55e0ec 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: clientloop.c,v 1.253 2013/06/07 15:37:52 dtucker Exp $ */ 1/* $OpenBSD: clientloop.c,v 1.254 2013/09/12 01:41:12 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
@@ -1153,7 +1153,7 @@ process_escapes(Channel *c, Buffer *bin, Buffer *bout, Buffer *berr,
1153 "%cB\r\n", escape_char); 1153 "%cB\r\n", escape_char);
1154 buffer_append(berr, string, 1154 buffer_append(berr, string,
1155 strlen(string)); 1155 strlen(string));
1156 channel_request_start(session_ident, 1156 channel_request_start(c->self,
1157 "break", 0); 1157 "break", 0);
1158 packet_put_int(1000); 1158 packet_put_int(1000);
1159 packet_send(); 1159 packet_send();