CVS commit: src/crypto/external/bsd/openssh/dist

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Sun Oct 20 03:35:33 UTC 2013

Modified Files:
        src/crypto/external/bsd/openssh/dist: sshconnect2.c

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


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/dist/sshconnect2.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/crypto/external/bsd/openssh/dist/sshconnect2.c
diff -u src/crypto/external/bsd/openssh/dist/sshconnect2.c:1.13 src/crypto/external/bsd/openssh/dist/sshconnect2.c:1.14
--- src/crypto/external/bsd/openssh/dist/sshconnect2.c:1.13	Mon Apr 29 13:59:50 2013
+++ src/crypto/external/bsd/openssh/dist/sshconnect2.c	Sat Oct 19 23:35:32 2013
@@ -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 @@ input_gssapi_errtok(int type, u_int32_t 
 	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 @@ input_gssapi_errtok(int type, u_int32_t 
 	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 @@ input_gssapi_errtok(int type, u_int32_t 
 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 @@ pubkey_prepare(Authctxt *authctxt)
 		/* 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);
 		}
 	}