Merge 3.9p1 to the trunk.

1 files changed, 3 insertions, 1 deletions

diff --git a/clientloop.h b/clientloop.h
index 56af06bc1..9992d5938 100644
--- a/clientloop.h
+++ b/clientloop.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: clientloop.h,v 1.8 2003/12/16 15:49:51 markus Exp $   */
+/*      $OpenBSD: clientloop.h,v 1.11 2004/07/11 17:48:47 deraadt Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -38,3 +38,5 @@
 /* Client side main loop for the interactive session. */
 int      client_loop(int, int, int);
 void     client_global_request_reply_fwd(int, u_int32_t, void *);
+void     client_session2_setup(int, int, int, const char *, struct termios *,
+            int, Buffer *, char **, dispatch_fn *);