diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2021-07-23 05:24:02 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-07-23 15:25:19 +1000 |
| commit | 9e1882ef6489a7dd16b6d7794af96629cae61a53 (patch) | |
| tree | 1cfa310d005f6df1db8c188fb1e0ac5de56b875b | |
| parent | a917e973a1b90b40ff1e950df083364b48fc6c78 (diff) | |
| download | openssh-git-9e1882ef6489a7dd16b6d7794af96629cae61a53.tar.gz | |
upstream: note successful authentication method in final "Authenticated
to ..." message and partial auth success messages (all at LogLevel=verbose)
ok dtucker@
OpenBSD-Commit-ID: 06834b89ceb89f8f16c5321d368a66c08f441984
| -rw-r--r-- | ssh.c | 9 | ||||
| -rw-r--r-- | sshconnect2.c | 14 |
2 files changed, 12 insertions, 11 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.564 2021/07/23 04:04:52 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.565 2021/07/23 05:24:02 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1651,13 +1651,6 @@ main(int ac, char **av) ssh_login(ssh, &sensitive_data, host, (struct sockaddr *)&hostaddr, options.port, pw, timeout_ms, cinfo); - if (ssh_packet_connection_is_on_socket(ssh)) { - verbose("Authenticated to %s ([%s]:%d).", host, - ssh_remote_ipaddr(ssh), ssh_remote_port(ssh)); - } else { - verbose("Authenticated to %s (via proxy).", host); - } - /* We no longer need the private host keys. Clear them now. */ if (sensitive_data.nkeys != 0) { for (i = 0; i < sensitive_data.nkeys; i++) { diff --git a/sshconnect2.c b/sshconnect2.c index 8bec0b61..fea50fab 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.350 2021/07/02 05:11:21 dtucker Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.351 2021/07/23 05:24:02 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -487,7 +487,14 @@ ssh_userauth2(struct ssh *ssh, const char *local_user, if (!authctxt.success) fatal("Authentication failed."); - debug("Authentication succeeded (%s).", authctxt.method->name); + if (ssh_packet_connection_is_on_socket(ssh)) { + verbose("Authenticated to %s ([%s]:%d) using \"%s\".", host, + ssh_remote_ipaddr(ssh), ssh_remote_port(ssh), + authctxt.method->name); + } else { + verbose("Authenticated to %s (via proxy) using \"%s\".", host, + authctxt.method->name); + } } /* ARGSUSED */ @@ -645,7 +652,8 @@ input_userauth_failure(int type, u_int32_t seq, struct ssh *ssh) goto out; if (partial != 0) { - verbose("Authenticated with partial success."); + verbose("Authenticated using \"%s\" with partial success.", + authctxt->method->name); /* reset state */ pubkey_reset(authctxt); } |