X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=site.c;fp=site.c;h=e8b507ff0540fc2302420f0eccbb959897e22072;hb=77b5ed3f8b450d4889ffb205a098f8aa7821baaf;hp=e37c73bee2728f8b3dbe336beedefac8f871f20d;hpb=ee7555831b2219ee5febaf63c2a69189d58664cd;p=secnet.git diff --git a/site.c b/site.c index e37c73b..e8b507f 100644 --- a/site.c +++ b/site.c @@ -903,7 +903,7 @@ static void peerkeys_maybe_incorporate(struct site *st, const char *file, int logcl_enoent) { struct peer_keyset *atsuffix= - keyset_load(file,&st->scratch,st->log,logcl_enoent); + keyset_load(file,&st->scratch,st->log,logcl_enoent,st->defhash); if (!atsuffix) return; if (st->peerkeys_current && @@ -2547,7 +2547,8 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context, pathprefix_template_init(&st->peerkeys_tmpl,st->peerkeys_path, PEERKEYS_SUFFIX_MAXLEN + 1 /* nul */); st->peerkeys_current=keyset_load(st->peerkeys_path, - &st->scratch,st->log,M_ERR); + &st->scratch,st->log,M_ERR, + st->defhash); if (fixed_pubkey) { fixed_pubkey->dispose(fixed_pubkey->st); }