summaryrefslogtreecommitdiff
path: root/sshconnect2.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshconnect2.c')
-rw-r--r--sshconnect2.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index 1a6a5850d..c811c3652 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect2.c,v 1.193 2013/03/05 20:16:09 markus Exp $ */ 1/* $OpenBSD: sshconnect2.c,v 1.194 2013/04/05 00:14:00 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Damien Miller. All rights reserved. 4 * Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -810,7 +810,7 @@ input_gssapi_errtok(int type, u_int32_t plen, void *ctxt)
810 Gssctxt *gssctxt; 810 Gssctxt *gssctxt;
811 gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; 811 gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
812 gss_buffer_desc recv_tok; 812 gss_buffer_desc recv_tok;
813 OM_uint32 status, ms; 813 OM_uint32 ms;
814 u_int len; 814 u_int len;
815 815
816 if (authctxt == NULL) 816 if (authctxt == NULL)
@@ -823,7 +823,7 @@ input_gssapi_errtok(int type, u_int32_t plen, void *ctxt)
823 packet_check_eom(); 823 packet_check_eom();
824 824
825 /* Stick it into GSSAPI and see what it says */ 825 /* Stick it into GSSAPI and see what it says */
826 status = ssh_gssapi_init_ctx(gssctxt, options.gss_deleg_creds, 826 (void)ssh_gssapi_init_ctx(gssctxt, options.gss_deleg_creds,
827 &recv_tok, &send_tok, NULL); 827 &recv_tok, &send_tok, NULL);
828 828
829 xfree(recv_tok.value); 829 xfree(recv_tok.value);
@@ -836,12 +836,11 @@ input_gssapi_errtok(int type, u_int32_t plen, void *ctxt)
836void 836void
837input_gssapi_error(int type, u_int32_t plen, void *ctxt) 837input_gssapi_error(int type, u_int32_t plen, void *ctxt)
838{ 838{
839 OM_uint32 maj, min;
840 char *msg; 839 char *msg;
841 char *lang; 840 char *lang;
842 841
843 maj=packet_get_int(); 842 /* maj */(void)packet_get_int();
844 min=packet_get_int(); 843 /* min */(void)packet_get_int();
845 msg=packet_get_string(NULL); 844 msg=packet_get_string(NULL);
846 lang=packet_get_string(NULL); 845 lang=packet_get_string(NULL);
847 846