X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=client-src%2Fselfcheck.c;h=5234f0f993cb4719d23bbf626602197ca88e43aa;hb=b221e8dc16f345f8c8d7df8df71f4d36daaabb4c;hp=bbfcd67daad6506cbd224ef7dfe32685421425dd;hpb=d5853102f67d85d8e169f9dbe973ad573306c215;p=debian%2Famanda diff --git a/client-src/selfcheck.c b/client-src/selfcheck.c index bbfcd67..5234f0f 100644 --- a/client-src/selfcheck.c +++ b/client-src/selfcheck.c @@ -306,13 +306,16 @@ main( if (am_has_feature(g_options->features, fe_req_xml)) { char *errmsg = NULL; - dle_t *dles, *dle; + dle_t *dles, *dle, *dle_next; dles = amxml_parse_node_FILE(stdin, &errmsg); if (errmsg) { err_extra = errmsg; goto err; } + if (merge_dles_properties(dles, 1) == 0) { + goto checkoverall; + } for (dle = dles; dle != NULL; dle = dle->next) { run_client_scripts(EXECUTE_ON_PRE_HOST_AMCHECK, g_options, dle, stdout); @@ -329,8 +332,13 @@ main( run_client_scripts(EXECUTE_ON_POST_HOST_AMCHECK, g_options, dle, stdout); } + for (dle = dles; dle != NULL; dle = dle_next) { + dle_next = dle->next; + free_dle(dle); + } } +checkoverall: check_overall(); amfree(line);