summaryrefslogtreecommitdiffstats
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 ee7c6690..b12c307c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,10 @@
kerberos support is currently not enabled in ssh in OpenBSD. Discussed with
various people; ok deraadt@
ID SYNC ONLY for portable; kerberos/gssapi is still pretty popular
+ - 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@
20130828
- (djm) [openbsd-compat/bsd-snprintf.c] teach our local snprintf code the
diff --git a/clientloop.c b/clientloop.c
index 7c1f8abb..45a55e0e 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.253 2013/06/07 15:37:52 dtucker Exp $ */
+/* $OpenBSD: clientloop.c,v 1.254 2013/09/12 01:41:12 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* 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,
"%cB\r\n", escape_char);
buffer_append(berr, string,
strlen(string));
- channel_request_start(session_ident,
+ channel_request_start(c->self,
"break", 0);
packet_put_int(1000);
packet_send();