[src/trunk]: src/crypto/external/bsd/openssh/dist - provide the right size to...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/73c6cc361c2b
branches:  trunk
changeset: 790754:73c6cc361c2b
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Oct 20 03:35:32 2013 +0000

description:
- provide the right size to the zeroing memory function
- remove unused variables

diffstat:

 crypto/external/bsd/openssh/dist/sshconnect2.c |  15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diffs (60 lines):

diff -r a87c3de768a8 -r 73c6cc361c2b crypto/external/bsd/openssh/dist/sshconnect2.c
--- a/crypto/external/bsd/openssh/dist/sshconnect2.c    Sun Oct 20 03:34:58 2013 +0000
+++ b/crypto/external/bsd/openssh/dist/sshconnect2.c    Sun Oct 20 03:35:32 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sshconnect2.c,v 1.13 2013/04/29 17:59:50 mlelstv Exp $ */
+/*     $NetBSD: sshconnect2.c,v 1.14 2013/10/20 03:35:32 christos Exp $        */
 /* $OpenBSD: sshconnect2.c,v 1.192 2013/02/17 23:16:57 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: sshconnect2.c,v 1.13 2013/04/29 17:59:50 mlelstv Exp $");
+__RCSID("$NetBSD: sshconnect2.c,v 1.14 2013/10/20 03:35:32 christos Exp $");
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
@@ -845,7 +845,7 @@
        Gssctxt *gssctxt;
        gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
        gss_buffer_desc recv_tok;
-       OM_uint32 status, ms;
+       OM_uint32 ms;
        u_int len;
 
        if (authctxt == NULL)
@@ -858,7 +858,7 @@
        packet_check_eom();
 
        /* Stick it into GSSAPI and see what it says */
-       status = ssh_gssapi_init_ctx(gssctxt, options.gss_deleg_creds,
+       (void)ssh_gssapi_init_ctx(gssctxt, options.gss_deleg_creds,
            &recv_tok, &send_tok, NULL);
 
        xfree(recv_tok.value);
@@ -871,12 +871,11 @@
 void
 input_gssapi_error(int type, u_int32_t plen, void *ctxt)
 {
-       OM_uint32 maj, min;
        char *msg;
        char *lang;
 
-       maj=packet_get_int();
-       min=packet_get_int();
+       (void)packet_get_int(); /* max */
+       (void)packet_get_int(); /* min */
        msg=packet_get_string(NULL);
        lang=packet_get_string(NULL);
 
@@ -1445,7 +1444,7 @@
                /* If IdentitiesOnly set and key not found then don't use it */
                if (!found && options.identities_only) {
                        TAILQ_REMOVE(&files, id, next);
-                       bzero(id, sizeof(id));
+                       memset(id, 0, sizeof(*id));
                        free(id);
                }
        }