- (djm) OpenBSD CVS Sync

   - deraadt@cvs.openbsd.org 2003/08/24 17:36:51
     [auth2-gss.c]
     64 bit cleanups; markus ok

diff --git a/ChangeLog b/ChangeLog
index 2bdccfbed2534774bbbc2cd2826b74cff60a7a12..b3dda377127ee76314b913045350bdb358629f2b 100644 (file)
--- 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.

diff --git a/auth2-gss.c b/auth2-gss.c
index c7651112d10a8820530decb9c2e0d7ecdf0ea6d5..feb97d7c3187db4b799eb7ddec0803e6735a3c4b 100644 (file)
--- 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();