diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2016-09-21 01:34:45 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-09-21 11:41:22 +1000 |
| commit | bfa9d969ab6235d4938ce069d4db7e5825c56a19 (patch) | |
| tree | 5ff7ef621e0e6660f4eae3a61b133d07f3bd4f5b /auth2-pubkey.c | |
| parent | 920585b826af1c639e4ed78b2eba01fd2337b127 (diff) | |
upstream commit
add a way for principals command to get see key ID and serial
too
Upstream-ID: 0d30978bdcf7e8eaeee4eea1b030eb2eb1823fcb
Diffstat (limited to 'auth2-pubkey.c')
| -rw-r--r-- | auth2-pubkey.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c index a08354c7..cc546661 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-pubkey.c,v 1.57 2016/09/14 20:11:26 djm Exp $ */ +/* $OpenBSD: auth2-pubkey.c,v 1.58 2016/09/21 01:34:45 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -639,6 +639,7 @@ match_principals_command(struct passwd *user_pw, const struct sshkey *key) pid_t pid; char *tmp, *username = NULL, *command = NULL, **av = NULL; char *ca_fp = NULL, *key_fp = NULL, *catext = NULL, *keytext = NULL; + char serial_s[16]; void (*osigchld)(int); if (options.authorized_principals_command == NULL) @@ -694,6 +695,7 @@ match_principals_command(struct passwd *user_pw, const struct sshkey *key) error("%s: sshkey_to_base64 failed: %s", __func__, ssh_err(r)); goto out; } + snprintf(serial_s, sizeof(serial_s), "%llu", cert->serial); for (i = 1; i < ac; i++) { tmp = percent_expand(av[i], "u", user_pw->pw_name, @@ -704,6 +706,8 @@ match_principals_command(struct passwd *user_pw, const struct sshkey *key) "F", ca_fp, "k", keytext, "K", catext, + "i", cert->key_id, + "s", serial_s, (char *)NULL); if (tmp == NULL) fatal("%s: percent_expand failed", __func__); |