commit ef57833d09bedfd812c250ea1b78c4e3e536ef60
author Michal Vasko <mvasko@cesnet.cz> Mon Jan 25 13:20:09 2016 +0100
committer Michal Vasko <mvasko@cesnet.cz> Mon Jan 25 13:20:09 2016 +0100
tree 7f52b3e59994f1ea5876e3d6fa0b186410d51ebd
parent c61c449b5a8ea94cea38e2cf2eeef7fd564eab23

client session CHANGE check server schemas retrieval

If it fails, try other means. Allow creating sessions
with some missing schemas.

src/session_client_ssh.c

diff --git a/src/session_client_ssh.c b/src/session_client_ssh.c
index 22f163e..cfa0f55 100644
--- a/src/session_client_ssh.c
+++ b/src/session_client_ssh.c
@@ -752,7 +752,7 @@
         case NC_SSH_AUTH_PASSWORD:
             userauthlist &= ~SSH_AUTH_METHOD_PASSWORD;
 
-            VRB("Password authentication (host %s, user %s).", session->host, session->username);
+            VRB("Password authentication (host \"%s\", user \"%s\").", session->host, session->username);
             s = sshauth_password(session->username, session->host);
             if ((ret_auth = ssh_userauth_password(ssh_sess, session->username, s)) != SSH_AUTH_SUCCESS) {
                 memset(s, 0, strlen(s));
@@ -798,7 +798,7 @@
             }
 
             for (j = 0; j < ssh_opts.key_count; j++) {
-                VRB("Trying to authenticate using %spair %s %s.",
+                VRB("Trying to authenticate using %spair \"%s\" \"%s\".",
                      ssh_opts.keys[j].privkey_crypt ? "password-protected " : "", ssh_opts.keys[j].privkey_path,
                      ssh_opts.keys[j].pubkey_path);
 
@@ -970,7 +970,7 @@
     }
     session->status = NC_STATUS_RUNNING;
 
-    if (nc_ctx_check_and_fill(session)) {
+    if (nc_ctx_check_and_fill(session) == -1) {
         goto fail;
     }
 
@@ -1087,7 +1087,7 @@
     }
     session->status = NC_STATUS_RUNNING;
 
-    if (nc_ctx_check_and_fill(session)) {
+    if (nc_ctx_check_and_fill(session) == -1) {
         goto fail;
     }
 
@@ -1164,7 +1164,7 @@
 
     pthread_mutex_unlock(new_session->ti_lock);
 
-    if (nc_ctx_check_and_fill(new_session)) {
+    if (nc_ctx_check_and_fill(new_session) == -1) {
         goto fail;
     }