diff options
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/readconf.c b/readconf.c index 5a7084fe8..e5f2620a7 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: readconf.c,v 1.122 2003/10/08 15:21:24 markus Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.123 2003/10/11 08:24:07 markus Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -89,7 +89,7 @@ RCSID("$OpenBSD: readconf.c,v 1.122 2003/10/08 15:21:24 markus Exp $"); | |||
89 | 89 | ||
90 | typedef enum { | 90 | typedef enum { |
91 | oBadOption, | 91 | oBadOption, |
92 | oForwardAgent, oForwardX11, oGatewayPorts, | 92 | oForwardAgent, oForwardX11, oForwardX11Trusted, oGatewayPorts, |
93 | oPasswordAuthentication, oRSAAuthentication, | 93 | oPasswordAuthentication, oRSAAuthentication, |
94 | oChallengeResponseAuthentication, oXAuthLocation, | 94 | oChallengeResponseAuthentication, oXAuthLocation, |
95 | oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward, | 95 | oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward, |
@@ -116,6 +116,7 @@ static struct { | |||
116 | } keywords[] = { | 116 | } keywords[] = { |
117 | { "forwardagent", oForwardAgent }, | 117 | { "forwardagent", oForwardAgent }, |
118 | { "forwardx11", oForwardX11 }, | 118 | { "forwardx11", oForwardX11 }, |
119 | { "forwardx11trusted", oForwardX11Trusted }, | ||
119 | { "xauthlocation", oXAuthLocation }, | 120 | { "xauthlocation", oXAuthLocation }, |
120 | { "gatewayports", oGatewayPorts }, | 121 | { "gatewayports", oGatewayPorts }, |
121 | { "useprivilegedport", oUsePrivilegedPort }, | 122 | { "useprivilegedport", oUsePrivilegedPort }, |
@@ -342,6 +343,10 @@ parse_flag: | |||
342 | intptr = &options->forward_x11; | 343 | intptr = &options->forward_x11; |
343 | goto parse_flag; | 344 | goto parse_flag; |
344 | 345 | ||
346 | case oForwardX11Trusted: | ||
347 | intptr = &options->forward_x11_trusted; | ||
348 | goto parse_flag; | ||
349 | |||
345 | case oGatewayPorts: | 350 | case oGatewayPorts: |
346 | intptr = &options->gateway_ports; | 351 | intptr = &options->gateway_ports; |
347 | goto parse_flag; | 352 | goto parse_flag; |
@@ -806,6 +811,7 @@ initialize_options(Options * options) | |||
806 | memset(options, 'X', sizeof(*options)); | 811 | memset(options, 'X', sizeof(*options)); |
807 | options->forward_agent = -1; | 812 | options->forward_agent = -1; |
808 | options->forward_x11 = -1; | 813 | options->forward_x11 = -1; |
814 | options->forward_x11_trusted = -1; | ||
809 | options->xauth_location = NULL; | 815 | options->xauth_location = NULL; |
810 | options->gateway_ports = -1; | 816 | options->gateway_ports = -1; |
811 | options->use_privileged_port = -1; | 817 | options->use_privileged_port = -1; |
@@ -872,6 +878,8 @@ fill_default_options(Options * options) | |||
872 | options->forward_agent = 0; | 878 | options->forward_agent = 0; |
873 | if (options->forward_x11 == -1) | 879 | if (options->forward_x11 == -1) |
874 | options->forward_x11 = 0; | 880 | options->forward_x11 = 0; |
881 | if (options->forward_x11_trusted == -1) | ||
882 | options->forward_x11_trusted = 0; | ||
875 | if (options->xauth_location == NULL) | 883 | if (options->xauth_location == NULL) |
876 | options->xauth_location = _PATH_XAUTH; | 884 | options->xauth_location = _PATH_XAUTH; |
877 | if (options->gateway_ports == -1) | 885 | if (options->gateway_ports == -1) |