diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2008-07-04 12:54:25 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2008-07-04 12:54:25 +1000 |
| commit | f5cafb0c850a3b6cc7db27fa79afbd4fb185f8f2 (patch) | |
| tree | 1d6afb69e3137f947b0f1a48d5bb4a9885aa91db | |
| parent | 9a2a60986bf33414acf63b6d92d93a2f690c3a17 (diff) | |
- otto@cvs.openbsd.org 2008/07/03 21:46:58
[auth2-pubkey.c]
avoid nasty double free; ok dtucker@ djm@
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | auth2-pubkey.c | 3 |
2 files changed, 5 insertions, 3 deletions
@@ -9,6 +9,9 @@ enabled, delay the fork until after replies for any -R forwards have been seen. Allows for robust detection of -R forward failure when using -f (similar to bz#92); ok dtucker@ + - otto@cvs.openbsd.org 2008/07/03 21:46:58 + [auth2-pubkey.c] + avoid nasty double free; ok dtucker@ djm@ 20080702 - (dtucker) OpenBSD CVS Sync @@ -4544,4 +4547,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.5050 2008/07/04 02:53:50 dtucker Exp $ +$Id: ChangeLog,v 1.5051 2008/07/04 02:54:25 dtucker Exp $ diff --git a/auth2-pubkey.c b/auth2-pubkey.c index daa751ca..b1e38e5f 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-pubkey.c,v 1.18 2008/07/02 12:03:51 dtucker Exp $ */ +/* $OpenBSD: auth2-pubkey.c,v 1.19 2008/07/03 21:46:58 otto Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -195,7 +195,6 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file) f = auth_openkeyfile(file, pw, options.strict_modes); if (!f) { - xfree(file); restore_uid(); return 0; } |