Merge commit 'upstream/3.3.0'

[debian/amanda] / client-src / selfcheck.c

diff --git a/client-src/selfcheck.c b/client-src/selfcheck.c
index bbfcd67daad6506cbd224ef7dfe32685421425dd..5234f0f993cb4719d23bbf626602197ca88e43aa 100644 (file)
--- 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);