summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--channels.c6
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 @@
57 [channels.c channels.h session.c] 57 [channels.c channels.h session.c]
58 make Channel->path an allocated string, saving a few bytes here and 58 make Channel->path an allocated string, saving a few bytes here and
59 there and fixing bz#1380 in the process; ok markus@ 59 there and fixing bz#1380 in the process; ok markus@
60 - djm@cvs.openbsd.org 2009/01/22 09:49:57
61 [channels.c]
62 oops! I committed the wrong version of the Channel->path diff,
63 it was missing some tweaks suggested by stevesk@
60 64
6120090107 6520090107
62 - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. 66 - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X.
@@ -5066,5 +5070,5 @@
5066 OpenServer 6 and add osr5bigcrypt support so when someone migrates 5070 OpenServer 6 and add osr5bigcrypt support so when someone migrates
5067 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 5071 passwords between UnixWare and OpenServer they will still work. OK dtucker@
5068 5072
5069$Id: ChangeLog,v 1.5173 2009/01/28 05:29:49 djm Exp $ 5073$Id: ChangeLog,v 1.5174 2009/01/28 05:30:33 djm Exp $
5070 5074
diff --git a/channels.c b/channels.c
index e6c08b62b..0b1c34c83 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: channels.c,v 1.293 2009/01/22 09:46:01 djm Exp $ */ 1/* $OpenBSD: channels.c,v 1.294 2009/01/22 09:49:57 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * 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)
1181 c->path = NULL; 1181 c->path = NULL;
1182 } 1182 }
1183 if (s5_req.atyp == SSH_SOCKS5_DOMAIN) { 1183 if (s5_req.atyp == SSH_SOCKS5_DOMAIN) {
1184 if (addrlen > NI_MAXHOST - 1) { 1184 if (addrlen >= NI_MAXHOST) {
1185 error("channel %d: dynamic request: socks5 hostname " 1185 error("channel %d: dynamic request: socks5 hostname "
1186 "\"%.100s\" too long", c->self, dest_addr); 1186 "\"%.100s\" too long", c->self, dest_addr);
1187 return -1; 1187 return -1;
@@ -2477,7 +2477,7 @@ channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_por
2477 error("No forward host name."); 2477 error("No forward host name.");
2478 return 0; 2478 return 0;
2479 } 2479 }
2480 if (strlen(host) > NI_MAXHOST) { 2480 if (strlen(host) >= NI_MAXHOST) {
2481 error("Forward host name too long."); 2481 error("Forward host name too long.");
2482 return 0; 2482 return 0;
2483 } 2483 }