1 files changed, 4 insertions, 5 deletions

diff --git a/monitor.c b/monitor.c
index 132f60df9..6acb20259 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.124 2013/05/17 00:13:13 djm Exp $ */
+/* $OpenBSD: monitor.c,v 1.125 2013/05/19 02:42:42 djm Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -422,8 +422,7 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor)
                 }
                 if (ent->flags & (MON_AUTHDECIDE|MON_ALOG)) {
                         auth_log(authctxt, authenticated, partial,
-                            auth_method, auth_submethod,
-                            compat20 ? " ssh2" : "");
+                            auth_method, auth_submethod);
                         if (!authenticated)
                                 authctxt->failures++;
                 }
@@ -1168,6 +1167,7 @@ mm_answer_keyallowed(int sock, Buffer *m)
                 case MM_USERKEY:
                         allowed = options.pubkey_authentication &&
                             user_key_allowed(authctxt->pw, key);
+                        pubkey_auth_info(authctxt, key);
                         auth_method = "publickey";
                         if (options.pubkey_authentication && allowed != 1)
                                 auth_clear_options();
@@ -1207,8 +1207,7 @@ mm_answer_keyallowed(int sock, Buffer *m)
                 hostbased_chost = chost;
         } else {
                 /* Log failed attempt */
-                auth_log(authctxt, 0, 0, auth_method, NULL,
-                    compat20 ? " ssh2" : "");
+                auth_log(authctxt, 0, 0, auth_method, NULL);
                 free(blob);
                 free(cuser);
                 free(chost);