X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/18e62334f9bccd4b9560fb8da154a42ef2ab21eb..f2a91858ac9fb6fcb23aa6625973a37af464888f:/package/dropbear/patches/160-tty_close.patch?ds=sidebyside

diff --git a/package/dropbear/patches/160-tty_close.patch b/package/dropbear/patches/160-tty_close.patch
index c85429ce8..8c06e0f91 100644
--- a/package/dropbear/patches/160-tty_close.patch
+++ b/package/dropbear/patches/160-tty_close.patch
@@ -1,28 +1,17 @@
-diff -ur db.old/common-channel.c db.dev/common-channel.c
---- db.old/common-channel.c	2007-02-22 17:17:15.000000000 +0100
-+++ db.dev/common-channel.c	2007-05-06 19:50:19.154943528 +0200
-@@ -309,15 +309,15 @@
- 			&& (ERRFD_IS_WRITE(channel) || channel->errfd == FD_CLOSED)) {
+Index: dropbear-0.50/common-channel.c
+===================================================================
+--- dropbear-0.50.orig/common-channel.c	2007-08-10 23:47:47.000000000 +0200
++++ dropbear-0.50/common-channel.c	2007-08-10 23:47:50.000000000 +0200
+@@ -311,10 +311,10 @@
  		send_msg_channel_eof(channel);
  	}
--
+ 
 -	/* And if we can't receive any more data from them either, close up */
--	if (!channel->sent_close
--			&& channel->readfd == FD_CLOSED
--			&& (ERRFD_IS_WRITE(channel) || channel->errfd == FD_CLOSED)
--			&& !write_pending(channel)) {
--		TRACE(("sending close, readfd is closed"))
--		send_msg_channel_close(channel);
--	}
-+
 +	/* And if we can't receive any more data from them either, close up (server only) */
-+	if (!channel->sent_close
-+			&& channel->readfd == FD_CLOSED
+ 	if (!channel->sent_close
+ 			&& channel->readfd == FD_CLOSED
+-			&& (ERRFD_IS_WRITE(channel) || channel->errfd == FD_CLOSED)
 +			&& !ERRFD_IS_WRITE(channel)
-+			&& !write_pending(channel)) {
-+		TRACE(("sending close, readfd is closed"))
-+		send_msg_channel_close(channel);
-+	}
- }
- 
- /* Check whether a deferred (EINPROGRESS) connect() was successful, and
+ 			&& !write_pending(channel)) {
+ 		TRACE(("sending close, readfd is closed"))
+ 		send_msg_channel_close(channel);