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.300 and 1.301

version 1.300, 2016/11/23 23:14:15

version 1.301, 2016/11/30 03:00:05

Line 153

options->ip_qos_bulk = -1;

options->version_addendum = NULL;

options->fingerprint_hash = -1;

options->disable_forwarding = -1;

}

/* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */

Line 313

Line 314

options->fwd_opts.streamlocal_bind_unlink = 0;

if (options->fingerprint_hash == -1)

options->fingerprint_hash = SSH_FP_HASH_DEFAULT;

if (options->disable_forwarding == -1)

options->disable_forwarding = 0;

assemble_algorithms(options);

Line 384

Line 387

sAuthorizedKeysCommand, sAuthorizedKeysCommandUser,

sAuthenticationMethods, sHostKeyAgent, sPermitUserRC,

sStreamLocalBindMask, sStreamLocalBindUnlink,

sAllowStreamLocalForwarding, sFingerprintHash,

sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding,

sDeprecated, sIgnore, sUnsupported

} ServerOpCodes;

Line 511

Line 514

{ "streamlocalbindunlink", sStreamLocalBindUnlink, SSHCFG_ALL },

{ "allowstreamlocalforwarding", sAllowStreamLocalForwarding, SSHCFG_ALL },

{ "fingerprinthash", sFingerprintHash, SSHCFG_GLOBAL },

{ "disableforwarding", sDisableForwarding, SSHCFG_ALL },

{ NULL, sBadOption, 0 }

};

Line 1304

Line 1308

intptr = &options->allow_agent_forwarding;

goto parse_flag;

case sDisableForwarding:

intptr = &options->disable_forwarding;

goto parse_flag;

case sUsePrivilegeSeparation:

intptr = &use_privsep;

multistate_ptr = multistate_privsep;

Line 1913

Line 1921

M_CP_INTOPT(allow_tcp_forwarding);

M_CP_INTOPT(allow_streamlocal_forwarding);

M_CP_INTOPT(allow_agent_forwarding);

M_CP_INTOPT(disable_forwarding);

M_CP_INTOPT(permit_tun);

M_CP_INTOPT(fwd_opts.gateway_ports);

M_CP_INTOPT(fwd_opts.streamlocal_bind_unlink);

Line 2204

Line 2213

dump_cfg_fmtint(sUseDNS, o->use_dns);

dump_cfg_fmtint(sAllowTcpForwarding, o->allow_tcp_forwarding);

dump_cfg_fmtint(sAllowAgentForwarding, o->allow_agent_forwarding);

dump_cfg_fmtint(sDisableForwarding, o->disable_forwarding);

dump_cfg_fmtint(sAllowStreamLocalForwarding, o->allow_streamlocal_forwarding);

dump_cfg_fmtint(sStreamLocalBindUnlink, o->fwd_opts.streamlocal_bind_unlink);

dump_cfg_fmtint(sUsePrivilegeSeparation, use_privsep);