Re-import of OpenSSH 3.7.1p2 (Chase\!)

[gssapi-openssh.git] / openssh / authfd.c

diff --git a/openssh/authfd.c b/openssh/authfd.c
index 42ca08256d24bb75773b6b68dd18d409ccbf626b..c78db6d9444397ca50b2002ac56990efa1413c4f 100644 (file)
--- a/openssh/authfd.c
+++ b/openssh/authfd.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: authfd.c,v 1.63 2003/11/21 11:57:03 djm Exp $");
+RCSID("$OpenBSD: authfd.c,v 1.61 2003/06/28 16:23:06 deraadt Exp $");
 
 #include <openssl/evp.h>
 
@@ -114,8 +114,7 @@ ssh_get_authentication_socket(void)
 static int
 ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply)
 {
-       int l;
-       u_int len;
+       int l, len;
        char buf[1024];
 
        /* Get the length of the message, and format it in the buffer. */
@@ -148,7 +147,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: %u", len);
+               fatal("Authentication response too long: %d", len);
 
        /* Read the rest of the response in to the buffer. */
        buffer_clear(reply);
@@ -293,7 +292,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 ((u_int)auth->howmany > 1024)
+       if (auth->howmany > 1024)
                fatal("Too many identities in authentication reply: %d",
                    auth->howmany);
 
@@ -590,7 +589,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;
@@ -607,7 +606,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);