From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Tue, 14 Apr 2015 04:17:03 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_6_9_P1~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb2289e2a47d465eaaaeff3dee2a6b7777b4c291;p=thirdparty%2Fopenssh-portable.git

upstream commit

Output remote username in debug output since with Host
 and Match it's not always obvious what it will be.  bz#2368, ok djm@
---

diff --git a/sshconnect.c b/sshconnect.c
index 0a52ada40..f5b697347 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.260 2015/03/24 01:11:12 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.261 2015/04/14 04:17:03 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1350,6 +1350,7 @@ ssh_login(Sensitive *sensitive, const char *orighost,
 
 	/* key exchange */
 	/* authenticate user */
+	debug("Authenticating to %s:%d as '%s'", host, port, server_user);
 	if (compat20) {
 		ssh_kex2(host, hostaddr, port);
 		ssh_userauth2(local_user, server_user, host, sensitive);