=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth2-gss.c,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -u -r1.12 -r1.12.2.1 --- src/usr.bin/ssh/auth2-gss.c 2005/10/13 22:24:31 1.12 +++ src/usr.bin/ssh/auth2-gss.c 2006/09/30 04:06:50 1.12.2.1 @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-gss.c,v 1.12 2005/10/13 22:24:31 stevesk Exp $ */ +/* $OpenBSD: auth2-gss.c,v 1.12.2.1 2006/09/30 04:06:50 brad Exp $ */ /* * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. @@ -24,21 +24,21 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "includes.h" +#include -#ifdef GSSAPI - +#include "xmalloc.h" +#include "key.h" +#include "hostfile.h" #include "auth.h" #include "ssh2.h" -#include "xmalloc.h" #include "log.h" #include "dispatch.h" +#include "buffer.h" #include "servconf.h" #include "packet.h" +#include "ssh-gss.h" #include "monitor_wrap.h" -#include "ssh-gss.h" - extern ServerOptions options; static void input_gssapi_token(int type, u_int32_t plen, void *ctxt); @@ -100,6 +100,8 @@ } if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, &goid)))) { + if (ctxt != NULL) + ssh_gssapi_delete_ctx(&ctxt); xfree(doid); return (0); } @@ -289,5 +291,3 @@ userauth_gssapi, &options.gss_authentication }; - -#endif /* GSSAPI */