mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-23 09:17:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2009/01/22 09:49:57

Browse Source 
[channels.c]
     oops! I committed the wrong version of the Channel->path diff,
     it was missing some tweaks suggested by stevesk@
This commit is contained in:
Damien Miller 2009-01-28 16:30:33 +11:00
parent a1c1b6c86d
commit 9576ac4afc
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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 $

6
channels.c
View File

@ -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;
}