diff options
author | naddy@openbsd.org <naddy@openbsd.org> | 2020-02-06 22:30:54 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-02-07 09:52:59 +1100 |
commit | a47f6a6c0e06628eed0c2a08dc31a8923bcc37ba (patch) | |
tree | 4f65bc75647cf817ea926a6a585defd3af534d24 /monitor.c | |
parent | 849a9b87144f8a5b1771de6c85e44bfeb86be9a9 (diff) | |
download | openssh-git-a47f6a6c0e06628eed0c2a08dc31a8923bcc37ba.tar.gz |
upstream: Replace "security key" with "authenticator" in program
messages.
This replaces "security key" in error/usage/verbose messages and
distinguishes between "authenticator" and "authenticator-hosted key".
ok djm@
OpenBSD-Commit-ID: 7c63800e9c340c59440a054cde9790a78f18592e
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.207 2020/01/23 07:10:22 dtucker Exp $ */ +/* $OpenBSD: monitor.c,v 1.208 2020/02/06 22:30:54 naddy Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -1445,8 +1445,9 @@ mm_answer_keyverify(struct ssh *ssh, int sock, struct sshbuf *m) if (req_presence && (sig_details->sk_flags & SSH_SK_USER_PRESENCE_REQD) == 0) { error("public key %s %s signature for %s%s from %.128s " - "port %d rejected: user presence (key touch) " - "requirement not met ", sshkey_type(key), fp, + "port %d rejected: user presence " + "(authenticator touch) requirement not met ", + sshkey_type(key), fp, authctxt->valid ? "" : "invalid user ", authctxt->user, ssh_remote_ipaddr(ssh), ssh_remote_port(ssh)); |