2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index ffda446b9..506ea7dab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 f745c2513..46a744f4e 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);
 }