diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2023-02-27 14:11:44 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-27 14:11:44 -0800 |
commit | c0dc97be957d5625af6d6fe900f0201dba484097 (patch) | |
tree | b7c2896afa29e2b8024cf5b092059616048975b8 /src | |
parent | 44d3372e4097d01a279fa51bbc2e0c8672ef25f7 (diff) | |
parent | c28ebdf25649aeffdcb40bbb57ebc0ec42d07cc9 (diff) | |
download | libgit2-c0dc97be957d5625af6d6fe900f0201dba484097.tar.gz |
Merge pull request #6511 from libgit2/ethomson/hostandport
Revert #6503
Diffstat (limited to 'src')
-rw-r--r-- | src/libgit2/transports/ssh.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/libgit2/transports/ssh.c b/src/libgit2/transports/ssh.c index d7594aa12..5500ea100 100644 --- a/src/libgit2/transports/ssh.c +++ b/src/libgit2/transports/ssh.c @@ -651,8 +651,6 @@ static int check_against_known_hosts( return ret; } -#define SSH_DEFAULT_PORT 22 - /* * Perform the check for the session's certificate against known hosts if * possible and then ask the user if they have a callback. @@ -750,16 +748,9 @@ static int check_certificate( if (check_cb != NULL) { git_cert_hostkey *cert_ptr = &cert; git_error_state previous_error = {0}; - const char *host_ptr = host; - git_str host_and_port = GIT_STR_INIT; - - if (port != SSH_DEFAULT_PORT) { - git_str_printf(&host_and_port, "%s:%d", host, port); - host_ptr = host_and_port.ptr; - } git_error_state_capture(&previous_error, error); - error = check_cb((git_cert *) cert_ptr, cert_valid, host_ptr, check_cb_payload); + error = check_cb((git_cert *) cert_ptr, cert_valid, host, check_cb_payload); if (error == GIT_PASSTHROUGH) { error = git_error_state_restore(&previous_error); } else if (error < 0 && !git_error_last()) { @@ -767,12 +758,13 @@ static int check_certificate( } git_error_state_free(&previous_error); - git_str_dispose(&host_and_port); } return error; } +#define SSH_DEFAULT_PORT "22" + static int _git_ssh_setup_conn( ssh_subtransport *t, const char *url, |