Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it

extensively yet.

ProtocolKeepAlives is now just a compatibility alias for
ServerAliveInterval.

1 files changed, 2 insertions, 2 deletions

diff --git a/msg.h b/msg.h
index c07df88a7..0d3ea0658 100644
--- a/msg.h
+++ b/msg.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: msg.h,v 1.2 2002/12/19 00:07:02 djm Exp $     */
+/*      $OpenBSD: msg.h,v 1.3 2003/11/17 09:45:39 djm Exp $     */
 /*
  * Copyright (c) 2002 Markus Friedl.  All rights reserved.
  *
@@ -25,7 +25,7 @@
 #ifndef SSH_MSG_H
 #define SSH_MSG_H
 
-void     ssh_msg_send(int, u_char, Buffer *);
+int      ssh_msg_send(int, u_char, Buffer *);
 int      ssh_msg_recv(int, Buffer *);
 
 #endif