X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fdropbear%2Fpatches%2F160-tty_close.patch;fp=package%2Fdropbear%2Fpatches%2F160-tty_close.patch;h=0fd9ef684d60bf5ba67f3096cf7189b150038e6d;hp=c85429ce892d6e3ba8733bd83c4e6c0487ddfb8b;hb=62f0f6a54893e4115682ada6937577c264aa0929;hpb=0e25bf25f9d8c66aeddc957d1a132ed4b3f95d9a

diff --git a/package/dropbear/patches/160-tty_close.patch b/package/dropbear/patches/160-tty_close.patch
index c85429ce89..0fd9ef684d 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.49/common-channel.c
+===================================================================
+--- dropbear-0.49.orig/common-channel.c	2007-06-04 13:21:39.354993800 +0200
++++ dropbear-0.49/common-channel.c	2007-06-04 13:21:40.676792856 +0200
+@@ -310,10 +310,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);