tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2007/10/22 19:10:24 

[readconf.c]
     make sure that both the local and remote port are correct when
     parsing -L; Jan Pechanec (bz #1378)
This commit is contained in:
Damien Miller 2007-10-26 14:27:22 +10:00
parent 3dddab3b95
commit 5a4456c6a5
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -37,6 +37,10 @@
removes an unused variable removes an unused variable
correctly counts line number correctly counts line number
"looks ok" ray@ markus@ "looks ok" ray@ markus@
- markus@cvs.openbsd.org 2007/10/22 19:10:24
[readconf.c]
make sure that both the local and remote port are correct when
parsing -L; Jan Pechanec (bz #1378)
20070927 20070927
- (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if - (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if
@ -3308,4 +3312,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4768 2007/10/26 04:27:02 djm Exp $ $Id: ChangeLog,v 1.4769 2007/10/26 04:27:22 djm Exp $

4
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.162 2007/03/20 03:56:12 tedu Exp $ */ /* $OpenBSD: readconf.c,v 1.163 2007/10/22 19:10:24 markus Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1255,7 +1255,7 @@ parse_forward(Forward *fwd, const char *fwdspec)
xfree(p); xfree(p);
if (fwd->listen_port == 0 && fwd->connect_port == 0) if (fwd->listen_port == 0 || fwd->connect_port == 0)
goto fail_free; goto fail_free;
if (fwd->connect_host != NULL && if (fwd->connect_host != NULL &&