提交 5a128712 编写于 作者: D Daniel P. Berrangé

rpc: fix handling of SSH auth failure code

The result of libssh2_userauth_password is being assigned to 'ret' in
one branch and 'rc' in the other branch. Checks are all done against the
'ret' variable, so one branch never does the correct check.
Reviewed-by: NAndrea Bolognani <abologna@redhat.com>
Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 a017bae1
...@@ -706,9 +706,9 @@ virNetSSHAuthenticatePassword(virNetSSHSessionPtr sess, ...@@ -706,9 +706,9 @@ virNetSSHAuthenticatePassword(virNetSSHSessionPtr sess,
if (priv->password) { if (priv->password) {
/* tunelled password authentication */ /* tunelled password authentication */
if ((ret = libssh2_userauth_password(sess->session, if ((rc = libssh2_userauth_password(sess->session,
priv->username, priv->username,
priv->password)) == 0) { priv->password)) == 0) {
ret = 0; ret = 0;
goto cleanup; goto cleanup;
} }
...@@ -737,7 +737,7 @@ virNetSSHAuthenticatePassword(virNetSSHSessionPtr sess, ...@@ -737,7 +737,7 @@ virNetSSHAuthenticatePassword(virNetSSHSessionPtr sess,
goto cleanup; goto cleanup;
} }
if (ret != LIBSSH2_ERROR_AUTHENTICATION_FAILED) if (rc != LIBSSH2_ERROR_AUTHENTICATION_FAILED)
break; break;
VIR_FREE(password); VIR_FREE(password);
...@@ -750,10 +750,10 @@ virNetSSHAuthenticatePassword(virNetSSHSessionPtr sess, ...@@ -750,10 +750,10 @@ virNetSSHAuthenticatePassword(virNetSSHSessionPtr sess,
_("authentication failed: %s"), errmsg); _("authentication failed: %s"), errmsg);
/* determine exist status */ /* determine exist status */
if (ret == LIBSSH2_ERROR_AUTHENTICATION_FAILED) if (rc == LIBSSH2_ERROR_AUTHENTICATION_FAILED)
return 1; ret = 1;
else else
return -1; ret = -1;
cleanup: cleanup:
VIR_FREE(password); VIR_FREE(password);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册