[Unison-hackers] [unison-svn] r467 - trunk/src

[vouillon at seas.upenn.edu]

Author: vouillon
Date: 2010-10-11 09:29:27 -0400 (Mon, 11 Oct 2010)
New Revision: 467

Modified:
   trunk/src/RECENTNEWS
   trunk/src/mkProjectInfo.ml
   trunk/src/terminal.ml
Log:
* Fixed incompatibility with OpenSSH 5.6.


Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2010-10-11 13:29:09 UTC (rev 466)
+++ trunk/src/RECENTNEWS	2010-10-11 13:29:27 UTC (rev 467)
@@ -1,3 +1,8 @@
+CHANGES FROM VERSION 2.43.10
+
+* Fixed incompatibility with OpenSSH 5.6.
+
+-------------------------------
 CHANGES FROM VERSION 2.43.7
 
 * Fixed fingerprint cache: do not cache file properties

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2010-10-11 13:29:09 UTC (rev 466)
+++ trunk/src/mkProjectInfo.ml	2010-10-11 13:29:27 UTC (rev 467)
@@ -53,3 +53,4 @@
 
 
 
+

Modified: trunk/src/terminal.ml
===================================================================
--- trunk/src/terminal.ml	2010-10-11 13:29:09 UTC (rev 466)
+++ trunk/src/terminal.ml	2010-10-11 13:29:27 UTC (rev 467)
@@ -208,7 +208,12 @@
             exit 127
           end
       | childPid ->
-          Unix.close slaveFd;
+(*JV: FIX: we are leaking a file descriptor here.  On the other hand,
+  we do not deal gracefully with lost connections anyway. *)
+          (* Keep a file descriptor so that we do not get EIO errors
+             when the OpenSSH 5.6 child process closes the file
+             descriptor before opening /dev/tty. *)
+          (* Unix.close slaveFd; *)
           (Some (Lwt_unix.of_unix_file_descr masterFd), childPid)
       end