- djm@cvs.openbsd.org 2009/02/12 03:00:56

     [canohost.c canohost.h channels.c channels.h clientloop.c readconf.c]
     [readconf.h serverloop.c ssh.c]
     support remote port forwarding with a zero listen port (-R0:...) to
     dyamically allocate a listen port at runtime (this is actually
     specified in rfc4254); bz#1003 ok markus@

1 files changed, 9 insertions, 4 deletions

diff --git a/readconf.c b/readconf.c
index 0a8be1400..53fc6c7ba 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.175 2009/01/22 10:02:34 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.176 2009/02/12 03:00:56 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -735,7 +735,8 @@ parse_int:
                 }
 
                 if (parse_forward(&fwd, fwdarg,
-                    opcode == oDynamicForward ? 1 : 0) == 0)
+                    opcode == oDynamicForward ? 1 : 0,
+                    opcode == oRemoteForward ? 1 : 0) == 0)
                         fatal("%.200s line %d: Bad forwarding specification.",
                             filename, linenum);
 
@@ -1220,7 +1221,7 @@ fill_default_options(Options * options)
  * returns number of arguments parsed or zero on error
  */
 int
-parse_forward(Forward *fwd, const char *fwdspec, int dynamicfwd)
+parse_forward(Forward *fwd, const char *fwdspec, int dynamicfwd, int remotefwd)
 {
         int i;
         char *p, *cp, *fwdarg[4];
@@ -1283,12 +1284,16 @@ parse_forward(Forward *fwd, const char *fwdspec, int dynamicfwd)
                         goto fail_free;
         }
 
-        if (fwd->listen_port <= 0)
+        if (fwd->listen_port < 0 || (!remotefwd && fwd->listen_port == 0))
                 goto fail_free;
 
         if (fwd->connect_host != NULL &&
             strlen(fwd->connect_host) >= NI_MAXHOST)
                 goto fail_free;
+        if (fwd->listen_host != NULL &&
+            strlen(fwd->listen_host) >= NI_MAXHOST)
+                goto fail_free;
+
 
         return (i);