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, 7 insertions, 6 deletions

diff --git a/authfd.c b/authfd.c
index c78db6d94..42ca08256 100644
--- a/authfd.c
+++ b/authfd.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: authfd.c,v 1.61 2003/06/28 16:23:06 deraadt Exp $");
+RCSID("$OpenBSD: authfd.c,v 1.63 2003/11/21 11:57:03 djm Exp $");
 
 #include <openssl/evp.h>
 
@@ -114,7 +114,8 @@ ssh_get_authentication_socket(void)
 static int
 ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply)
 {
-        int l, len;
+        int l;
+        u_int len;
         char buf[1024];
 
         /* Get the length of the message, and format it in the buffer. */
@@ -147,7 +148,7 @@ ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply
         /* Extract the length, and check it for sanity. */
         len = GET_32BIT(buf);
         if (len > 256 * 1024)
-                fatal("Authentication response too long: %d", len);
+                fatal("Authentication response too long: %u", len);
 
         /* Read the rest of the response in to the buffer. */
         buffer_clear(reply);
@@ -292,7 +293,7 @@ ssh_get_num_identities(AuthenticationConnection *auth, int version)
 
         /* Get the number of entries in the response and check it for sanity. */
         auth->howmany = buffer_get_int(&auth->identities);
-        if (auth->howmany > 1024)
+        if ((u_int)auth->howmany > 1024)
                 fatal("Too many identities in authentication reply: %d",
                     auth->howmany);
 
@@ -589,7 +590,7 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
 }
 
 int
-ssh_update_card(AuthenticationConnection *auth, int add, 
+ssh_update_card(AuthenticationConnection *auth, int add,
     const char *reader_id, const char *pin, u_int life, u_int confirm)
 {
         Buffer msg;
@@ -606,7 +607,7 @@ ssh_update_card(AuthenticationConnection *auth, int add,
         buffer_put_char(&msg, type);
         buffer_put_cstring(&msg, reader_id);
         buffer_put_cstring(&msg, pin);
-        
+
         if (constrained) {
                 if (life != 0) {
                         buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_LIFETIME);