diff options
| author | Damien Miller <djm@mindrot.org> | 2010-02-12 09:22:31 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-02-12 09:22:31 +1100 |
| commit | a183c6edee2f5238e28607955e8ac95cef7f0d8c (patch) | |
| tree | 42f4842cf05c40dbfa77e9eb3b6464da698f404c | |
| parent | 048dc93617b7d005d8f7d42da1d52d8982408bdd (diff) | |
- djm@cvs.openbsd.org 2010/02/09 00:50:36
[ssh-agent.c]
fallout from PKCS#11: unbreak -D
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ssh-agent.c | 5 |
2 files changed, 6 insertions, 2 deletions
@@ -18,6 +18,9 @@ - jmc@cvs.openbsd.org 2010/02/08 22:03:05 [ssh-add.1 ssh-keygen.1 ssh.1 ssh.c] tweak previous; ok markus + - djm@cvs.openbsd.org 2010/02/09 00:50:36 + [ssh-agent.c] + fallout from PKCS#11: unbreak -D 20100210 - (djm) add -lselinux to LIBS before calling AC_CHECK_FUNCS for diff --git a/ssh-agent.c b/ssh-agent.c index f745c251..46a744f4 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.163 2010/02/08 10:50:20 markus Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.164 2010/02/09 00:50:36 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -172,7 +172,8 @@ static void free_identity(Identity *id) { key_free(id->key); - xfree(id->provider); + if (id->provider != NULL) + xfree(id->provider); xfree(id->comment); xfree(id); } |