tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-30 17:25:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

- andreas@cvs.openbsd.org 2009/06/27 09:35:06

Browse Source 
[readconf.h readconf.c]
     Add client option UseRoaming. It doesn't do anything yet but will
     control whether the client tries to use roaming if enabled on the
     server. From Martin Forssen.
     ok markus@
This commit is contained in:
Darren Tucker 2009-07-06 07:12:27 +10:00
parent 466df21961
commit 71e4d54dc7
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -10,6 +10,12 @@
to a buffer when roaming is enabled. to a buffer when roaming is enabled.
Most of this code was written by Martin Forssen, maf at appgate dot com. Most of this code was written by Martin Forssen, maf at appgate dot com.
ok markus@ ok markus@
- andreas@cvs.openbsd.org 2009/06/27 09:35:06
[readconf.h readconf.c]
Add client option UseRoaming. It doesn't do anything yet but will
control whether the client tries to use roaming if enabled on the
server. From Martin Forssen.
ok markus@
20090622 20090622
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync

12
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.176 2009/02/12 03:00:56 djm Exp $ */ /* $OpenBSD: readconf.c,v 1.177 2009/06/27 09:35:06 andreas Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -130,7 +130,7 @@ typedef enum {
oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
oSendEnv, oControlPath, oControlMaster, oHashKnownHosts, oSendEnv, oControlPath, oControlMaster, oHashKnownHosts,
oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
oVisualHostKey, oZeroKnowledgePasswordAuthentication, oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,
oDeprecated, oUnsupported oDeprecated, oUnsupported
} OpCodes; } OpCodes;
@ -228,6 +228,7 @@ static struct {
{ "localcommand", oLocalCommand }, { "localcommand", oLocalCommand },
{ "permitlocalcommand", oPermitLocalCommand }, { "permitlocalcommand", oPermitLocalCommand },
{ "visualhostkey", oVisualHostKey }, { "visualhostkey", oVisualHostKey },
{ "useroaming", oUseRoaming },
#ifdef JPAKE #ifdef JPAKE
{ "zeroknowledgepasswordauthentication", { "zeroknowledgepasswordauthentication",
oZeroKnowledgePasswordAuthentication }, oZeroKnowledgePasswordAuthentication },
@ -914,6 +915,10 @@ parse_int:
intptr = &options->visual_host_key; intptr = &options->visual_host_key;
goto parse_flag; goto parse_flag;
case oUseRoaming:
intptr = &options->use_roaming;
goto parse_flag;
case oDeprecated: case oDeprecated:
debug("%s line %d: Deprecated option \"%s\"", debug("%s line %d: Deprecated option \"%s\"",
filename, linenum, keyword); filename, linenum, keyword);
@ -1063,6 +1068,7 @@ initialize_options(Options * options)
options->tun_remote = -1; options->tun_remote = -1;
options->local_command = NULL; options->local_command = NULL;
options->permit_local_command = -1; options->permit_local_command = -1;
options->use_roaming = -1;
options->visual_host_key = -1; options->visual_host_key = -1;
options->zero_knowledge_password_authentication = -1; options->zero_knowledge_password_authentication = -1;
} }
@ -1199,6 +1205,8 @@ fill_default_options(Options * options)
options->tun_remote = SSH_TUNID_ANY; options->tun_remote = SSH_TUNID_ANY;
if (options->permit_local_command == -1) if (options->permit_local_command == -1)
options->permit_local_command = 0; options->permit_local_command = 0;
if (options->use_roaming == -1)
options->use_roaming = 1;
if (options->visual_host_key == -1) if (options->visual_host_key == -1)
options->visual_host_key = 0; options->visual_host_key = 0;
if (options->zero_knowledge_password_authentication == -1) if (options->zero_knowledge_password_authentication == -1)

4
readconf.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.h,v 1.78 2009/02/12 03:00:56 djm Exp $ */ /* $OpenBSD: readconf.h,v 1.79 2009/06/27 09:35:06 andreas Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -123,6 +123,8 @@ typedef struct {
int permit_local_command; int permit_local_command;
int visual_host_key; int visual_host_key;
int use_roaming;
} Options; } Options;
#define SSHCTL_MASTER_NO 0 #define SSHCTL_MASTER_NO 0