2 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e5e81e9cc..f1e24791c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,11 @@
      bz#1698: kill channel when pty allocation requests fail. Fixed
      stuck client if the server refuses pty allocation.
      ok dtucker@ "think so" markus@
+   - djm@cvs.openbsd.org 2010/04/10 02:10:56
+     [sshconnect2.c]
+     show the key type that we are offering in debug(), helps distinguish
+     between certs and plain keys as the path to the private key is usually
+     the same.
 
 20100410
  - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo
diff --git a/sshconnect2.c b/sshconnect2.c
index 2a5943e7e..25a3323f0 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.180 2010/02/26 20:29:54 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.181 2010/04/10 02:10:56 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -1398,7 +1398,8 @@ userauth_pubkey(Authctxt *authctxt)
                  * private key instead
                  */
                 if (id->key && id->key->type != KEY_RSA1) {
-                        debug("Offering public key: %s", id->filename);
+                        debug("Offering %s public key: %s", key_type(id->key),
+                            id->filename);
                         sent = send_pubkey_test(authctxt, id);
                 } else if (id->key == NULL) {
                         debug("Trying private key: %s", id->filename);