diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | auth2-gss.c | 6 |
2 files changed, 11 insertions, 3 deletions
@@ -1,4 +1,10 @@ | |||
1 | 20030829 | 1 | 20030829 |
2 | - (djm) OpenBSD CVS Sync | ||
3 | - deraadt@cvs.openbsd.org 2003/08/24 17:36:51 | ||
4 | [auth2-gss.c] | ||
5 | 64 bit cleanups; markus ok | ||
6 | |||
7 | 20030829 | ||
2 | - (bal) openbsd-compat/ clean up. Considate headers, add in Id on our | 8 | - (bal) openbsd-compat/ clean up. Considate headers, add in Id on our |
3 | files, and added missing license to header. | 9 | files, and added missing license to header. |
4 | 10 | ||
@@ -912,4 +918,4 @@ | |||
912 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 918 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
913 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 919 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
914 | 920 | ||
915 | $Id: ChangeLog,v 1.2919 2003/08/30 00:11:56 mouring Exp $ | 921 | $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 @@ | |||
1 | /* $OpenBSD: auth2-gss.c,v 1.1 2003/08/22 10:56:08 markus Exp $ */ | 1 | /* $OpenBSD: auth2-gss.c,v 1.2 2003/08/24 17:36:51 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. | 4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. |
@@ -175,12 +175,14 @@ input_gssapi_errtok(int type, u_int32_t plen, void *ctxt) | |||
175 | gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; | 175 | gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; |
176 | gss_buffer_desc recv_tok; | 176 | gss_buffer_desc recv_tok; |
177 | OM_uint32 maj_status; | 177 | OM_uint32 maj_status; |
178 | u_int len; | ||
178 | 179 | ||
179 | if (authctxt == NULL || (authctxt->methoddata == NULL && !use_privsep)) | 180 | if (authctxt == NULL || (authctxt->methoddata == NULL && !use_privsep)) |
180 | fatal("No authentication or GSSAPI context"); | 181 | fatal("No authentication or GSSAPI context"); |
181 | 182 | ||
182 | gssctxt = authctxt->methoddata; | 183 | gssctxt = authctxt->methoddata; |
183 | recv_tok.value = packet_get_string(&recv_tok.length); | 184 | recv_tok.value = packet_get_string(&len); |
185 | recv_tok.length = len; | ||
184 | 186 | ||
185 | packet_check_eom(); | 187 | packet_check_eom(); |
186 | 188 | ||