diff options
| author | Damien Miller <djm@mindrot.org> | 2006-08-30 11:08:04 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2006-08-30 11:08:04 +1000 |
| commit | 76758b6423a2567b07927139d7d5538f14cb331b (patch) | |
| tree | d90967df545f3a1d0ca95f380a24b15316610745 | |
| parent | d5fe0baa73a168a1194b311aeff9fd824b038740 (diff) | |
| download | openssh-git-76758b6423a2567b07927139d7d5538f14cb331b.tar.gz | |
- dtucker@cvs.openbsd.org 2006/08/29 12:02:30
[gss-genr.c]
Work around a problem in Heimdal that occurs when KRB5CCNAME file is
missing, by checking whether or not kerberos allocated us a context
before attempting to free it. Patch from Simon Wilkinson, tested by
biorn@, ok djm@
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gss-genr.c | 7 |
2 files changed, 11 insertions, 4 deletions
@@ -13,6 +13,12 @@ normalise some inconsistent (but harmless) NULL pointer checks spotted by the Stanford SATURN tool, via Isil Dillig; ok markus@ deraadt@ + - dtucker@cvs.openbsd.org 2006/08/29 12:02:30 + [gss-genr.c] + Work around a problem in Heimdal that occurs when KRB5CCNAME file is + missing, by checking whether or not kerberos allocated us a context + before attempting to free it. Patch from Simon Wilkinson, tested by + biorn@, ok djm@ 20060824 - (dtucker) [openbsd-compat/basename.c] Include errno.h. @@ -5315,4 +5321,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4513 2006/08/30 01:07:39 djm Exp $ +$Id: ChangeLog,v 1.4514 2006/08/30 01:08:04 djm Exp $ @@ -1,4 +1,4 @@ -/* $OpenBSD: gss-genr.c,v 1.16 2006/08/18 22:41:29 djm Exp $ */ +/* $OpenBSD: gss-genr.c,v 1.17 2006/08/29 12:02:30 dtucker Exp $ */ /* * Copyright (c) 2001-2006 Simon Wilkinson. All rights reserved. @@ -310,8 +310,9 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host) major = ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token, NULL); gss_release_buffer(&minor, &token); - gss_delete_sec_context(&minor, &(*ctx)->context, - GSS_C_NO_BUFFER); + if ((*ctx)->context != GSS_C_NO_CONTEXT) + gss_delete_sec_context(&minor, &(*ctx)->context, + GSS_C_NO_BUFFER); } if (GSS_ERROR(major)) |