options: Rename HOSTKEYCHECK to STRICTHOSTKEYCHECK.
Looks like people are confused by the name and think this is normal host key checking.
Этот коммит содержится в:
родитель
e36c9c529b
Коммит
a2fe4b2b2c
@ -288,7 +288,7 @@ enum ssh_options_e {
|
|||||||
SSH_OPTIONS_CIPHERS_S_C,
|
SSH_OPTIONS_CIPHERS_S_C,
|
||||||
SSH_OPTIONS_COMPRESSION_C_S,
|
SSH_OPTIONS_COMPRESSION_C_S,
|
||||||
SSH_OPTIONS_COMPRESSION_S_C,
|
SSH_OPTIONS_COMPRESSION_S_C,
|
||||||
SSH_OPTIONS_HOSTKEYCHECK,
|
SSH_OPTIONS_STRICTHOSTKEYCHECK,
|
||||||
SSH_OPTIONS_PROXYCOMMAND,
|
SSH_OPTIONS_PROXYCOMMAND,
|
||||||
SSH_OPTIONS_BINDADDR
|
SSH_OPTIONS_BINDADDR
|
||||||
};
|
};
|
||||||
|
@ -40,7 +40,7 @@ enum ssh_config_opcode_e {
|
|||||||
SOC_COMPRESSION,
|
SOC_COMPRESSION,
|
||||||
SOC_TIMEOUT,
|
SOC_TIMEOUT,
|
||||||
SOC_PROTOCOL,
|
SOC_PROTOCOL,
|
||||||
SOC_HOSTKEYCHECK,
|
SOC_STRICTHOSTKEYCHECK,
|
||||||
SOC_KNOWNHOSTS,
|
SOC_KNOWNHOSTS,
|
||||||
SOC_PROXYCOMMAND
|
SOC_PROXYCOMMAND
|
||||||
};
|
};
|
||||||
@ -60,7 +60,7 @@ static struct ssh_config_keyword_table_s ssh_config_keyword_table[] = {
|
|||||||
{ "compression", SOC_COMPRESSION },
|
{ "compression", SOC_COMPRESSION },
|
||||||
{ "connecttimeout", SOC_TIMEOUT },
|
{ "connecttimeout", SOC_TIMEOUT },
|
||||||
{ "protocol", SOC_PROTOCOL },
|
{ "protocol", SOC_PROTOCOL },
|
||||||
{ "stricthostkeychecking", SOC_HOSTKEYCHECK },
|
{ "stricthostkeychecking", SOC_STRICTHOSTKEYCHECK },
|
||||||
{ "userknownhostsfile", SOC_KNOWNHOSTS },
|
{ "userknownhostsfile", SOC_KNOWNHOSTS },
|
||||||
{ "proxycommand", SOC_PROXYCOMMAND },
|
{ "proxycommand", SOC_PROXYCOMMAND },
|
||||||
{ NULL, SOC_UNSUPPORTED }
|
{ NULL, SOC_UNSUPPORTED }
|
||||||
@ -284,10 +284,10 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
|
|||||||
ssh_options_set(session, SSH_OPTIONS_TIMEOUT, &i);
|
ssh_options_set(session, SSH_OPTIONS_TIMEOUT, &i);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case SOC_HOSTKEYCHECK:
|
case SOC_STRICTHOSTKEYCHECK:
|
||||||
i = ssh_config_get_yesno(&s, -1);
|
i = ssh_config_get_yesno(&s, -1);
|
||||||
if (i >= 0 && *parsing) {
|
if (i >= 0 && *parsing) {
|
||||||
ssh_options_set(session, SSH_OPTIONS_HOSTKEYCHECK, &i);
|
ssh_options_set(session, SSH_OPTIONS_STRICTHOSTKEYCHECK, &i);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case SOC_KNOWNHOSTS:
|
case SOC_KNOWNHOSTS:
|
||||||
|
@ -318,7 +318,7 @@ int ssh_options_set_algo(ssh_session session, int algo,
|
|||||||
* Set the compression to use for server to client
|
* Set the compression to use for server to client
|
||||||
* communication (string, "none" or "zlib").
|
* communication (string, "none" or "zlib").
|
||||||
*
|
*
|
||||||
* - SSH_OPTIONS_HOSTKEYCHECK:
|
* - SSH_OPTIONS_STRICTHOSTKEYCHECK:
|
||||||
* Set the parameter StrictHostKeyChecking to avoid
|
* Set the parameter StrictHostKeyChecking to avoid
|
||||||
* asking about a fingerprint (integer, 0 = false).
|
* asking about a fingerprint (integer, 0 = false).
|
||||||
*
|
*
|
||||||
@ -588,7 +588,7 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case SSH_OPTIONS_HOSTKEYCHECK:
|
case SSH_OPTIONS_STRICTHOSTKEYCHECK:
|
||||||
if (value == NULL) {
|
if (value == NULL) {
|
||||||
ssh_set_error_invalid(session, __FUNCTION__);
|
ssh_set_error_invalid(session, __FUNCTION__);
|
||||||
return -1;
|
return -1;
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user