summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-04-16 15:53:43 +1000
committerDamien Miller <djm@mindrot.org>2010-04-16 15:53:43 +1000
commit88680654ad2378ebb4fa7aa326552aec760132ed (patch)
tree94496d2b9b311a0f4382b00366b94bb6de55a07d
parent22c97f1539816e2df00e91d023243b7d8d67a557 (diff)
- 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.
-rw-r--r--ChangeLog5
-rw-r--r--sshconnect2.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e5e81e9c..f1e24791 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 2a5943e7..25a3323f 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);