X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=conffile.c;h=e3a74aab90fd481b73b0b8455db5eb17603054be;hb=4d9d6e20e19c1aaa0d138e70897d136b36d673c0;hp=e6cf48fa558604068f11558d4c5c5bfc2687ef96;hpb=bd7f386bb44f2f8e2c6d77ea176026e88176412e;p=secnet.git diff --git a/conffile.c b/conffile.c index e6cf48f..e3a74aa 100644 --- a/conffile.c +++ b/conffile.c @@ -655,20 +655,18 @@ void add_closure(dict_t *dict, cstring_t name, apply_fn apply) } void *find_cl_if(dict_t *dict, cstring_t name, uint32_t type, - bool_t fail_if_invalid, cstring_t desc, struct cloc loc) + bool_t required, cstring_t desc, struct cloc loc) { item_t *i; closure_t *cl; - i = dict_find_item(dict,name,fail_if_invalid,desc,loc); + i = dict_find_item(dict,name,required,desc,loc); if (!i) return NULL; if (i->type!=t_closure) { - if (!fail_if_invalid) return NULL; cfgfatal(loc,desc,"\"%s\" must be a closure\n",name); } cl=i->data.closure; if (cl->type!=type) { - if (!fail_if_invalid) return NULL; cfgfatal(loc,desc,"\"%s\" is the wrong type of closure\n",name); } return cl->interface;