summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--channels.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f78da8b6..924ce95f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
6 - djm@cvs.openbsd.org 2004/08/23 11:48:09 6 - djm@cvs.openbsd.org 2004/08/23 11:48:09
7 [authfile.c] 7 [authfile.c]
8 fix error path, spotted by Martin.Kraemer AT Fujitsu-Siemens.com; ok markus 8 fix error path, spotted by Martin.Kraemer AT Fujitsu-Siemens.com; ok markus
9 - djm@cvs.openbsd.org 2004/08/23 11:48:47
10 [channels.c]
11 typo, spotted by Martin.Kraemer AT Fujitsu-Siemens.com; ok markus
9 12
1020040828 1320040828
11 - (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from 14 - (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from
@@ -1673,4 +1676,4 @@
1673 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1676 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1674 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1677 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1675 1678
1676$Id: ChangeLog,v 1.3523 2004/08/29 06:28:39 dtucker Exp $ 1679$Id: ChangeLog,v 1.3524 2004/08/29 06:29:44 dtucker Exp $
diff --git a/channels.c b/channels.c
index 1f6984aa7..ac35293d4 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
39 */ 39 */
40 40
41#include "includes.h" 41#include "includes.h"
42RCSID("$OpenBSD: channels.c,v 1.209 2004/08/11 21:43:04 avsm Exp $"); 42RCSID("$OpenBSD: channels.c,v 1.210 2004/08/23 11:48:47 djm Exp $");
43 43
44#include "ssh.h" 44#include "ssh.h"
45#include "ssh1.h" 45#include "ssh1.h"
@@ -2279,7 +2279,7 @@ channel_cancel_rport_listener(const char *host, u_short port)
2279 if (c != NULL && c->type == SSH_CHANNEL_RPORT_LISTENER && 2279 if (c != NULL && c->type == SSH_CHANNEL_RPORT_LISTENER &&
2280 strncmp(c->path, host, sizeof(c->path)) == 0 && 2280 strncmp(c->path, host, sizeof(c->path)) == 0 &&
2281 c->listening_port == port) { 2281 c->listening_port == port) {
2282 debug2("%s: close clannel %d", __func__, i); 2282 debug2("%s: close channel %d", __func__, i);
2283 channel_free(c); 2283 channel_free(c);
2284 found = 1; 2284 found = 1;
2285 } 2285 }