The unified diff between revisions [7ad1775e..] and [84eb6fed..] is displayed below. It can also be downloaded as a raw diff.

#
#
# patch "cli-auth.c"
#  from [3b308d18cc57b0b95f782bc7e4d8ea118a974343]
#    to [c169ce388d46b810784035452f5800bbe3c85167]
#
# patch "cli-chansession.c"
#  from [8250f8508ce081c3facf84f9a8b5cd5caab220e5]
#    to [0b9ff63b6909bdaae4e456ca3358ebbdfc8f39cb]
#
# patch "common-channel.c"
#  from [73156662683bd6d4401257f7315934f5ac053c89]
#    to [91552a5aff667d96a5cb0c929edcf1e1df294565]
#
# patch "svr-auth.c"
#  from [fab10976a9ca57a482a384cedd794de7f0247e40]
#    to [dbd28ab1fff172ca3f2e4cb756ec53b74b48b6b3]
#
============================================================
--- cli-auth.c	3b308d18cc57b0b95f782bc7e4d8ea118a974343
+++ cli-auth.c	c169ce388d46b810784035452f5800bbe3c85167
@@ -236,8 +236,8 @@ void cli_auth_try() {

 void cli_auth_try() {

+	int finished = 0;
 	TRACE(("enter cli_auth_try"))
-	int finished = 0;

 	CHECKCLEARTOWRITE();

============================================================
--- cli-chansession.c	8250f8508ce081c3facf84f9a8b5cd5caab220e5
+++ cli-chansession.c	0b9ff63b6909bdaae4e456ca3358ebbdfc8f39cb
@@ -162,14 +162,14 @@ static void put_termcodes() {

 static void put_termcodes() {

-	TRACE(("enter put_termcodes"))
-
 	struct termios tio;
 	unsigned int sshcode;
 	const struct TermCode *termcode;
 	unsigned int value;
 	unsigned int mapcode;

+	TRACE(("enter put_termcodes"))
+
 	unsigned int bufpos1, bufpos2;

 	if (tcgetattr(STDIN_FILENO, &tio) == -1) {
============================================================
--- common-channel.c	73156662683bd6d4401257f7315934f5ac053c89
+++ common-channel.c	91552a5aff667d96a5cb0c929edcf1e1df294565
@@ -236,7 +236,7 @@ static void checkclose(struct Channel *c
 	TRACE(("checkclose: writefd %d, readfd %d, errfd %d, sentclosed %d, recvclosed %d",
 				channel->writefd, channel->readfd,
 				channel->errfd, channel->sentclosed, channel->recvclosed))
-	TRACE(("writebuf %d extrabuf %s extrabuf %d",
+	TRACE(("writebuf size %d extrabuf ptr 0x%x extrabuf size %d",
 				cbuf_getused(channel->writebuf),
 				channel->writebuf,
 				channel->writebuf ? 0 : cbuf_getused(channel->extrabuf)))
============================================================
--- svr-auth.c	fab10976a9ca57a482a384cedd794de7f0247e40
+++ svr-auth.c	dbd28ab1fff172ca3f2e4cb756ec53b74b48b6b3
@@ -315,14 +315,15 @@ void send_msg_userauth_failure(int parti
 	buf_setpos(typebuf, 0);
 	buf_putstring(ses.writepayload, buf_getptr(typebuf, typebuf->len),
 			typebuf->len);
+
+	TRACE(("auth fail: methods %d, '%s'", ses.authstate.authtypes,
+				buf_getptr(typebuf, typebuf->len)));
+
 	buf_free(typebuf);

 	buf_putbyte(ses.writepayload, partial ? 1 : 0);
 	encrypt_packet();

-	TRACE(("auth fail: methods %d, '%s'", ses.authstate.authtypes,
-				buf_getptr(typebuf, typebuf->len)));
-
 	if (incrfail) {
 		usleep(300000); /* XXX improve this */
 		ses.authstate.failcount++;