diff options
| author | Kevin Steves <stevesk@cvs.openbsd.org> | 2002-01-27 14:57:47 +0000 |
|---|---|---|
| committer | Kevin Steves <stevesk@cvs.openbsd.org> | 2002-01-27 14:57:47 +0000 |
| commit | 92a2dc0bbc7825cda2d86c1b29a35286c3f7e731 (patch) | |
| tree | be9a6c9d32f3b199de8314f1f423d05a21142c80 /usr.bin/ssh/servconf.c | |
| parent | 0c9c2a700cf032fc1922ae5086685e75e855f714 (diff) | |
add X11UseLocalhost; ok markus@
Diffstat (limited to 'usr.bin/ssh/servconf.c')
| -rw-r--r-- | usr.bin/ssh/servconf.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index 8864426bab8..93de74d55ef 100644 --- a/usr.bin/ssh/servconf.c +++ b/usr.bin/ssh/servconf.c @@ -10,7 +10,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: servconf.c,v 1.98 2002/01/22 02:52:41 stevesk Exp $"); +RCSID("$OpenBSD: servconf.c,v 1.99 2002/01/27 14:57:46 stevesk Exp $"); #if defined(KRB4) || defined(KRB5) #include <krb.h> @@ -58,6 +58,7 @@ initialize_server_options(ServerOptions *options) options->print_lastlog = -1; options->x11_forwarding = -1; options->x11_display_offset = -1; + options->x11_use_localhost = -1; options->xauth_location = NULL; options->strict_modes = -1; options->keepalives = -1; @@ -149,6 +150,8 @@ fill_default_server_options(ServerOptions *options) options->x11_forwarding = 0; if (options->x11_display_offset == -1) options->x11_display_offset = 10; + if (options->x11_use_localhost == -1) + options->x11_use_localhost = 1; if (options->xauth_location == NULL) options->xauth_location = _PATH_XAUTH; if (options->strict_modes == -1) @@ -242,7 +245,7 @@ typedef enum { sChallengeResponseAuthentication, sPasswordAuthentication, sKbdInteractiveAuthentication, sListenAddress, sPrintMotd, sPrintLastLog, sIgnoreRhosts, - sX11Forwarding, sX11DisplayOffset, + sX11Forwarding, sX11DisplayOffset, sX11UseLocalhost, sStrictModes, sEmptyPasswd, sKeepAlives, sUseLogin, sAllowTcpForwarding, sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups, @@ -299,6 +302,7 @@ static struct { { "ignoreuserknownhosts", sIgnoreUserKnownHosts }, { "x11forwarding", sX11Forwarding }, { "x11displayoffset", sX11DisplayOffset }, + { "x11uselocalhost", sX11UseLocalhost }, { "xauthlocation", sXAuthLocation }, { "strictmodes", sStrictModes }, { "permitemptypasswords", sEmptyPasswd }, @@ -633,6 +637,10 @@ parse_flag: intptr = &options->x11_display_offset; goto parse_int; + case sX11UseLocalhost: + intptr = &options->x11_use_localhost; + goto parse_flag; + case sXAuthLocation: charptr = &options->xauth_location; goto parse_filename; |