diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-07-10 09:13:30 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-07-10 19:15:35 +1000 |
commit | 0f3958c1e6ffb8ea4ba27e2a97a00326fce23246 (patch) | |
tree | f2538c652ca620a254578a088ff0f5eb2e36d9dd /monitor_wrap.c | |
parent | c74ae8e7c45f325f3387abd48fa7dfef07a08069 (diff) |
upstream: kerberos/gssapi fixes for buffer removal
OpenBSD-Commit-ID: 1cdf56fec95801e4563c47f21696f04cd8b60c4c
Diffstat (limited to 'monitor_wrap.c')
-rw-r--r-- | monitor_wrap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index cf38b230b..682e39dec 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.c,v 1.103 2018/07/09 21:53:45 markus Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.c,v 1.104 2018/07/10 09:13:30 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> | 4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> |
@@ -989,7 +989,7 @@ mm_ssh_gssapi_accept_ctx(Gssctxt *ctx, gss_buffer_desc *in, | |||
989 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSTEP, m); | 989 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSTEP, m); |
990 | 990 | ||
991 | if ((r = sshbuf_get_u32(m, &major)) != 0 || | 991 | if ((r = sshbuf_get_u32(m, &major)) != 0 || |
992 | (r = sshbuf_get_string(m, &out->value, &out->length)) != 0) | 992 | (r = ssh_gssapi_get_buffer_desc(m, out)) != 0) |
993 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | 993 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
994 | if (flagsp != NULL) { | 994 | if (flagsp != NULL) { |
995 | if ((r = sshbuf_get_u32(m, &flags)) != 0) | 995 | if ((r = sshbuf_get_u32(m, &flags)) != 0) |