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.293 and 1.294

version 1.293, 2016/08/15 12:27:56

version 1.294, 2016/08/19 03:18:06

Line 110

options->challenge_response_authentication = -1;

options->permit_empty_passwd = -1;

options->permit_user_env = -1;

options->use_login = -1;

options->compression = -1;

options->rekey_limit = -1;

options->rekey_interval = -1;

Line 264

Line 263

options->permit_empty_passwd = 0;

if (options->permit_user_env == -1)

options->permit_user_env = 0;

if (options->use_login == -1)

options->use_login = 0;

if (options->compression == -1)

options->compression = COMP_DELAYED;

if (options->rekey_limit == -1)

Line 367

Line 364

sPrintMotd, sPrintLastLog, sIgnoreRhosts,

sX11Forwarding, sX11DisplayOffset, sX11UseLocalhost,

sPermitTTY, sStrictModes, sEmptyPasswd, sTCPKeepAlive,

sPermitUserEnvironment, sUseLogin, sAllowTcpForwarding, sCompression,

sPermitUserEnvironment, sAllowTcpForwarding, sCompression,

sRekeyLimit, sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups,

sIgnoreUserKnownHosts, sCiphers, sMacs, sPidFile,

sGatewayPorts, sPubkeyAuthentication, sPubkeyAcceptedKeyTypes,

Line 462

Line 459

{ "strictmodes", sStrictModes, SSHCFG_GLOBAL },

{ "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL },

{ "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL },

{ "uselogin", sUseLogin, SSHCFG_GLOBAL },

{ "uselogin", sDeprecated, SSHCFG_GLOBAL },

{ "compression", sCompression, SSHCFG_GLOBAL },

{ "rekeylimit", sRekeyLimit, SSHCFG_ALL },

{ "tcpkeepalive", sTCPKeepAlive, SSHCFG_GLOBAL },

Line 1231

Line 1228

intptr = &options->permit_user_env;

goto parse_flag;

case sUseLogin:

intptr = &options->use_login;

goto parse_flag;

case sCompression:

intptr = &options->compression;

multistate_ptr = multistate_compression;

Line 2202

Line 2195

dump_cfg_fmtint(sTCPKeepAlive, o->tcp_keep_alive);

dump_cfg_fmtint(sEmptyPasswd, o->permit_empty_passwd);

dump_cfg_fmtint(sPermitUserEnvironment, o->permit_user_env);

dump_cfg_fmtint(sUseLogin, o->use_login);

dump_cfg_fmtint(sCompression, o->compression);

dump_cfg_fmtint(sGatewayPorts, o->fwd_opts.gateway_ports);

dump_cfg_fmtint(sUseDNS, o->use_dns);