- stevesk@cvs.openbsd.org 2002/06/22 23:09:51

     [monitor.c]
     save auth method before monitor_reset_key_state(); bugzilla bug #284;
     ok provos@

2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index e9685eb31..f3ca7c91f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,10 @@
      [sshd.c]
      don't call setsid() if debugging or run from inetd; no "Operation not
      permitted" errors now; ok millert@ markus@
+   - stevesk@cvs.openbsd.org 2002/06/22 23:09:51
+     [monitor.c]
+     save auth method before monitor_reset_key_state(); bugzilla bug #284;
+     ok provos@
 
 20020622
  - (djm) Update README.privsep; spotted by fries@
@@ -1037,4 +1041,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2252 2002/06/23 00:37:10 mouring Exp $
+$Id: ChangeLog,v 1.2253 2002/06/23 00:38:24 mouring Exp $
diff --git a/monitor.c b/monitor.c
index 39b6248d4..040d3b83e 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.16 2002/06/21 05:50:51 djm Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.17 2002/06/22 23:09:51 stevesk Exp $");
 
 #include <openssl/dh.h>
 
@@ -982,14 +982,14 @@ mm_answer_keyverify(int socket, Buffer *m)
         xfree(signature);
         xfree(data);
 
+        auth_method = key_blobtype == MM_USERKEY ? "publickey" : "hostbased";
+
         monitor_reset_key_state();
 
         buffer_clear(m);
         buffer_put_int(m, verified);
         mm_request_send(socket, MONITOR_ANS_KEYVERIFY, m);
 
-        auth_method = key_blobtype == MM_USERKEY ? "publickey" : "hostbased";
-
         return (verified);
 }