- djm@cvs.openbsd.org 2006/03/20 04:07:49

[gss-genr.c]
     more GSSAPI related leaks detected by Coverity via elad AT netbsd.org;
     reviewed by simon AT sxw.org.uk; deraadt@ ok
This commit is contained in:
Damien Miller 2006-03-26 00:05:23 +11:00
parent f23c09670a
commit a66cf68dd7
2 changed files with 17 additions and 5 deletions

View File

@ -36,6 +36,10 @@
[auth2-gss.c] [auth2-gss.c]
GSSAPI related leaks detected by Coverity via elad AT netbsd.org; GSSAPI related leaks detected by Coverity via elad AT netbsd.org;
reviewed by simon AT sxw.org.uk; deraadt@ ok reviewed by simon AT sxw.org.uk; deraadt@ ok
- djm@cvs.openbsd.org 2006/03/20 04:07:49
[gss-genr.c]
more GSSAPI related leaks detected by Coverity via elad AT netbsd.org;
reviewed by simon AT sxw.org.uk; deraadt@ ok
20060318 20060318
- (djm) [auth-pam.c] Fix memleak in error path, from Coverity via - (djm) [auth-pam.c] Fix memleak in error path, from Coverity via
@ -4228,4 +4232,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4234 2006/03/25 13:04:53 djm Exp $ $Id: ChangeLog,v 1.4235 2006/03/25 13:05:23 djm Exp $

View File

@ -1,4 +1,4 @@
/* $OpenBSD: gss-genr.c,v 1.6 2005/10/13 22:24:31 stevesk Exp $ */ /* $OpenBSD: gss-genr.c,v 1.7 2006/03/20 04:07:49 djm Exp $ */
/* /*
* Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@ -72,7 +72,11 @@ ssh_gssapi_set_oid(Gssctxt *ctx, gss_OID oid)
void void
ssh_gssapi_error(Gssctxt *ctxt) ssh_gssapi_error(Gssctxt *ctxt)
{ {
debug("%s", ssh_gssapi_last_error(ctxt, NULL, NULL)); char *s;
s = ssh_gssapi_last_error(ctxt, NULL, NULL);
debug("%s", s);
xfree(s);
} }
char * char *
@ -231,11 +235,15 @@ ssh_gssapi_acquire_cred(Gssctxt *ctx)
gss_create_empty_oid_set(&status, &oidset); gss_create_empty_oid_set(&status, &oidset);
gss_add_oid_set_member(&status, ctx->oid, &oidset); gss_add_oid_set_member(&status, ctx->oid, &oidset);
if (gethostname(lname, MAXHOSTNAMELEN)) if (gethostname(lname, MAXHOSTNAMELEN)) {
gss_release_oid_set(&status, &oidset);
return (-1); return (-1);
}
if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) {
gss_release_oid_set(&status, &oidset);
return (ctx->major); return (ctx->major);
}
if ((ctx->major = gss_acquire_cred(&ctx->minor, if ((ctx->major = gss_acquire_cred(&ctx->minor,
ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, NULL, NULL))) ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, NULL, NULL)))