diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | readconf.c | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -37,6 +37,10 @@ | |||
37 | removes an unused variable | 37 | removes an unused variable |
38 | correctly counts line number | 38 | correctly counts line number |
39 | "looks ok" ray@ markus@ | 39 | "looks ok" ray@ markus@ |
40 | - markus@cvs.openbsd.org 2007/10/22 19:10:24 | ||
41 | [readconf.c] | ||
42 | make sure that both the local and remote port are correct when | ||
43 | parsing -L; Jan Pechanec (bz #1378) | ||
40 | 44 | ||
41 | 20070927 | 45 | 20070927 |
42 | - (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if | 46 | - (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if |
@@ -3308,4 +3312,4 @@ | |||
3308 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3312 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3309 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3313 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3310 | 3314 | ||
3311 | $Id: ChangeLog,v 1.4768 2007/10/26 04:27:02 djm Exp $ | 3315 | $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 @@ | |||
1 | /* $OpenBSD: readconf.c,v 1.162 2007/03/20 03:56:12 tedu Exp $ */ | 1 | /* $OpenBSD: readconf.c,v 1.163 2007/10/22 19:10:24 markus 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 |
@@ -1255,7 +1255,7 @@ parse_forward(Forward *fwd, const char *fwdspec) | |||
1255 | 1255 | ||
1256 | xfree(p); | 1256 | xfree(p); |
1257 | 1257 | ||
1258 | if (fwd->listen_port == 0 && fwd->connect_port == 0) | 1258 | if (fwd->listen_port == 0 || fwd->connect_port == 0) |
1259 | goto fail_free; | 1259 | goto fail_free; |
1260 | 1260 | ||
1261 | if (fwd->connect_host != NULL && | 1261 | if (fwd->connect_host != NULL && |