X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fpxe-parser.c;h=fd8b8e866d012ac4baeb8d6a772bd90eadbb9a03;hb=281b1398778cdcde08aa8a6a96d0d8c7794fd259;hp=2f099e3ec17717031d9ad555285a878c4e3e6e90;hpb=a2d5a3e3cb55fe3583acaae44fabc7c3d7f8df50;p=petitboot

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index 2f099e3..fd8b8e8 100644
--- a/discover/pxe-parser.c
+++ b/discover/pxe-parser.c
@@ -273,12 +273,14 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data)
 
 	if (!data)
 		return;
+	if (!result)
+		goto out_clean;
 
 	handler = talloc_parent(conf);
 
-	if (result && result->status == LOAD_OK)
+	if (result->status == LOAD_OK)
 		rc = read_file(conf, result->local, &buf, &len);
-	if (!result || result->status != LOAD_OK || rc) {
+	if (result->status != LOAD_OK || rc) {
 		/* This load failed so try the next available filename */
 		info = conf->parser_info;
 		if (!info->pxe_conf_files) {
@@ -324,7 +326,7 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data)
 
 	talloc_free(buf);
 out_clean:
-	if (result->cleanup_local)
+	if (result && result->cleanup_local)
 		unlink(result->local);
 	talloc_free(conf);
 }
@@ -421,9 +423,6 @@ static int pxe_parse(struct discover_context *dc)
 			pb_log("load_url_async fails for %s\n",
 					dc->conf_url->path);
 			goto out_conf;
-		} else if (result->status == LOAD_OK) {
-			/* Local load - call pxe_conf_parse_cb() now */
-			pxe_conf_parse_cb(result, conf);
 		}
 	} else {
 		pxe_conf_files = user_event_parse_conf_filenames(dc, dc->event);