tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2008/12/02 19:09:38 

[channels.c]
     s/remote_id/id/ to be more consistent with other code; ok djm@
This commit is contained in:
Damien Miller 2008-12-08 09:55:25 +11:00
parent 5a33ec68bc
commit 16a73076b7
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -13,6 +13,9 @@
[serverloop.c]
backout 1.149, since it's not necessary and openssh clients send
broken CHANNEL_FAILURE/SUCCESS messages since about 2004; ok djm@
- markus@cvs.openbsd.org 2008/12/02 19:09:38
[channels.c]
s/remote_id/id/ to be more consistent with other code; ok djm@
20081201
- (dtucker) [contrib/cygwin/{Makefile,ssh-host-config}] Add new doc files
@ -4961,5 +4964,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.5150 2008/12/07 22:55:02 djm Exp $
$Id: ChangeLog,v 1.5151 2008/12/07 22:55:25 djm Exp $

12
channels.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: channels.c,v 1.288 2008/11/11 03:55:11 stevesk Exp $ */
/* $OpenBSD: channels.c,v 1.289 2008/12/02 19:09:38 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -2377,18 +2377,18 @@ channel_input_status_confirm(int type, u_int32_t seq, void *ctxt)
{
Channel *c;
struct channel_confirm *cc;
int remote_id;
int id;
/* Reset keepalive timeout */
keep_alive_timeouts = 0;
remote_id = packet_get_int();
id = packet_get_int();
packet_check_eom();
debug2("channel_input_status_confirm: type %d id %d", type, remote_id);
debug2("channel_input_status_confirm: type %d id %d", type, id);
if ((c = channel_lookup(remote_id)) == NULL) {
logit("channel_input_status_confirm: %d: unknown", remote_id);
if ((c = channel_lookup(id)) == NULL) {
logit("channel_input_status_confirm: %d: unknown", id);
return;
}
;