diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2017-06-14 00:31:38 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-06-16 10:51:46 +1000 |
commit | 4626e39c7053c6486c1c8b708ec757e464623f5f (patch) | |
tree | 32b6e479971f35e4e9d380243684fa2052bd7f52 | |
parent | c948030d54911b2d3cddb96a7a8e9269e15d11cd (diff) |
upstream commit
Add user@host prefix to client's "Permisison denied"
messages, useful in particular when using "stacked" connections where it's
not clear which host is denying. bz#2720, ok djm@ markus@
Upstream-ID: de88e1e9dcb050c98e85377482d1287a9fe0d2be
-rw-r--r-- | sshconnect2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 9b0f845ce..d2de5bc96 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.263 2017/05/31 07:00:13 markus Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.264 2017/06/14 00:31:38 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -469,7 +469,8 @@ userauth(Authctxt *authctxt, char *authlist) | |||
469 | for (;;) { | 469 | for (;;) { |
470 | Authmethod *method = authmethod_get(authlist); | 470 | Authmethod *method = authmethod_get(authlist); |
471 | if (method == NULL) | 471 | if (method == NULL) |
472 | fatal("Permission denied (%s).", authlist); | 472 | fatal("%s@%s: Permission denied (%s).", |
473 | authctxt->server_user, authctxt->host, authlist); | ||
473 | authctxt->method = method; | 474 | authctxt->method = method; |
474 | 475 | ||
475 | /* reset the per method handler */ | 476 | /* reset the per method handler */ |