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

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index 2f099e3..d2ebaab 100644
--- a/discover/pxe-parser.c
+++ b/discover/pxe-parser.c
@@ -324,7 +324,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 +421,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);