diff options
| author | Andreas Schneider <asn@cynapses.org> | 2010-09-28 14:13:18 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cynapses.org> | 2010-09-28 14:13:18 +0200 |
| commit | a2fe4b2b2ce72ee824e915f130ec98b661b1966f (patch) | |
| tree | 25afb74b8d017309d808d7eb1bdd9679f33b6ed6 | |
| parent | e36c9c529b70893c288d31289b6057292cf7f5ca (diff) | |
| download | libssh-a2fe4b2b2ce72ee824e915f130ec98b661b1966f.tar.gz libssh-a2fe4b2b2ce72ee824e915f130ec98b661b1966f.tar.xz libssh-a2fe4b2b2ce72ee824e915f130ec98b661b1966f.zip | |
options: Rename HOSTKEYCHECK to STRICTHOSTKEYCHECK.
Looks like people are confused by the name and think this is normal host
key checking.
| -rw-r--r-- | include/libssh/libssh.h | 2 | ||||
| -rw-r--r-- | src/config.c | 8 | ||||
| -rw-r--r-- | src/options.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h index ce2ea0b..22957c3 100644 --- a/include/libssh/libssh.h +++ b/include/libssh/libssh.h @@ -288,7 +288,7 @@ enum ssh_options_e { SSH_OPTIONS_CIPHERS_S_C, SSH_OPTIONS_COMPRESSION_C_S, SSH_OPTIONS_COMPRESSION_S_C, - SSH_OPTIONS_HOSTKEYCHECK, + SSH_OPTIONS_STRICTHOSTKEYCHECK, SSH_OPTIONS_PROXYCOMMAND, SSH_OPTIONS_BINDADDR }; diff --git a/src/config.c b/src/config.c index cfe2cc5..03e6e90 100644 --- a/src/config.c +++ b/src/config.c @@ -40,7 +40,7 @@ enum ssh_config_opcode_e { SOC_COMPRESSION, SOC_TIMEOUT, SOC_PROTOCOL, - SOC_HOSTKEYCHECK, + SOC_STRICTHOSTKEYCHECK, SOC_KNOWNHOSTS, SOC_PROXYCOMMAND }; @@ -60,7 +60,7 @@ static struct ssh_config_keyword_table_s ssh_config_keyword_table[] = { { "compression", SOC_COMPRESSION }, { "connecttimeout", SOC_TIMEOUT }, { "protocol", SOC_PROTOCOL }, - { "stricthostkeychecking", SOC_HOSTKEYCHECK }, + { "stricthostkeychecking", SOC_STRICTHOSTKEYCHECK }, { "userknownhostsfile", SOC_KNOWNHOSTS }, { "proxycommand", SOC_PROXYCOMMAND }, { 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); } break; - case SOC_HOSTKEYCHECK: + case SOC_STRICTHOSTKEYCHECK: i = ssh_config_get_yesno(&s, -1); if (i >= 0 && *parsing) { - ssh_options_set(session, SSH_OPTIONS_HOSTKEYCHECK, &i); + ssh_options_set(session, SSH_OPTIONS_STRICTHOSTKEYCHECK, &i); } break; case SOC_KNOWNHOSTS: diff --git a/src/options.c b/src/options.c index eae9280..85375c5 100644 --- a/src/options.c +++ b/src/options.c @@ -318,7 +318,7 @@ int ssh_options_set_algo(ssh_session session, int algo, * Set the compression to use for server to client * communication (string, "none" or "zlib"). * - * - SSH_OPTIONS_HOSTKEYCHECK: + * - SSH_OPTIONS_STRICTHOSTKEYCHECK: * Set the parameter StrictHostKeyChecking to avoid * 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; } break; - case SSH_OPTIONS_HOSTKEYCHECK: + case SSH_OPTIONS_STRICTHOSTKEYCHECK: if (value == NULL) { ssh_set_error_invalid(session, __FUNCTION__); return -1; |