diff options
-rw-r--r-- | auth2-pubkey.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c index 5aa319ccc..b1b5b747b 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-pubkey.c,v 1.53 2015/06/15 18:44:22 jsing Exp $ */ | 1 | /* $OpenBSD: auth2-pubkey.c,v 1.54 2015/10/27 01:44:45 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -796,8 +796,9 @@ check_authkeys_file(FILE *f, char *file, Key* key, struct passwd *pw) | |||
796 | free(fp); | 796 | free(fp); |
797 | continue; | 797 | continue; |
798 | } | 798 | } |
799 | verbose("Accepted certificate ID \"%s\" " | 799 | verbose("Accepted certificate ID \"%s\" (serial %llu) " |
800 | "signed by %s CA %s via %s", key->cert->key_id, | 800 | "signed by %s CA %s via %s", key->cert->key_id, |
801 | (unsigned long long)key->cert->serial, | ||
801 | key_type(found), fp, file); | 802 | key_type(found), fp, file); |
802 | free(fp); | 803 | free(fp); |
803 | found_key = 1; | 804 | found_key = 1; |
@@ -875,8 +876,10 @@ user_cert_trusted_ca(struct passwd *pw, Key *key) | |||
875 | if (auth_cert_options(key, pw) != 0) | 876 | if (auth_cert_options(key, pw) != 0) |
876 | goto out; | 877 | goto out; |
877 | 878 | ||
878 | verbose("Accepted certificate ID \"%s\" signed by %s CA %s via %s", | 879 | verbose("Accepted certificate ID \"%s\" (serial %llu) signed by " |
879 | key->cert->key_id, key_type(key->cert->signature_key), ca_fp, | 880 | "%s CA %s via %s", key->cert->key_id, |
881 | (unsigned long long)key->cert->serial, | ||
882 | key_type(key->cert->signature_key), ca_fp, | ||
880 | options.trusted_user_ca_keys); | 883 | options.trusted_user_ca_keys); |
881 | ret = 1; | 884 | ret = 1; |
882 | 885 | ||