X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=conffile.c;h=e3a74aab90fd481b73b0b8455db5eb17603054be;hb=147b444d6faa9a621e33d653b7a72c29724203c3;hp=c03c1d87ea7b117c1acd608967aa5b21c67347ae;hpb=3a2c5e1f10dc6b3cc86f74c287d8c14be14d7e80;p=secnet.git

diff --git a/conffile.c b/conffile.c
index c03c1d8..e3a74aa 100644
--- a/conffile.c
+++ b/conffile.c
@@ -655,19 +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;