1 files changed, 4 insertions, 3 deletions

diff --git a/ssh-keysign.c b/ssh-keysign.c
index ac5034de8..78bb66b08 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keysign.c,v 1.52 2016/02/15 09:47:49 dtucker Exp $ */
+/* $OpenBSD: ssh-keysign.c,v 1.54 2018/02/23 15:58:38 markus Exp $ */
 /*
  * Copyright (c) 2002 Markus Friedl.  All rights reserved.
  *
@@ -158,7 +158,7 @@ valid_request(struct passwd *pw, char *host, struct sshkey **ret,
 
         debug3("%s: fail %d", __func__, fail);
 
-        if (fail && key != NULL)
+        if (fail)
                 sshkey_free(key);
         else if (ret != NULL)
                 *ret = key;
@@ -171,7 +171,7 @@ main(int argc, char **argv)
 {
         struct sshbuf *b;
         Options options;
-#define NUM_KEYTYPES 4
+#define NUM_KEYTYPES 5
         struct sshkey *keys[NUM_KEYTYPES], *key = NULL;
         struct passwd *pw;
         int r, key_fd[NUM_KEYTYPES], i, found, version = 2, fd;
@@ -198,6 +198,7 @@ main(int argc, char **argv)
         key_fd[i++] = open(_PATH_HOST_DSA_KEY_FILE, O_RDONLY);
         key_fd[i++] = open(_PATH_HOST_ECDSA_KEY_FILE, O_RDONLY);
         key_fd[i++] = open(_PATH_HOST_ED25519_KEY_FILE, O_RDONLY);
+        key_fd[i++] = open(_PATH_HOST_XMSS_KEY_FILE, O_RDONLY);
         key_fd[i++] = open(_PATH_HOST_RSA_KEY_FILE, O_RDONLY);
 
         original_real_uid = getuid();   /* XXX readconf.c needs this */