diff options
| author | Damien Miller <djm@mindrot.org> | 2007-10-26 06:27:22 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2007-10-26 06:27:22 +0200 |
| commit | 5a4456c6a592143a0a25ad925279eaf9ff620cc4 (patch) | |
| tree | 14fa0c9c865271c2ac117a0904ecc1f153f86977 | |
| parent | - chl@cvs.openbsd.org 2007/10/02 17:49:58 (diff) | |
| download | openssh-5a4456c6a592143a0a25ad925279eaf9ff620cc4.tar.xz openssh-5a4456c6a592143a0a25ad925279eaf9ff620cc4.zip | |
- 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)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | readconf.c | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -37,6 +37,10 @@ removes an unused variable correctly counts line number "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 - (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 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 $ diff --git a/readconf.c b/readconf.c index d57d4551d..df058d35a 100644 --- a/readconf.c +++ b/readconf.c @@ -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> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1255,7 +1255,7 @@ parse_forward(Forward *fwd, const char *fwdspec) xfree(p); - if (fwd->listen_port == 0 && fwd->connect_port == 0) + if (fwd->listen_port == 0 || fwd->connect_port == 0) goto fail_free; if (fwd->connect_host != NULL && |