diff options
author | Damien Miller <djm@mindrot.org> | 2010-04-16 15:53:43 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-04-16 15:53:43 +1000 |
commit | 88680654ad2378ebb4fa7aa326552aec760132ed (patch) | |
tree | 94496d2b9b311a0f4382b00366b94bb6de55a07d | |
parent | 22c97f1539816e2df00e91d023243b7d8d67a557 (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-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshconnect2.c | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -24,6 +24,11 @@ | |||
24 | bz#1698: kill channel when pty allocation requests fail. Fixed | 24 | bz#1698: kill channel when pty allocation requests fail. Fixed |
25 | stuck client if the server refuses pty allocation. | 25 | stuck client if the server refuses pty allocation. |
26 | ok dtucker@ "think so" markus@ | 26 | ok dtucker@ "think so" markus@ |
27 | - djm@cvs.openbsd.org 2010/04/10 02:10:56 | ||
28 | [sshconnect2.c] | ||
29 | show the key type that we are offering in debug(), helps distinguish | ||
30 | between certs and plain keys as the path to the private key is usually | ||
31 | the same. | ||
27 | 32 | ||
28 | 20100410 | 33 | 20100410 |
29 | - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo | 34 | - (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 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.180 2010/02/26 20:29:54 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.181 2010/04/10 02:10:56 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -1398,7 +1398,8 @@ userauth_pubkey(Authctxt *authctxt) | |||
1398 | * private key instead | 1398 | * private key instead |
1399 | */ | 1399 | */ |
1400 | if (id->key && id->key->type != KEY_RSA1) { | 1400 | if (id->key && id->key->type != KEY_RSA1) { |
1401 | debug("Offering public key: %s", id->filename); | 1401 | debug("Offering %s public key: %s", key_type(id->key), |
1402 | id->filename); | ||
1402 | sent = send_pubkey_test(authctxt, id); | 1403 | sent = send_pubkey_test(authctxt, id); |
1403 | } else if (id->key == NULL) { | 1404 | } else if (id->key == NULL) { |
1404 | debug("Trying private key: %s", id->filename); | 1405 | debug("Trying private key: %s", id->filename); |