From b40d2815cd3495b66ed2b469e3495baf1a7a6256 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Tue, 27 Apr 2010 15:48:52 +0200 Subject: [PATCH] s4-smbtorture: make sure to not attempt to remove a driver file twice. Guenther --- source4/torture/rpc/spoolss.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index 0ccd79ad0abe..6b06e4a999b0 100644 --- 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"); -- 2.34.1