From b4f6d8b80078eb7ce60149b9fc724b0d94f0e7d4 Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Wed, 28 Jan 2026 15:10:21 +0100
Subject: [PATCH] misc: Rewrite custom getting of port to use options API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Pavol Žáčik <pzacik@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
---
 src/misc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/misc.c b/src/misc.c
index 022e1825..f4e48f62 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1437,10 +1437,10 @@ char *ssh_path_expand_escape(ssh_session session, const char *s)
             break;
         case 'p': {
             char tmp[6];
+            unsigned int port;
 
-            snprintf(tmp, sizeof(tmp), "%hu",
-                     (uint16_t)(session->opts.port > 0 ? session->opts.port
-                                                       : 22));
+            ssh_options_get_port(session, &port);
+            snprintf(tmp, sizeof(tmp), "%u", port);
             x = strdup(tmp);
             break;
         }