summaryrefslogtreecommitdiff
path: root/kexgssc.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-03-19 16:40:50 +0000
committerColin Watson <cjwatson@debian.org>2014-03-19 16:40:55 +0000
commit2491df1666864ce27a0becff4c85fec7d6ff38ff (patch)
tree7cad7ef6746abf36393594fb9abb0113b7b8793f /kexgssc.c
parentd563b20ec274b25929677424e4673eb23774b335 (diff)
parent6dbd954a28d3fc2631f1c0b42c23452e1e493e6f (diff)
Apply various warning-suppression and regression-test fixes to gssapi.patch from Damien Miller.
Diffstat (limited to 'kexgssc.c')
-rw-r--r--kexgssc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kexgssc.c b/kexgssc.c
index 14f559883..92a31c5a3 100644
--- a/kexgssc.c
+++ b/kexgssc.c
@@ -61,7 +61,6 @@ kexgss_client(Kex *kex) {
61 u_char *serverhostkey = NULL; 61 u_char *serverhostkey = NULL;
62 u_char *empty = ""; 62 u_char *empty = "";
63 char *msg; 63 char *msg;
64 char *lang;
65 int type = 0; 64 int type = 0;
66 int first = 1; 65 int first = 1;
67 int nbits = 0, min = DH_GRP_MIN, max = DH_GRP_MAX; 66 int nbits = 0, min = DH_GRP_MIN, max = DH_GRP_MAX;
@@ -220,7 +219,7 @@ kexgss_client(Kex *kex) {
220 maj_status = packet_get_int(); 219 maj_status = packet_get_int();
221 min_status = packet_get_int(); 220 min_status = packet_get_int();
222 msg = packet_get_string(NULL); 221 msg = packet_get_string(NULL);
223 lang = packet_get_string(NULL); 222 (void) packet_get_string_ptr(NULL);
224 fatal("GSSAPI Error: \n%.400s",msg); 223 fatal("GSSAPI Error: \n%.400s",msg);
225 default: 224 default:
226 packet_disconnect("Protocol error: didn't expect packet type %d", 225 packet_disconnect("Protocol error: didn't expect packet type %d",