# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1518795226 -28800
# Node ID bd0bc6b5a87c766f217dec29b9aad63286613b53
# Parent  78d8c3ffdfe1b90daa08df45a55804fad8692521# Parent  1028b0111f89ed835e3e73277f31c0bf1bbd2f60
Merge branch 'master' of github.com:mkj/dropbear

diff -r 1028b0111f89 -r bd0bc6b5a87c netio.c
--- a/netio.c	Fri Feb 16 23:17:48 2018 +0800
+++ b/netio.c	Fri Feb 16 23:33:46 2018 +0800
@@ -488,7 +488,7 @@
 	 * caller can do a get_socket_address to discover assigned-port
 	 * hence, use same port for all address families
 	 */
-	u_int16_t *allocated_lport_p = 0;
+	u_int16_t *allocated_lport_p = NULL;
 	int allocated_lport = 0;
 
 	nsock = 0;
diff -r 1028b0111f89 -r bd0bc6b5a87c svr-tcpfwd.c
--- a/svr-tcpfwd.c	Fri Feb 16 23:17:48 2018 +0800
+++ b/svr-tcpfwd.c	Fri Feb 16 23:33:46 2018 +0800
@@ -95,7 +95,7 @@
 			buf_putint(ses.writepayload, allocated_listen_port);
 			encrypt_packet();
 			wantreply = 0; //so out does not do so
-	  }
+		}
 	} else if (strcmp("cancel-tcpip-forward", reqname) == 0) {
 		ret = svr_cancelremotetcp();
 	} else {