commit b3ea50d73ee7196917544fdb443ed2c4064d0a24
author Michal Vasko <mvasko@cesnet.cz> Wed Feb 07 08:50:32 2024 +0100
committer Michal Vasko <mvasko@cesnet.cz> Wed Feb 07 08:50:32 2024 +0100
tree 4923df7e7acc746d6dcb1c9e4f33e1def9c877ee
parent 535467d4d8449c4308e79765daac9efcb242bfd0

session client UPDATE check hostname set return value

Refs #460

src/session_client_ssh.c

diff --git a/src/session_client_ssh.c b/src/session_client_ssh.c
index 606fb70..937092d 100644
--- a/src/session_client_ssh.c
+++ b/src/session_client_ssh.c
@@ -1517,7 +1517,13 @@
         /* remember host */
         host = strdup("localhost");
         NC_CHECK_ERRMEM_GOTO(!host, , fail);
-        ssh_options_set(session->ti.libssh.session, SSH_OPTIONS_HOST, host);
+
+        if (ssh_options_set(session->ti.libssh.session, SSH_OPTIONS_HOST, host) != SSH_OK) {
+            ERR(NULL, "Failed to use hostname \"%s\".", host);
+            free(host);
+            goto fail;
+        }
+        free(host);
 
         /* create and connect socket */
         sock = nc_sock_connect(host, port, -1, ka, NULL, &ip_host);
@@ -1527,8 +1533,6 @@
         }
         ssh_options_set(session->ti.libssh.session, SSH_OPTIONS_FD, &sock);
         ssh_set_blocking(session->ti.libssh.session, 0);
-
-        free(host);
         host = ip_host;
     }
 
@@ -1663,7 +1667,10 @@
     }
 
     /* set some basic SSH session options */
-    ssh_options_set(session->ti.libssh.session, SSH_OPTIONS_HOST, host);
+    if (ssh_options_set(session->ti.libssh.session, SSH_OPTIONS_HOST, host) != SSH_OK) {
+        ERR(session, "Failed to use hostname \"%s\".", host);
+        goto fail;
+    }
     ssh_options_set(session->ti.libssh.session, SSH_OPTIONS_PORT, &port_uint);
     ssh_options_set(session->ti.libssh.session, SSH_OPTIONS_USER, username);
     ssh_options_set(session->ti.libssh.session, SSH_OPTIONS_TIMEOUT, &timeout);
@@ -1810,10 +1817,15 @@
 
     ssh_options_set(sess, SSH_OPTIONS_FD, &sock);
     ssh_set_blocking(sess, 0);
-    ssh_options_set(sess, SSH_OPTIONS_HOST, host);
+    if (ssh_options_set(sess, SSH_OPTIONS_HOST, host) != SSH_OK) {
+        ERR(NULL, "Failed to use hostname \"%s\".", host);
+        ssh_free(sess);
+        return NULL;
+    }
     uint_port = port;
     ssh_options_set(sess, SSH_OPTIONS_PORT, &uint_port);
     ssh_options_set(sess, SSH_OPTIONS_TIMEOUT, &ssh_timeout);
+
     if (!ssh_ch_opts.username) {
         pw = nc_getpw(getuid(), NULL, &pw_buf, &buf, &buf_len);
         if (!pw) {
@@ -1826,6 +1838,7 @@
     } else {
         ssh_options_set(sess, SSH_OPTIONS_USER, ssh_ch_opts.username);
     }
+
     ssh_options_set(sess, SSH_OPTIONS_HOSTKEYS, "ssh-ed25519,ecdsa-sha2-nistp256,"
             "ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,ssh-rsa,rsa-sha2-512,rsa-sha2-256,ssh-dss");
 #ifdef HAVE_LIBSSH_OPTIONS_PUBLICKEY_ACCEPTED_TYPES