=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/readconf.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- src/usr.bin/ssh/readconf.c 1999/09/28 04:45:36 1.2 +++ src/usr.bin/ssh/readconf.c 1999/09/29 00:10:16 1.3 @@ -14,7 +14,7 @@ */ #include "includes.h" -RCSID("$Id: readconf.c,v 1.2 1999/09/28 04:45:36 provos Exp $"); +RCSID("$Id: readconf.c,v 1.3 1999/09/29 00:10:16 deraadt Exp $"); #include "ssh.h" #include "cipher.h" @@ -88,7 +88,7 @@ typedef enum { - oForwardAgent, oForwardX11, oRhostsAuthentication, + oForwardAgent, oForwardX11, oGatewayPorts, oRhostsAuthentication, oPasswordAuthentication, oRSAAuthentication, oFallBackToRsh, oUseRsh, #ifdef KRB4 oKerberosAuthentication, @@ -116,6 +116,7 @@ { { "forwardagent", oForwardAgent }, { "forwardx11", oForwardX11 }, + { "gatewayports", oGatewayPorts }, { "rhostsauthentication", oRhostsAuthentication }, { "passwordauthentication", oPasswordAuthentication }, { "rsaauthentication", oRSAAuthentication }, @@ -254,6 +255,10 @@ case oForwardX11: intptr = &options->forward_x11; goto parse_flag; + + case oGatewayPorts: + intptr = &options->gateway_ports; + goto parse_flag; case oRhostsAuthentication: intptr = &options->rhosts_authentication; @@ -558,6 +563,7 @@ memset(options, 'X', sizeof(*options)); options->forward_agent = -1; options->forward_x11 = -1; + options->gateway_ports = -1; options->rhosts_authentication = -1; options->rsa_authentication = -1; #ifdef KRB4 @@ -605,6 +611,8 @@ options->forward_agent = 1; if (options->forward_x11 == -1) options->forward_x11 = 1; + if (options->gateway_ports == -1) + options->gateway_ports = 0; if (options->rhosts_authentication == -1) options->rhosts_authentication = 1; if (options->rsa_authentication == -1)