From 90a0a7e81babfbad775655e93f08acf15bb4b19d Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Mon, 29 Nov 2010 15:08:01 +0100 Subject: s4-smbtorture: handle driverfile overlap during removal in RPC-SPOOLSS-DRIVER. Guenther --- source4/torture/rpc/spoolss.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'source4/torture/rpc/spoolss.c') diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index e525793680..3e8c7e17bb 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -8767,9 +8767,11 @@ static bool remove_printer_driver(struct torture_context *tctx, torture_assert(tctx, remove_printer_driver_file(tctx, cli, d, d->info8.data_file), "failed to remove data_file"); - torture_assert(tctx, - remove_printer_driver_file(tctx, cli, d, d->info8.config_file), - "failed to remove config_file"); + if (!strequal(d->info8.config_file, d->info8.driver_path)) { + torture_assert(tctx, + remove_printer_driver_file(tctx, cli, d, d->info8.config_file), + "failed to remove config_file"); + } torture_assert(tctx, remove_printer_driver_file(tctx, cli, d, d->info8.help_file), "failed to remove help_file"); -- cgit