1 files changed, 3 insertions, 1 deletions

diff --git a/sshconnect2.c b/sshconnect2.c
index e81064dae..2a5943e7e 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.179 2010/01/13 01:20:20 dtucker Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.180 2010/02/26 20:29:54 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -1311,6 +1311,8 @@ pubkey_prepare(Authctxt *authctxt)
                 key = options.identity_keys[i];
                 if (key && key->type == KEY_RSA1)
                         continue;
+                if (key && key->cert && key->cert->type != SSH2_CERT_TYPE_USER)
+                        continue;
                 options.identity_keys[i] = NULL;
                 id = xcalloc(1, sizeof(*id));
                 id->key = key;