1c1
< /* $OpenBSD: gss-serv.c,v 1.13 2005/10/13 22:24:31 stevesk Exp $ */
---
> /* $OpenBSD: gss-serv.c,v 1.20 2006/08/03 03:34:42 deraadt Exp $ */
31c31,40
< #include "bufaux.h"
---
> #include <sys/types.h>
>
> #include <stdarg.h>
> #include <string.h>
> #include <unistd.h>
>
> #include "xmalloc.h"
> #include "buffer.h"
> #include "key.h"
> #include "hostfile.h"
36,38c45
< #include "servconf.h"
< #include "xmalloc.h"
< #include "getput.h"
---
> #include "misc.h"
80a88,89
>
> gss_release_oid_set(&min_status, &supported);
154c163
< oidl = GET_16BIT(tok+2); /* length including next two bytes */
---
> oidl = get_u16(tok+2); /* length including next two bytes */
171c180
< name->length = GET_32BIT(tok+offset);
---
> name->length = get_u32(tok+offset);
178c187
< memcpy(name->value, tok+offset,name->length);
---
> memcpy(name->value, tok+offset, name->length);
237c246,247
< debug("removing gssapi cred file\"%s\"", gssapi_client.store.filename);
---
> debug("removing gssapi cred file\"%s\"",
> gssapi_client.store.filename);
< /* $OpenBSD: gss-serv.c,v 1.13 2005/10/13 22:24:31 stevesk Exp $ */
---
> /* $OpenBSD: gss-serv.c,v 1.20 2006/08/03 03:34:42 deraadt Exp $ */
31c31,40
< #include "bufaux.h"
---
> #include <sys/types.h>
>
> #include <stdarg.h>
> #include <string.h>
> #include <unistd.h>
>
> #include "xmalloc.h"
> #include "buffer.h"
> #include "key.h"
> #include "hostfile.h"
36,38c45
< #include "servconf.h"
< #include "xmalloc.h"
< #include "getput.h"
---
> #include "misc.h"
80a88,89
>
> gss_release_oid_set(&min_status, &supported);
154c163
< oidl = GET_16BIT(tok+2); /* length including next two bytes */
---
> oidl = get_u16(tok+2); /* length including next two bytes */
171c180
< name->length = GET_32BIT(tok+offset);
---
> name->length = get_u32(tok+offset);
178c187
< memcpy(name->value, tok+offset,name->length);
---
> memcpy(name->value, tok+offset, name->length);
237c246,247
< debug("removing gssapi cred file\"%s\"", gssapi_client.store.filename);
---
> debug("removing gssapi cred file\"%s\"",
> gssapi_client.store.filename);