aboutsummaryrefslogtreecommitdiff
path: root/crypto/openssh/auth2-gss.c
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2006-09-30 13:29:51 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2006-09-30 13:29:51 +0000
commit761efaa70c2ed8d35722b7bc234a46bf2457f876 (patch)
treebba6f2fe7855d7b0095f9dc7720dc27bea4d1fdf /crypto/openssh/auth2-gss.c
parent30c2033ae748d441213eed2e5c3fae760cc8ea61 (diff)
downloadsrc-761efaa70c2ed8d35722b7bc234a46bf2457f876.tar.gz
src-761efaa70c2ed8d35722b7bc234a46bf2457f876.zip
Vendor import of OpenSSH 4.4p1.
Notes
Notes: svn path=/vendor-crypto/openssh/dist/; revision=162852
Diffstat (limited to 'crypto/openssh/auth2-gss.c')
-rw-r--r--crypto/openssh/auth2-gss.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/crypto/openssh/auth2-gss.c b/crypto/openssh/auth2-gss.c
index 95844a05e5ba..c77c841a3a8a 100644
--- a/crypto/openssh/auth2-gss.c
+++ b/crypto/openssh/auth2-gss.c
@@ -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.15 2006/08/03 03:34:41 deraadt Exp $ */
/*
* Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@@ -28,16 +28,22 @@
#ifdef GSSAPI
+#include <sys/types.h>
+
+#include <stdarg.h>
+
+#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 "monitor_wrap.h"
-
#include "ssh-gss.h"
+#include "monitor_wrap.h"
extern ServerOptions options;
@@ -100,6 +106,8 @@ userauth_gssapi(Authctxt *authctxt)
}
if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, &goid)))) {
+ if (ctxt != NULL)
+ ssh_gssapi_delete_ctx(&ctxt);
xfree(doid);
return (0);
}