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

Return to servconf.c CVS log

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

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

version 1.295, 2016/08/25 23:57:54

Line 385

sAuthenticationMethods, sHostKeyAgent, sPermitUserRC,

sStreamLocalBindMask, sStreamLocalBindUnlink,

sAllowStreamLocalForwarding, sFingerprintHash,

sDeprecated, sUnsupported

sDeprecated, sIgnore, sUnsupported

} ServerOpCodes;

#define SSHCFG_GLOBAL 0x01 /* allowed in main section of sshd_config */

Line 472

{ "denygroups", sDenyGroups, SSHCFG_ALL },

{ "ciphers", sCiphers, SSHCFG_GLOBAL },

{ "macs", sMacs, SSHCFG_GLOBAL },

{ "protocol", sDeprecated, SSHCFG_GLOBAL },

{ "protocol", sIgnore, SSHCFG_GLOBAL },

{ "gatewayports", sGatewayPorts, SSHCFG_ALL },

{ "subsystem", sSubsystem, SSHCFG_GLOBAL },

{ "maxstartups", sMaxStartups, SSHCFG_GLOBAL },

Line 673

* options set are copied into the main server config.

* Potential additions/improvements:

* - Add Match support for pre-kex directives, eg Protocol, Ciphers.

* - Add Match support for pre-kex directives, eg. Ciphers.

* - Add a Tag directive (idea from David Leonard) ala pf, eg:

* Match Address 192.168.0.*

Line 1772

break;

case sDeprecated:

logit("%s line %d: Deprecated option %s",

case sIgnore:

filename, linenum, arg);

while (arg)

arg = strdelim(&cp);

break;

case sUnsupported:

logit("%s line %d: Unsupported option %s",

do_log2(opcode == sIgnore ?

filename, linenum, arg);

SYSLOG_LEVEL_DEBUG2 : SYSLOG_LEVEL_INFO,

"%s line %d: %s option %s", filename, linenum,

opcode == sUnsupported ? "Unsupported" : "Deprecated", arg);

while (arg)

arg = strdelim(&cp);

break;