From 55c47edc81accd3118fc0fda2c37765631c0aef0 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 2 Sep 2003 22:14:07 +1000 Subject: [PATCH] - (djm) OpenBSD CVS Sync - deraadt@cvs.openbsd.org 2003/08/24 17:36:51 [auth2-gss.c] 64 bit cleanups; markus ok --- ChangeLog | 8 +++++++- auth2-gss.c | 6 ++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9dfaf781..91e727198 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +20030829 + - (djm) OpenBSD CVS Sync + - deraadt@cvs.openbsd.org 2003/08/24 17:36:51 + [auth2-gss.c] + 64 bit cleanups; markus ok + 20030829 - (bal) openbsd-compat/ clean up. Considate headers, add in Id on our files, and added missing license to header. @@ -912,4 +918,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.2919 2003/08/30 00:11:56 mouring Exp $ +$Id: ChangeLog,v 1.2920 2003/09/02 12:14:07 djm Exp $ diff --git a/auth2-gss.c b/auth2-gss.c index c7651112d..feb97d7c3 100644 --- a/auth2-gss.c +++ b/auth2-gss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-gss.c,v 1.1 2003/08/22 10:56:08 markus Exp $ */ +/* $OpenBSD: auth2-gss.c,v 1.2 2003/08/24 17:36:51 deraadt Exp $ */ /* * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. @@ -175,12 +175,14 @@ input_gssapi_errtok(int type, u_int32_t plen, void *ctxt) gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; gss_buffer_desc recv_tok; OM_uint32 maj_status; + u_int len; if (authctxt == NULL || (authctxt->methoddata == NULL && !use_privsep)) fatal("No authentication or GSSAPI context"); gssctxt = authctxt->methoddata; - recv_tok.value = packet_get_string(&recv_tok.length); + recv_tok.value = packet_get_string(&len); + recv_tok.length = len; packet_check_eom();