2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 56121d466..6b109e5be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,6 +57,10 @@
      [channels.c channels.h session.c]
      make Channel->path an allocated string, saving a few bytes here and
      there and fixing bz#1380 in the process; ok markus@
+   - djm@cvs.openbsd.org 2009/01/22 09:49:57
+     [channels.c]
+     oops! I committed the wrong version of the Channel->path diff,
+     it was missing some tweaks suggested by stevesk@
 
 20090107
  - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X.
@@ -5066,5 +5070,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.5173 2009/01/28 05:29:49 djm Exp $
+$Id: ChangeLog,v 1.5174 2009/01/28 05:30:33 djm Exp $
 
diff --git a/channels.c b/channels.c
index e6c08b62b..0b1c34c83 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.293 2009/01/22 09:46:01 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.294 2009/01/22 09:49:57 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1181,7 +1181,7 @@ channel_decode_socks5(Channel *c, fd_set *readset, fd_set *writeset)
                 c->path = NULL;
         }
         if (s5_req.atyp == SSH_SOCKS5_DOMAIN) {
-                if (addrlen > NI_MAXHOST - 1) {
+                if (addrlen >= NI_MAXHOST) {
                         error("channel %d: dynamic request: socks5 hostname "
                             "\"%.100s\" too long", c->self, dest_addr);
                         return -1;
@@ -2477,7 +2477,7 @@ channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_por
                 error("No forward host name.");
                 return 0;
         }
-        if (strlen(host) > NI_MAXHOST) {
+        if (strlen(host) >= NI_MAXHOST) {
                 error("Forward host name too long.");
                 return 0;
         }