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;
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);
if (kh_reopen(kh)) exit(EXIT_FAILURE);
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@ --- *
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);
}
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