X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/fb6a9f13a40d1b9e797b4fe858a06cfdbcc1109b..98b9b13628a7613868e0fda618e6303961932550:/server/keymgmt.c

diff --git a/server/keymgmt.c b/server/keymgmt.c
index 7386408f..48e4de65 100644
--- a/server/keymgmt.c
+++ b/server/keymgmt.c
@@ -145,7 +145,7 @@ typedef struct keyhalf {
   const char *kind;
   int (*load)(key_file *, key *, key_data *,
 	      const dhops *, kdata *, dstr *, dstr *);
-  const char *kr;
+  char *kr;
   key_file *kf;
   fwatch w;
   sym_table tab;
@@ -275,18 +275,15 @@ static int kh_reopen(keyhalf *kh)
   key_file *kf = CREATE(key_file);
 
   if (key_open(kf, kh->kr, KOPEN_READ, keymoan, kh)) {
-    a_warn("KEYMGMT", "%s-keyring", kh->kind, "%s", kh->kr,
-	   "io-error", "?ERRNO", A_END);
     DESTROY(kf);
     return (-1);
-  } else {
-    if (kh->kf) {
-      key_close(kh->kf);
-      DESTROY(kh->kf);
-    }
-    kh->kf = kf;
-    return (0);
   }
+  if (kh->kf) {
+    key_close(kh->kf);
+    DESTROY(kh->kf);
+  }
+  kh->kf = kf;
+  return (0);
 }
 
 /* --- @kh_init@ --- *
@@ -303,13 +300,10 @@ static int kh_reopen(keyhalf *kh)
 
 static void kh_init(keyhalf *kh, const char *kr)
 {
-  kh->kr = kr;
+  kh->kr = xstrdup(kr);
   fwatch_init(&kh->w, kr);
   sym_create(&kh->tab);
-  kh->kf = 0;
-
-  if (kh_reopen(kh))
-    die(EXIT_FAILURE, "failed to load %s keyring `%s'", kh->kind, kr);
+  if (kh_reopen(kh)) exit(EXIT_FAILURE);
 }
 
 /* --- @kh_load@ --- *
@@ -534,9 +528,32 @@ static int kh_refresh(keyhalf *kh)
   return (changep);
 }
 
+/* --- @kh_clear@ --- *
+ *
+ * Arguments:	@keyhalf *kh@ = pointer to keyhalf structure
+ *
+ * Returns:	---
+ *
+ * Use:		Clears out the keyhalf's keyring and flushes the cache.
+ */
+
+static void kh_clear(keyhalf *kh)
+{
+  sym_iter i;
+  knode *kn;
+
+  if (!kh->kf) return;
+  for (sym_mkiter(&i, &kh->tab); (kn = sym_next(&i)) != 0; )
+    if (kn->kd) km_unref(kn->kd);
+  sym_destroy(&kh->tab);
+  key_close(kh->kf);
+  xfree(kh->kr);
+  kh->kf = 0;
+}
+
 /*----- Main code ---------------------------------------------------------*/
 
-const char *tag_priv;
+char *tag_priv = 0;
 kdata *master;
 
 /* --- @km_init@ --- *
@@ -557,15 +574,17 @@ 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();
     }
   }
 
   kh_init(&priv, privkr);
   kh_init(&pub, pubkr);
 
-  tag_priv = ptag;
+  tag_priv = ptag ? xstrdup(ptag) : 0;
   if ((master = km_findpriv(ptag)) == 0) exit(EXIT_FAILURE);
 }
 
@@ -597,6 +616,26 @@ int km_reload(void)
   return (changep);
 }
 
+/* --- @km_clear@ --- *
+ *
+ * Arguments:	---
+ *
+ * Returns:	---
+ *
+ * Use:		Forget the currently loaded keyrings.  The @master@ key will
+ *		be cleared, but other keys already loaded will continue to
+ *		exist until their reference count drops to zero.  Call
+ *		@km_init@ to make everything work again.
+ */
+
+void km_clear(void)
+{
+  kh_clear(&priv);
+  kh_clear(&pub);
+  if (master) { km_unref(master); master = 0; }
+  if (tag_priv) { xfree(tag_priv); tag_priv = 0; }
+}
+
 /* --- @km_findpub@, @km_findpriv@ --- *
  *
  * Arguments:	@const char *tag@ = key tag to load