import openssh-4.3p2-gsskex-20060223.patch

1 files changed, 29 insertions, 2 deletions

diff --git a/servconf.c b/servconf.c
index becd5b7c5..219a0300f 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.144 2005/08/06 10:03:12 dtucker Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.146 2005/12/08 18:34:11 reyk Exp $");
 
 #include "ssh.h"
 #include "log.h"
@@ -102,6 +102,7 @@ initialize_server_options(ServerOptions *options)
         options->authorized_keys_file = NULL;
         options->authorized_keys_file2 = NULL;
         options->num_accept_env = 0;
+        options->permit_tun = -1;
 
         /* Needs to be accessable in many places */
         use_privsep = -1;
@@ -232,6 +233,8 @@ fill_default_server_options(ServerOptions *options)
         }
         if (options->authorized_keys_file == NULL)
                 options->authorized_keys_file = _PATH_SSH_USER_PERMITTED_KEYS;
+        if (options->permit_tun == -1)
+                options->permit_tun = SSH_TUNMODE_NO;
 
         /* Turn privilege separation on by default */
         if (use_privsep == -1)
@@ -273,7 +276,8 @@ typedef enum {
         sBanner, sUseDNS, sHostbasedAuthentication,
         sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,
         sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
-        sGssAuthentication, sGssKeyEx, sGssCleanupCreds, sAcceptEnv,
+        sGssAuthentication, sGssKeyEx, sGssCleanupCreds, 
+        sAcceptEnv, sPermitTunnel,
         sUsePrivilegeSeparation,
         sDeprecated, sUnsupported
 } ServerOpCodes;
@@ -378,6 +382,7 @@ static struct {
         { "authorizedkeysfile2", sAuthorizedKeysFile2 },
         { "useprivilegeseparation", sUsePrivilegeSeparation},
         { "acceptenv", sAcceptEnv },
+        { "permittunnel", sPermitTunnel },
         { NULL, sBadOption }
 };
 
@@ -971,6 +976,28 @@ parse_flag:
                 }
                 break;
 
+        case sPermitTunnel:
+                intptr = &options->permit_tun;
+                arg = strdelim(&cp);
+                if (!arg || *arg == '\0')
+                        fatal("%s line %d: Missing yes/point-to-point/"
+                            "ethernet/no argument.", filename, linenum);
+                value = 0;      /* silence compiler */
+                if (strcasecmp(arg, "ethernet") == 0)
+                        value = SSH_TUNMODE_ETHERNET;
+                else if (strcasecmp(arg, "point-to-point") == 0)
+                        value = SSH_TUNMODE_POINTOPOINT;
+                else if (strcasecmp(arg, "yes") == 0)
+                        value = SSH_TUNMODE_YES;
+                else if (strcasecmp(arg, "no") == 0)
+                        value = SSH_TUNMODE_NO;
+                else
+                        fatal("%s line %d: Bad yes/point-to-point/ethernet/"
+                            "no argument: %s", filename, linenum, arg);
+                if (*intptr == -1)
+                        *intptr = value;
+                break;
+
         case sDeprecated:
                 logit("%s line %d: Deprecated option %s",
                     filename, linenum, arg);