X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fdropbear%2Fpatches%2F160-tty_close.patch;h=8c06e0f912ced80494c92dae53e1888a3285e6cb;hb=4060d376f8dca6963e662dc003514630c29637fb;hp=01b6251b86d1ecd76bcdbe942ebb4d21a628b927;hpb=1bac6cc5d5ab159e292dd61cb57608d1126ad170;p=openwrt-10.03%2F.git

diff --git a/package/dropbear/patches/160-tty_close.patch b/package/dropbear/patches/160-tty_close.patch
index 01b6251b8..8c06e0f91 100644
--- a/package/dropbear/patches/160-tty_close.patch
+++ b/package/dropbear/patches/160-tty_close.patch
@@ -1,19 +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,6 @@
- 			&& (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
++	/* And if we can't receive any more data from them either, close up (server only) */
+ 	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);
--	}
- }
- 
- /* Check whether a deferred (EINPROGRESS) connect() was successful, and
++			&& !ERRFD_IS_WRITE(channel)
+ 			&& !write_pending(channel)) {
+ 		TRACE(("sending close, readfd is closed"))
+ 		send_msg_channel_close(channel);