aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Hermann <alex@hexla.nl>2018-08-22 16:15:22 +0200
committerAndreas Schneider <asn@cryptomilk.org>2018-08-28 15:44:37 +0200
commit23f60a56f368f7c743013655699b475fbe29ff67 (patch)
treeaa36b5e8dabc84462df679c0297132a12b03380f /src
parent648f5cf400daf522ce486ad6670f866c2344b7e9 (diff)
downloadlibssh-23f60a56f368f7c743013655699b475fbe29ff67.tar.gz
libssh-23f60a56f368f7c743013655699b475fbe29ff67.tar.xz
libssh-23f60a56f368f7c743013655699b475fbe29ff67.zip
misc: Set default port to 22 in ssh_path_expand_escape()
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>
Diffstat (limited to 'src')
-rw-r--r--src/misc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/misc.c b/src/misc.c
index 76d96217..5f606044 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -778,7 +778,10 @@ char *ssh_path_expand_escape(ssh_session session, const char *s) {
if (session->opts.port < 65536) {
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);
}
break;