server/keymgmt.c (kh_init): Remove pointless setting of `kh->kf'.

[tripe] / server / keymgmt.c

diff --git a/server/keymgmt.c b/server/keymgmt.c
index 6ee65bc..e181d0e 100644 (file)
--- a/server/keymgmt.c
+++ b/server/keymgmt.c
@@ -303,8 +303,6 @@ static void kh_init(keyhalf *kh, const char *kr)
   kh->kr = kr;
   fwatch_init(&kh->w, kr);
   sym_create(&kh->tab);
-  kh->kf = 0;
-
   if (kh_reopen(kh)) exit(EXIT_FAILURE);
 }
 
@@ -553,8 +551,10 @@ void km_init(const char *privkr, const char *pubkr, const char *ptag)
 
   for (hh = ghashtab; *hh; hh++) {
     if ((*hh)->hashsz > MAXHASHSZ) {
-      die(EXIT_FAILURE, "INTERNAL ERROR: %s hash length %lu > MAXHASHSZ %d",
-         (*hh)->name, (unsigned long)(*hh)->hashsz, MAXHASHSZ);
+      a_warn("ABORT", "hash-size-too-large", "hash",
+            "%s", (*hh)->name, "size", "%lu", (*hh)->hashsz,
+            "limit", "%d", MAXHASHSZ, A_END);
+      abort();
     }
   }