- djm@cvs.openbsd.org 2005/03/01 10:09:52

     [auth-options.c channels.c channels.h clientloop.c compat.c compat.h]
     [misc.c misc.h readconf.c readconf.h servconf.c ssh.1 ssh.c ssh_config.5]
     [sshd_config.5]
     bz#413: allow optional specification of bind address for port forwardings.
     Patch originally by Dan Astorian, but worked on by several people
     Adds GatewayPorts=clientspecified option on server to allow remote
     forwards to bind to client-specified ports.

1 files changed, 16 insertions, 12 deletions

diff --git a/auth-options.c b/auth-options.c
index 0e146ab15..04d12d66e 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-options.c,v 1.28 2003/06/02 09:17:34 markus Exp $");
+RCSID("$OpenBSD: auth-options.c,v 1.29 2005/03/01 10:09:52 djm Exp $");
 
 #include "xmalloc.h"
 #include "match.h"
@@ -217,7 +217,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                 }
                 cp = "permitopen=\"";
                 if (strncasecmp(opts, cp, strlen(cp)) == 0) {
-                        char host[256], sport[6];
+                        char *host, *p;
                         u_short port;
                         char *patterns = xmalloc(strlen(opts) + 1);
 
@@ -236,25 +236,29 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                         if (!*opts) {
                                 debug("%.100s, line %lu: missing end quote",
                                     file, linenum);
-                                auth_debug_add("%.100s, line %lu: missing end quote",
-                                    file, linenum);
+                                auth_debug_add("%.100s, line %lu: missing "
+                                    "end quote", file, linenum);
                                 xfree(patterns);
                                 goto bad_option;
                         }
                         patterns[i] = 0;
                         opts++;
-                        if (sscanf(patterns, "%255[^:]:%5[0-9]", host, sport) != 2 &&
-                            sscanf(patterns, "%255[^/]/%5[0-9]", host, sport) != 2) {
-                                debug("%.100s, line %lu: Bad permitopen specification "
-                                    "<%.100s>", file, linenum, patterns);
+                        p = patterns;
+                        host = hpdelim(&p);
+                        if (host == NULL || strlen(host) >= NI_MAXHOST) {
+                                debug("%.100s, line %lu: Bad permitopen "
+                                    "specification <%.100s>", file, linenum, 
+                                    patterns);
                                 auth_debug_add("%.100s, line %lu: "
-                                    "Bad permitopen specification", file, linenum);
+                                    "Bad permitopen specification", file,
+                                    linenum);
                                 xfree(patterns);
                                 goto bad_option;
                         }
-                        if ((port = a2port(sport)) == 0) {
-                                debug("%.100s, line %lu: Bad permitopen port <%.100s>",
-                                    file, linenum, sport);
+                        host = cleanhostname(host);
+                        if (p == NULL || (port = a2port(p)) == 0) {
+                                debug("%.100s, line %lu: Bad permitopen port "
+                                    "<%.100s>", file, linenum, p ? p : "");
                                 auth_debug_add("%.100s, line %lu: "
                                     "Bad permitopen port", file, linenum);
                                 xfree(patterns);