- 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 7f6f217096a55263d39ce6ea87f5ee8106094400..b099149e3a483f2e6d0a73ac1e6241aaffe33932 100644 (file)
--- 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 d57d4551dc5bc2203a0944e307b8f90acf9c50fa..df058d35a925fe4a878f4b58f96cf0c484dbc6ef 100644 (file)
--- 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 &&