diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | ssh-agent.c | 5 |
2 files changed, 6 insertions, 2 deletions
@@ -18,6 +18,9 @@ | |||
18 | - jmc@cvs.openbsd.org 2010/02/08 22:03:05 | 18 | - jmc@cvs.openbsd.org 2010/02/08 22:03:05 |
19 | [ssh-add.1 ssh-keygen.1 ssh.1 ssh.c] | 19 | [ssh-add.1 ssh-keygen.1 ssh.1 ssh.c] |
20 | tweak previous; ok markus | 20 | tweak previous; ok markus |
21 | - djm@cvs.openbsd.org 2010/02/09 00:50:36 | ||
22 | [ssh-agent.c] | ||
23 | fallout from PKCS#11: unbreak -D | ||
21 | 24 | ||
22 | 20100210 | 25 | 20100210 |
23 | - (djm) add -lselinux to LIBS before calling AC_CHECK_FUNCS for | 26 | - (djm) add -lselinux to LIBS before calling AC_CHECK_FUNCS for |
diff --git a/ssh-agent.c b/ssh-agent.c index f745c2513..46a744f4e 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.163 2010/02/08 10:50:20 markus Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.164 2010/02/09 00:50:36 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -172,7 +172,8 @@ static void | |||
172 | free_identity(Identity *id) | 172 | free_identity(Identity *id) |
173 | { | 173 | { |
174 | key_free(id->key); | 174 | key_free(id->key); |
175 | xfree(id->provider); | 175 | if (id->provider != NULL) |
176 | xfree(id->provider); | ||
176 | xfree(id->comment); | 177 | xfree(id->comment); |
177 | xfree(id); | 178 | xfree(id); |
178 | } | 179 | } |