2 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 91fca57aa..92f61141f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
  - (djm) [configure.ac] bz#1538: better test for ProPolice/SSP: actually
    use some stack in main().
    Report and suggested fix from vapier AT gentoo.org
+ - (djm) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2008/12/02 19:01:07
+     [clientloop.c]
+     we have to use the recipient's channel number (RFC 4254) for
+     SSH2_MSG_CHANNEL_SUCCESS/SSH2_MSG_CHANNEL_FAILURE messages,
+     otherwise we trigger 'Non-public channel' error messages on sshd
+     systems with clientkeepalive enabled; noticed by sturm; ok djm;
 
 20081201
  - (dtucker) [contrib/cygwin/{Makefile,ssh-host-config}]  Add new doc files
@@ -4950,5 +4957,5 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5148 2008/12/07 22:35:36 djm Exp $
+$Id: ChangeLog,v 1.5149 2008/12/07 22:54:40 djm Exp $
 
diff --git a/clientloop.c b/clientloop.c
index 737807496..df4545828 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.204 2008/11/05 03:23:09 stevesk Exp $ */
+/* $OpenBSD: clientloop.c,v 1.205 2008/12/02 19:01:07 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1852,7 +1852,7 @@ client_input_channel_req(int type, u_int32_t seq, void *ctxt)
         if (reply) {
                 packet_start(success ?
                     SSH2_MSG_CHANNEL_SUCCESS : SSH2_MSG_CHANNEL_FAILURE);
-                packet_put_int(id);
+                packet_put_int(c->remote_id);
                 packet_send();
         }
         xfree(rtype);