options: Make sure that we have always have default options set.

1 files changed, 3 insertions, 4 deletions

diff --git a/libssh/keyfiles.c b/libssh/keyfiles.c
index 8092b3a..978f83e 100644
--- a/libssh/keyfiles.c
+++ b/libssh/keyfiles.c
@@ -1113,7 +1113,7 @@ int ssh_try_publickey_from_file(ssh_session session, const char *keyfile,
   }
 
   if (session->sshdir == NULL) {
-    if (ssh_options_set(session, SSH_OPTIONS_SSH_DIR, NULL) < 0) {
+    if (ssh_options_apply(session) < 0) {
       return -1;
     }
   }
@@ -1181,7 +1181,7 @@ ssh_string try_publickey_from_file(ssh_session session, struct ssh_keys_struct k
   }
 
   if (session->sshdir == NULL) {
-    if (ssh_options_set(session, SSH_OPTIONS_SSH_DIR, NULL) < 0) {
+    if (ssh_options_apply(session) < 0) {
       return NULL;
     }
   }
@@ -1583,7 +1583,6 @@ static int match_hashed_host(ssh_session session, const char *host,
  *                                     created if host key is accepted.\n
  *          SSH_SERVER_ERROR:          Some error happened.
  *
- * @see ssh_options_set()
  * @see ssh_get_pubkey_hash()
  *
  * @bug There is no current way to remove or modify an entry into the known
@@ -1601,7 +1600,7 @@ int ssh_is_server_known(ssh_session session) {
   enter_function();
 
   if (session->knownhosts == NULL) {
-    if (ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, NULL) < 0) {
+    if (ssh_options_apply(session) < 0) {
       ssh_set_error(session, SSH_REQUEST_DENIED,
           "Can't find a known_hosts file");
       leave_function();