1
1

gssapi: Add support for GSSAPIServerIdentity config option.

Этот коммит содержится в:
Andreas Schneider 2013-11-15 15:38:10 +01:00
родитель 41d99d32e8
Коммит 503c729bb0

Просмотреть файл

@ -46,7 +46,8 @@ enum ssh_config_opcode_e {
SOC_PROTOCOL, SOC_PROTOCOL,
SOC_STRICTHOSTKEYCHECK, SOC_STRICTHOSTKEYCHECK,
SOC_KNOWNHOSTS, SOC_KNOWNHOSTS,
SOC_PROXYCOMMAND SOC_PROXYCOMMAND,
SOC_GSSAPISERVERIDENTITY
}; };
struct ssh_config_keyword_table_s { struct ssh_config_keyword_table_s {
@ -67,6 +68,7 @@ static struct ssh_config_keyword_table_s ssh_config_keyword_table[] = {
{ "stricthostkeychecking", SOC_STRICTHOSTKEYCHECK }, { "stricthostkeychecking", SOC_STRICTHOSTKEYCHECK },
{ "userknownhostsfile", SOC_KNOWNHOSTS }, { "userknownhostsfile", SOC_KNOWNHOSTS },
{ "proxycommand", SOC_PROXYCOMMAND }, { "proxycommand", SOC_PROXYCOMMAND },
{ "gssapiserveridentity", SOC_GSSAPISERVERIDENTITY },
{ NULL, SOC_UNSUPPORTED } { NULL, SOC_UNSUPPORTED }
}; };
@ -323,6 +325,12 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
ssh_options_set(session, SSH_OPTIONS_PROXYCOMMAND, p); ssh_options_set(session, SSH_OPTIONS_PROXYCOMMAND, p);
} }
break; break;
case SOC_GSSAPISERVERIDENTITY:
p = ssh_config_get_str_tok(&s, NULL);
if (p && *parsing) {
ssh_options_set(session, SSH_OPTIONS_GSSAPI_SERVER_IDENTITY, p);
}
break;
case SOC_UNSUPPORTED: case SOC_UNSUPPORTED:
SSH_LOG(SSH_LOG_RARE, "Unsupported option: %s, line: %d\n", SSH_LOG(SSH_LOG_RARE, "Unsupported option: %s, line: %d\n",
keyword, count); keyword, count);