===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshd.c,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- src/usr.bin/ssh/sshd.c	2008/06/10 08:17:40	1.359
+++ src/usr.bin/ssh/sshd.c	2008/06/12 20:38:28	1.360
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.359 2008/06/10 08:17:40 jmc Exp $ */
+/* $OpenBSD: sshd.c,v 1.360 2008/06/12 20:38:28 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1764,6 +1764,9 @@
 		if (!compat20)
 			destroy_sensitive_data();
 	}
+
+	packet_set_timeout(options.client_alive_interval,
+	    options.client_alive_count_max);
 
 	/* Start session. */
 	do_authenticated(authctxt);