summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2017-06-14 00:31:38 +0000
committerDamien Miller <djm@mindrot.org>2017-06-16 10:51:46 +1000
commit4626e39c7053c6486c1c8b708ec757e464623f5f (patch)
tree32b6e479971f35e4e9d380243684fa2052bd7f52
parentc948030d54911b2d3cddb96a7a8e9269e15d11cd (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.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index 9b0f845c..d2de5bc9 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.263 2017/05/31 07:00:13 markus Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.264 2017/06/14 00:31:38 dtucker Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -469,7 +469,8 @@ userauth(Authctxt *authctxt, char *authlist)
for (;;) {
Authmethod *method = authmethod_get(authlist);
if (method == NULL)
- fatal("Permission denied (%s).", authlist);
+ fatal("%s@%s: Permission denied (%s).",
+ authctxt->server_user, authctxt->host, authlist);
authctxt->method = method;
/* reset the per method handler */