summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/servconf.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1999-09-28 07:56:48 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1999-09-28 07:56:48 +0000
commit725ac8b6344073209be33cdbe6901588ae4e69a8 (patch)
treea1c66c814f21d2978eb6dc4e0f0d21ce9fbde764 /usr.bin/ssh/servconf.c
parentd7d8915fdbae8c66bb4a3d3904275f020760c01d (diff)
X11DisplayOffset; aaron
Diffstat (limited to 'usr.bin/ssh/servconf.c')
-rw-r--r--usr.bin/ssh/servconf.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c
index 4a70624d18a..e8d4d55dcf7 100644
--- a/usr.bin/ssh/servconf.c
+++ b/usr.bin/ssh/servconf.c
@@ -12,7 +12,7 @@ Created: Mon Aug 21 15:48:58 1995 ylo
*/
#include "includes.h"
-RCSID("$Id: servconf.c,v 1.1 1999/09/26 20:53:37 deraadt Exp $");
+RCSID("$Id: servconf.c,v 1.2 1999/09/28 07:56:47 deraadt Exp $");
#include "ssh.h"
#include "servconf.h"
@@ -36,6 +36,7 @@ void initialize_server_options(ServerOptions *options)
options->fascist_logging = -1;
options->print_motd = -1;
options->x11_forwarding = -1;
+ options->x11_display_offset = -1;
options->strict_modes = -1;
options->keepalives = -1;
options->log_facility = (SyslogFacility)-1;
@@ -96,6 +97,8 @@ void fill_default_server_options(ServerOptions *options)
options->print_motd = 1;
if (options->x11_forwarding == -1)
options->x11_forwarding = 1;
+ if (options->x11_display_offset == -1)
+ options->x11_display_offset = 1;
if (options->strict_modes == -1)
options->strict_modes = 1;
if (options->keepalives == -1)
@@ -153,7 +156,7 @@ typedef enum
sAFSTokenPassing,
#endif
sPasswordAuthentication, sAllowHosts, sDenyHosts, sListenAddress,
- sPrintMotd, sIgnoreRhosts, sX11Forwarding,
+ sPrintMotd, sIgnoreRhosts, sX11Forwarding, sX11DisplayOffset,
sStrictModes, sEmptyPasswd, sRandomSeedFile, sKeepAlives
} ServerOpCodes;
@@ -196,6 +199,7 @@ static struct
{ "printmotd", sPrintMotd },
{ "ignorerhosts", sIgnoreRhosts },
{ "x11forwarding", sX11Forwarding },
+ { "x11displayoffset", sX11DisplayOffset },
{ "strictmodes", sStrictModes },
{ "permitemptypasswords", sEmptyPasswd },
{ "randomseed", sRandomSeedFile },
@@ -424,6 +428,10 @@ void read_server_config(ServerOptions *options, const char *filename)
intptr = &options->x11_forwarding;
goto parse_flag;
+ case sX11DisplayOffset:
+ intptr = &options->x11_display_offset;
+ goto parse_int;
+
case sStrictModes:
intptr = &options->strict_modes;
goto parse_flag;