summaryrefslogtreecommitdiffstats
path: root/monitor.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-11-17 11:13:40 +0100
committerDamien Miller <djm@mindrot.org>2003-11-17 11:13:40 +0100
commit3e3b5145e59c78cbde0f31f59a9267867b8eea2f (patch)
tree6725a1cc2cd54237952d89e4811e1cb82cc46a5d /monitor.c
parent - jakob@cvs.openbsd.org 2003/11/03 09:37:32 (diff)
downloadopenssh-3e3b5145e59c78cbde0f31f59a9267867b8eea2f.tar.xz
openssh-3e3b5145e59c78cbde0f31f59a9267867b8eea2f.zip
- djm@cvs.openbsd.org 2003/11/04 08:54:09
[auth1.c auth2.c auth2-pubkey.c auth.h auth-krb5.c auth-passwd.c] [auth-rhosts.c auth-rh-rsa.c auth-rsa.c monitor.c serverloop.c] [session.c] standardise arguments to auth methods - they should all take authctxt. check authctxt->valid rather then pw != NULL; ok markus@
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/monitor.c b/monitor.c
index eaf66f7c8..e83fb45a7 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.50 2003/09/23 20:17:11 markus Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.51 2003/11/04 08:54:09 djm Exp $");
#include <openssl/dh.h>
@@ -946,7 +946,7 @@ mm_answer_keyallowed(int socket, Buffer *m)
debug3("%s: key_from_blob: %p", __func__, key);
- if (key != NULL && authctxt->pw != NULL) {
+ if (key != NULL && authctxt->valid) {
switch(type) {
case MM_USERKEY:
allowed = options.pubkey_authentication &&