summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-11-29 15:08:01 +0100
committerGünther Deschner <gd@samba.org>2010-11-29 15:35:19 +0100
commit90a0a7e81babfbad775655e93f08acf15bb4b19d (patch)
tree9c48eac83f4099b23c78883ff8fcf90f1bcc988f /source4
parent93582c3d2984ced5a8be8bb3b430c5270048c3e6 (diff)
downloadsamba-90a0a7e81babfbad775655e93f08acf15bb4b19d.tar.gz
samba-90a0a7e81babfbad775655e93f08acf15bb4b19d.tar.bz2
samba-90a0a7e81babfbad775655e93f08acf15bb4b19d.zip
s4-smbtorture: handle driverfile overlap during removal in RPC-SPOOLSS-DRIVER.
Guenther
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/rpc/spoolss.c8
1 files changed, 5 insertions, 3 deletions
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");