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.315 and 1.316

version 1.315, 2017/10/25 00:15:35

version 1.316, 2017/10/25 00:17:08

Line 77

options->listen_addrs = NULL;

options->num_listen_addrs = 0;

options->address_family = -1;

options->routing_domain = NULL;

options->num_host_key_files = 0;

options->num_host_cert_files = 0;

options->host_key_agent = NULL;

Line 385

Line 386

CLEAR_ON_NONE(options->authorized_principals_file);

CLEAR_ON_NONE(options->adm_forced_command);

CLEAR_ON_NONE(options->chroot_directory);

CLEAR_ON_NONE(options->routing_domain);

for (i = 0; i < options->num_host_key_files; i++)

CLEAR_ON_NONE(options->host_key_files[i]);

for (i = 0; i < options->num_host_cert_files; i++)

Line 435

Line 437

sAuthenticationMethods, sHostKeyAgent, sPermitUserRC,

sStreamLocalBindMask, sStreamLocalBindUnlink,

sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding,

sExposeAuthInfo,

sExposeAuthInfo, sRDomain,

sDeprecated, sIgnore, sUnsupported

} ServerOpCodes;

Line 564

Line 566

{ "fingerprinthash", sFingerprintHash, SSHCFG_GLOBAL },

{ "disableforwarding", sDisableForwarding, SSHCFG_ALL },

{ "exposeauthinfo", sExposeAuthInfo, SSHCFG_ALL },

{ "rdomain", sRDomain, SSHCFG_ALL },

{ NULL, sBadOption, 0 }

};

Line 1928

Line 1931

intptr = &options->expose_userauth_info;

goto parse_flag;

case sRDomain:

charptr = &options->routing_domain;

arg = strdelim(&cp);

if (!arg || *arg == '\0')

fatal("%.200s line %d: Missing argument.",

filename, linenum);

if (strcasecmp(arg, "none") != 0 && strcmp(arg, "%D") != 0 &&

!valid_rdomain(arg))

fatal("%s line %d: bad routing domain",

filename, linenum);

if (*activep && *charptr == NULL)

*charptr = xstrdup(arg);

case sDeprecated:

case sIgnore:

case sUnsupported:

Line 2410

Line 2426

o->hostkeyalgorithms : KEX_DEFAULT_PK_ALG);

dump_cfg_string(sPubkeyAcceptedKeyTypes, o->pubkey_key_types ?

o->pubkey_key_types : KEX_DEFAULT_PK_ALG);

dump_cfg_string(sRDomain, o->routing_domain);

/* string arguments requiring a lookup */

dump_cfg_string(sLogLevel, log_level_name(o->log_level));