[openssh-commits] [openssh] 01/01: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 4626e39c7053c6486c1c8b708ec757e464623f5f
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date:   Wed Jun 14 00:31:38 2017 +0000

    upstream commit
    
    Add user at 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
---
 sshconnect2.c | 5 +++--
 1 file 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 */

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.