shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 18:50:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

misc: Set default port to 22 in ssh_path_expand_escape()

Browse Source 
Fixes, among others, ProxyCommand with %p when no port is used on
commandline or config file, thus using the default port.

Fixes T94

Signed-off-by: Alex Hermann <alex@hexla.nl>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 23f60a56f3)
This commit is contained in:
Alex Hermann
2018-08-22 16:15:22 +02:00
committed by Andreas Schneider
parent 8e4491a532
commit 6dc3f666c5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/misc.c
View File

@@ -778,7 +778,10 @@ char *ssh_path_expand_escape(ssh_session session, const char *s) {
if (session->opts.port < 65536) { if (session->opts.port < 65536) {
char tmp[6]; char tmp[6];
snprintf(tmp, sizeof(tmp), "%u", session->opts.port); snprintf(tmp,
sizeof(tmp),
"%u",
session->opts.port > 0 ? session->opts.port : 22);
x = strdup(tmp); x = strdup(tmp);
} }
break; break;