s4-smbtorture: make sure to not attempt to remove a driver file twice.

Guenther

diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 0ccd79ad0abee75fd909b158c7d6591a63273d9a..6b06e4a999b0973c49a98a39909759f84e8cde94 100644 (file)
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -7452,6 +7452,12 @@ static bool remove_printer_driver(struct torture_context *tctx,
                "failed to remove help_file");
        if (d->info8.dependent_files) {
                for (i=0; d->info8.dependent_files->string && d->info8.dependent_files->string[i] != NULL; i++) {
+                       if (strequal(d->info8.dependent_files->string[i], d->info8.driver_path) ||
+                           strequal(d->info8.dependent_files->string[i], d->info8.data_file) ||
+                           strequal(d->info8.dependent_files->string[i], d->info8.config_file) ||
+                           strequal(d->info8.dependent_files->string[i], d->info8.help_file)) {
+                               continue;
+                       }
                        torture_assert(tctx,
                                remove_printer_driver_file(tctx, cli, d, d->info8.dependent_files->string[i]),
                                "failed to remove dependent_files");