From: djm <djm>
Date: Fri, 26 Oct 2007 04:27:22 +0000 (+0000)
Subject:    - markus@cvs.openbsd.org 2007/10/22 19:10:24
X-Git-Tag: V_4_9_P1~137
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/c462cd6f103ec46c944440bcb7c6bfbf43936a30

   - 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)
---

diff --git a/ChangeLog b/ChangeLog
index 7f6f2170..b099149e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/readconf.c b/readconf.c
index d57d4551..df058d35 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 &&