summaryrefslogtreecommitdiff
path: root/auth2-pubkey.c
diff options
context:
space:
mode:
authornaddy@openbsd.org <naddy@openbsd.org>2020-02-06 22:30:54 +0000
committerDamien Miller <djm@mindrot.org>2020-02-07 09:52:59 +1100
commita47f6a6c0e06628eed0c2a08dc31a8923bcc37ba (patch)
tree4f65bc75647cf817ea926a6a585defd3af534d24 /auth2-pubkey.c
parent849a9b87144f8a5b1771de6c85e44bfeb86be9a9 (diff)
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 'auth2-pubkey.c')
-rw-r--r--auth2-pubkey.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 5b4a2cc02..815ea0f25 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-pubkey.c,v 1.98 2020/01/23 07:10:22 dtucker Exp $ */ 1/* $OpenBSD: auth2-pubkey.c,v 1.99 2020/02/06 22:30:54 naddy Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -231,7 +231,8 @@ userauth_pubkey(struct ssh *ssh)
231 SSH_SK_USER_PRESENCE_REQD) == 0) { 231 SSH_SK_USER_PRESENCE_REQD) == 0) {
232 error("public key %s signature for %s%s from " 232 error("public key %s signature for %s%s from "
233 "%.128s port %d rejected: user presence " 233 "%.128s port %d rejected: user presence "
234 "(key touch) requirement not met ", key_s, 234 "(authenticator touch) requirement "
235 "not met ", key_s,
235 authctxt->valid ? "" : "invalid user ", 236 authctxt->valid ? "" : "invalid user ",
236 authctxt->user, ssh_remote_ipaddr(ssh), 237 authctxt->user, ssh_remote_ipaddr(ssh),
237 ssh_remote_port(ssh)); 238 ssh_remote_port(ssh));