[Unison-hackers] [unison-svn] r466 - branches/2.40/src

[vouillon at seas.upenn.edu]

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

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


Modified: branches/2.40/src/RECENTNEWS
===================================================================
--- branches/2.40/src/RECENTNEWS	2010-10-08 15:46:46 UTC (rev 465)
+++ branches/2.40/src/RECENTNEWS	2010-10-11 13:29:09 UTC (rev 466)
@@ -1,5 +1,10 @@
 CHANGES FROM VERSION 2.40.16
 
+* Fixed incompatibility with OpenSSH 5.6.
+
+-------------------------------
+CHANGES FROM VERSION 2.40.16
+
 * Fixed fingerprint cache: do not cache file properties
 * Fixed O_APPEND mode for open under Windows (the previous attempt in
   revision 422 was incomplete)

Modified: branches/2.40/src/mkProjectInfo.ml
===================================================================
--- branches/2.40/src/mkProjectInfo.ml	2010-10-08 15:46:46 UTC (rev 465)
+++ branches/2.40/src/mkProjectInfo.ml	2010-10-11 13:29:09 UTC (rev 466)
@@ -119,3 +119,4 @@
 
 
 
+

Modified: branches/2.40/src/terminal.ml
===================================================================
--- branches/2.40/src/terminal.ml	2010-10-08 15:46:46 UTC (rev 465)
+++ branches/2.40/src/terminal.ml	2010-10-11 13:29:09 UTC (rev 466)
@@ -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