2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index b67efd293..a5d6cd09b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 20000626
- - Better fix to aclocal tests from Garrick James <garrick@james.net>
- 
+ - (djm) Better fix to aclocal tests from Garrick James <garrick@james.net>
+ - 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>
+
 20000623
  - (djm) Use sa_family_t in prototype for rresvport_af. Patch from 
    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 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.62 2000/06/20 01:39:39 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.63 2000/06/25 20:17:57 provos Exp $");
 
 #include "ssh.h"
 #include "packet.h"
@@ -135,7 +135,7 @@ Channel *
 channel_lookup(int id)
 {
         Channel *c;
-        if (id < 0 && id > channels_alloc) {
+        if (id < 0 || id > channels_alloc) {
                 log("channel_lookup: %d: bad id", id);
                 return NULL;
         }