Import of OpenSSH 3.6.1p2

[gssapi-openssh.git] / openssh / monitor.c

diff --git a/openssh/monitor.c b/openssh/monitor.c
index bcd007e607bf9eb23ab53fe68221390d24a14f50..bce9e684c89669c5bd4f34028faa72a0b2b657a4 100644 (file)
--- a/openssh/monitor.c
+++ b/openssh/monitor.c
@@ -606,7 +606,7 @@ mm_answer_authpassword(int socket, Buffer *m)
        passwd = buffer_get_string(m, &plen);
        /* Only authenticate if the context is valid */
        authenticated = options.password_authentication &&
-           authctxt->valid && auth_password(authctxt, passwd);
+           auth_password(authctxt, passwd) && authctxt->valid;
        memset(passwd, 0, strlen(passwd));
        xfree(passwd);