===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/gss-serv.c,v
retrieving revision 1.14.2.1
retrieving revision 1.15
diff -u -r1.14.2.1 -r1.15
--- src/usr.bin/ssh/gss-serv.c	2006/09/30 04:06:50	1.14.2.1
+++ src/usr.bin/ssh/gss-serv.c	2006/03/20 04:08:18	1.15
@@ -1,4 +1,4 @@
-/* $OpenBSD: gss-serv.c,v 1.14.2.1 2006/09/30 04:06:50 brad Exp $ */
+/*	$OpenBSD: gss-serv.c,v 1.15 2006/03/20 04:08:18 djm Exp $	*/
 
 /*
  * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@@ -24,21 +24,18 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/types.h>
+#include "includes.h"
 
 #ifdef GSSAPI
 
-#include <string.h>
-
-#include "xmalloc.h"
-#include "buffer.h"
-#include "key.h"
-#include "hostfile.h"
+#include "bufaux.h"
 #include "auth.h"
 #include "log.h"
 #include "channels.h"
 #include "session.h"
-#include "misc.h"
+#include "servconf.h"
+#include "xmalloc.h"
+#include "getput.h"
 
 #include "ssh-gss.h"
 
@@ -156,7 +153,7 @@
 	 * second without.
 	 */
 
-	oidl = get_u16(tok+2); /* length including next two bytes */
+	oidl = GET_16BIT(tok+2); /* length including next two bytes */
 	oidl = oidl-2; /* turn it into the _real_ length of the variable OID */
 
 	/*
@@ -173,7 +170,7 @@
 	if (ename->length < offset+4)
 		return GSS_S_FAILURE;
 
-	name->length = get_u32(tok+offset);
+	name->length = GET_32BIT(tok+offset);
 	offset += 4;
 
 	if (ename->length < offset+name->length)