# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1458055240 -28800
# Node ID 770e14154da387c17d613fff9e29967e8bebbb10
# Parent  506f7681d0f848b19b72ad216ee39d30779f4e78# Parent  c8f52c19e949b344fc2aec165bf96340a8d8fe53
merge

diff -r 506f7681d0f8 -r 770e14154da3 cli-kex.c
--- a/cli-kex.c	Tue Mar 15 22:45:43 2016 +0800
+++ b/cli-kex.c	Tue Mar 15 23:20:40 2016 +0800
@@ -186,7 +186,7 @@
 
 	char* fp = NULL;
 	FILE *tty = NULL;
-	char response = 'z';
+	int response = 'z';
 
 	fp = sign_key_fingerprint(keyblob, keybloblen);
 	if (cli_opts.always_accept_key) {
diff -r 506f7681d0f8 -r 770e14154da3 cli-session.c
--- a/cli-session.c	Tue Mar 15 22:45:43 2016 +0800
+++ b/cli-session.c	Tue Mar 15 23:20:40 2016 +0800
@@ -361,9 +361,10 @@
 
 	/* Set std{in,out,err} back to non-blocking - busybox ash dies nastily if
 	 * we don't revert the flags */
-	fcntl(cli_ses.stdincopy, F_SETFL, cli_ses.stdinflags);
-	fcntl(cli_ses.stdoutcopy, F_SETFL, cli_ses.stdoutflags);
-	fcntl(cli_ses.stderrcopy, F_SETFL, cli_ses.stderrflags);
+	/* Ignore return value since there's nothing we can do */
+	(void)fcntl(cli_ses.stdincopy, F_SETFL, cli_ses.stdinflags);
+	(void)fcntl(cli_ses.stdoutcopy, F_SETFL, cli_ses.stdoutflags);
+	(void)fcntl(cli_ses.stderrcopy, F_SETFL, cli_ses.stderrflags);
 
 	cli_tty_cleanup();
 
diff -r 506f7681d0f8 -r 770e14154da3 svr-kex.c
--- a/svr-kex.c	Tue Mar 15 22:45:43 2016 +0800
+++ b/svr-kex.c	Tue Mar 15 23:20:40 2016 +0800
@@ -138,7 +138,7 @@
 			break;
 #endif
 		default:
-			(void)0;
+			dropbear_assert(0);
 	}
 
 	if (readhostkey(fn, svr_opts.hostkey, &type) == DROPBEAR_SUCCESS) {
diff -r 506f7681d0f8 -r 770e14154da3 svr-x11fwd.c
--- a/svr-x11fwd.c	Tue Mar 15 22:45:43 2016 +0800
+++ b/svr-x11fwd.c	Tue Mar 15 23:20:40 2016 +0800
@@ -119,7 +119,7 @@
 	/* cleanup */
 	m_free(chansess->x11authprot);
 	m_free(chansess->x11authcookie);
-	close(fd);
+	m_close(fd);
 
 	return DROPBEAR_FAILURE;
 }