# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1237329039 0
# Node ID 7c8cdc5d22690f97936ffbb55318f5c5f02867ab
# Parent  7de2f22ea759b5f16280cc0dabe2c6ce4d722917# Parent  1037aabf701bd5d681e10b192cb03a6ec4e8363a
merge of '0a8dfaa3e5365a2004db2b55895e11f65b5cefcc'
     and 'ef3b41f37e9f4dd45358bc40f9559ee23f71c284'

diff -r 1037aabf701b -r 7c8cdc5d2269 common-session.c
--- a/common-session.c	Tue Mar 03 13:42:54 2009 +0000
+++ b/common-session.c	Tue Mar 17 22:30:39 2009 +0000
@@ -71,6 +71,9 @@
 	}
 	setnonblocking(ses.signal_pipe[0]);
 	setnonblocking(ses.signal_pipe[1]);
+
+	ses.maxfd = MAX(ses.maxfd, ses.signal_pipe[0]);
+	ses.maxfd = MAX(ses.maxfd, ses.signal_pipe[1]);
 	
 	kexfirstinitialise(); /* initialise the kex state */