Merge 4.2p1 to the trunk.

1 files changed, 31 insertions, 5 deletions

diff --git a/servconf.c b/servconf.c
index 96ad18084..9e420a527 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.140 2005/03/10 22:01:05 deraadt Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.144 2005/08/06 10:03:12 dtucker Exp $");
 
 #include "ssh.h"
 #include "log.h"
@@ -201,7 +201,7 @@ fill_default_server_options(ServerOptions *options)
         if (options->use_login == -1)
                 options->use_login = 0;
         if (options->compression == -1)
-                options->compression = 1;
+                options->compression = COMP_DELAYED;
         if (options->allow_tcp_forwarding == -1)
                 options->allow_tcp_forwarding = 1;
         if (options->gateway_ports == -1)
@@ -398,7 +398,7 @@ parse_token(const char *cp, const char *filename,
 static void
 add_listen_addr(ServerOptions *options, char *addr, u_short port)
 {
-        int i;
+        u_int i;
 
         if (options->num_ports == 0)
                 options->ports[options->num_ports++] = SSH_DEFAULT_PORT;
@@ -438,9 +438,10 @@ process_server_config_line(ServerOptions *options, char *line,
     const char *filename, int linenum)
 {
         char *cp, **charptr, *arg, *p;
-        int *intptr, value, i, n;
+        int *intptr, value, n;
         ServerOpCodes opcode;
         u_short port;
+        u_int i;
 
         cp = line;
         arg = strdelim(&cp);
@@ -516,6 +517,12 @@ parse_time:
                 if (arg == NULL || *arg == '\0')
                         fatal("%s line %d: missing address",
                             filename, linenum);
+                /* check for bare IPv6 address: no "[]" and 2 or more ":" */
+                if (strchr(arg, '[') == NULL && (p = strchr(arg, ':')) != NULL
+                    && strchr(p+1, ':') != NULL) {
+                        add_listen_addr(options, arg, 0);
+                        break;
+                }
                 p = hpdelim(&arg);
                 if (p == NULL)
                         fatal("%s line %d: bad address:port usage",
@@ -532,6 +539,9 @@ parse_time:
 
         case sAddressFamily:
                 arg = strdelim(&cp);
+                if (!arg || *arg == '\0')
+                        fatal("%s line %d: missing address family.",
+                            filename, linenum);
                 intptr = &options->address_family;
                 if (options->listen_addrs != NULL)
                         fatal("%s line %d: address family must be specified before "
@@ -721,7 +731,23 @@ parse_flag:
 
         case sCompression:
                 intptr = &options->compression;
-                goto parse_flag;
+                arg = strdelim(&cp);
+                if (!arg || *arg == '\0')
+                        fatal("%s line %d: missing yes/no/delayed "
+                            "argument.", filename, linenum);
+                value = 0;      /* silence compiler */
+                if (strcmp(arg, "delayed") == 0)
+                        value = COMP_DELAYED;
+                else if (strcmp(arg, "yes") == 0)
+                        value = COMP_ZLIB;
+                else if (strcmp(arg, "no") == 0)
+                        value = COMP_NONE;
+                else
+                        fatal("%s line %d: Bad yes/no/delayed "
+                            "argument: %s", filename, linenum, arg);
+                if (*intptr == -1)
+                        *intptr = value;
+                break;
 
         case sGatewayPorts:
                 intptr = &options->gateway_ports;