diff options
author | Damien Miller <djm@mindrot.org> | 2000-06-26 10:22:53 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-06-26 10:22:53 +1000 |
commit | c0fd17fdca5853c0c6bfdfc364d8c5418dcab86b (patch) | |
tree | 7caa4cd021c8fa7318379d2ac0993d59fb02750f | |
parent | 8dd33fd1d543ce94f291bb1e580b49600b1e39a3 (diff) |
- OpenBSD CVS update
- provos@cvs.openbsd.org 2000/06/25 14:17:58
[channels.c]
correct check for bad channel ids; from Wei Dai <weidai@eskimo.com>
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | channels.c | 4 |
2 files changed, 8 insertions, 4 deletions
@@ -1,6 +1,10 @@ | |||
1 | 20000626 | 1 | 20000626 |
2 | - Better fix to aclocal tests from Garrick James <garrick@james.net> | 2 | - (djm) Better fix to aclocal tests from Garrick James <garrick@james.net> |
3 | 3 | - OpenBSD CVS update | |
4 | - provos@cvs.openbsd.org 2000/06/25 14:17:58 | ||
5 | [channels.c] | ||
6 | correct check for bad channel ids; from Wei Dai <weidai@eskimo.com> | ||
7 | |||
4 | 20000623 | 8 | 20000623 |
5 | - (djm) Use sa_family_t in prototype for rresvport_af. Patch from | 9 | - (djm) Use sa_family_t in prototype for rresvport_af. Patch from |
6 | Svante Signell <svante.signell@telia.com> | 10 | Svante Signell <svante.signell@telia.com> |
diff --git a/channels.c b/channels.c index 038670da2..3710b2fd4 100644 --- a/channels.c +++ b/channels.c | |||
@@ -17,7 +17,7 @@ | |||
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include "includes.h" | 19 | #include "includes.h" |
20 | RCSID("$OpenBSD: channels.c,v 1.62 2000/06/20 01:39:39 markus Exp $"); | 20 | RCSID("$OpenBSD: channels.c,v 1.63 2000/06/25 20:17:57 provos Exp $"); |
21 | 21 | ||
22 | #include "ssh.h" | 22 | #include "ssh.h" |
23 | #include "packet.h" | 23 | #include "packet.h" |
@@ -135,7 +135,7 @@ Channel * | |||
135 | channel_lookup(int id) | 135 | channel_lookup(int id) |
136 | { | 136 | { |
137 | Channel *c; | 137 | Channel *c; |
138 | if (id < 0 && id > channels_alloc) { | 138 | if (id < 0 || id > channels_alloc) { |
139 | log("channel_lookup: %d: bad id", id); | 139 | log("channel_lookup: %d: bad id", id); |
140 | return NULL; | 140 | return NULL; |
141 | } | 141 | } |