1 files changed, 6 insertions, 3 deletions
diff --git a/src/options.c b/src/options.c
index bf4e680b..2b8abb48 100644
--- a/src/options.c
+++ b/src/options.c
@@ -891,11 +891,14 @@ int ssh_options_get_port(ssh_session session, unsigned int* port_target) {
     if (session == NULL) {
         return -1;
     }
-    if (!session->opts.port) {
-        ssh_set_error_invalid(session);
-        return -1;
+
+    if (session->opts.port == 0) {
+        *port_target = 22;
+        return 0;
     }
+
     *port_target = session->opts.port;
+
     return 0;
 }