X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/b119a5eb97e0a36b825d616aaaaae53689ccbe6c..141c12847a1c2f8cc8db03d420551584e689fb87:/key/key-misc.c

diff --git a/key/key-misc.c b/key/key-misc.c
index c3442f28..b10879ac 100644
--- a/key/key-misc.c
+++ b/key/key-misc.c
@@ -34,6 +34,7 @@
 
 #include <mLib/bits.h>
 #include <mLib/hash.h>
+#include <mLib/macros.h>
 #include <mLib/sub.h>
 #include <mLib/sym.h>
 
@@ -160,12 +161,12 @@ key *key_bytag(key_file *f, const char *tag)
   char *p;
   uint32 id;
   key_ref *kr = sym_find(&f->bytag, tag, -1, 0, 0);
+  key *k;
 
   if (kr && !(KEY_EXPIRED(t, kr->k->exp) && KEY_EXPIRED(t, kr->k->del)))
     return (kr->k);
   id = strtoul(tag, &p, 16);
-  if (!*p)
-    return (key_byid(f, id));
+  if (!*p && (k = key_byid(f, id)) != 0) return (k);
   return (key_bytype(f, tag));
 }