diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-02-17 00:14:05 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-02-21 09:20:27 +1100 |
| commit | 13a39414d25646f93e6d355521d832a03aaaffe2 (patch) | |
| tree | 9acca1b745ff26c155b79c7323359f2eddf82991 /auth2-pubkey.c | |
| parent | 773dda25e828c4c9a52f7bdce6e1e5924157beab (diff) | |
upstream commit
Regression: I broke logging of public key fingerprints in
1.46. Pointed out by Pontus Lundkvist
Diffstat (limited to 'auth2-pubkey.c')
| -rw-r--r-- | auth2-pubkey.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c index d8f0aa3e..d943efa1 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-pubkey.c,v 1.46 2015/01/28 22:36:00 djm Exp $ */ +/* $OpenBSD: auth2-pubkey.c,v 1.47 2015/02/17 00:14:05 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -234,14 +234,14 @@ pubkey_auth_info(Authctxt *authctxt, const Key *key, const char *fmt, ...) key_type(key), key->cert->key_id, (unsigned long long)key->cert->serial, key_type(key->cert->signature_key), - fp == NULL ? "(null)" : "", + fp == NULL ? "(null)" : fp, extra == NULL ? "" : ", ", extra == NULL ? "" : extra); free(fp); } else { fp = sshkey_fingerprint(key, options.fingerprint_hash, SSH_FP_DEFAULT); auth_info(authctxt, "%s %s%s%s", key_type(key), - fp == NULL ? "(null)" : "", + fp == NULL ? "(null)" : fp, extra == NULL ? "" : ", ", extra == NULL ? "" : extra); free(fp); } |