src/usr.bin/ssh/servconf.c - diff

Return to servconf.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/servconf.c between version 1.331 and 1.332

version 1.331, 2018/06/06 18:29:18

version 1.332, 2018/06/09 03:03:10

Line 144

options->client_alive_count_max = -1;

options->num_authkeys_files = 0;

options->num_accept_env = 0;

options->num_setenv = 0;

options->permit_tun = -1;

options->permitted_opens = NULL;

options->permitted_listens = NULL;

Line 428

Line 429

sHostKeyAlgorithms,

sClientAliveInterval, sClientAliveCountMax, sAuthorizedKeysFile,

sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor,

sAcceptEnv, sPermitTunnel,

sAcceptEnv, sSetEnv, sPermitTunnel,

sMatch, sPermitOpen, sPermitListen, sForceCommand, sChrootDirectory,

sUsePrivilegeSeparation, sAllowAgentForwarding,

sHostCertificate,

Line 543

Line 544

{ "authorizedkeysfile2", sDeprecated, SSHCFG_ALL },

{ "useprivilegeseparation", sDeprecated, SSHCFG_GLOBAL},

{ "acceptenv", sAcceptEnv, SSHCFG_ALL },

{ "setenv", sSetEnv, SSHCFG_ALL },

{ "permittunnel", sPermitTunnel, SSHCFG_ALL },

{ "permittty", sPermitTTY, SSHCFG_ALL },

{ "permituserrc", sPermitUserRC, SSHCFG_ALL },

Line 1738

Line 1740

}

break;

case sSetEnv:

uvalue = options->num_setenv;

while ((arg = strdelimw(&cp)) && *arg != '\0') {

if (strchr(arg, '=') == NULL)

fatal("%s line %d: Invalid environment.",

filename, linenum);

if (!*activep || uvalue != 0)

continue;

array_append(filename, linenum, "SetEnv",

&options->setenv, &options->num_setenv, arg);

}

break;

case sPermitTunnel:

intptr = &options->permit_tun;

arg = strdelim(&cp);

Line 2492

Line 2507

dump_cfg_strarray(sAllowGroups, o->num_allow_groups, o->allow_groups);

dump_cfg_strarray(sDenyGroups, o->num_deny_groups, o->deny_groups);

dump_cfg_strarray(sAcceptEnv, o->num_accept_env, o->accept_env);

dump_cfg_strarray(sSetEnv, o->num_setenv, o->setenv);

dump_cfg_strarray_oneline(sAuthenticationMethods,

o->num_auth_methods, o->auth_methods);