diff options
| author | Günther Deschner <gd@samba.org> | 2010-04-27 15:48:52 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-04-27 16:42:15 +0200 |
| commit | b40d2815cd3495b66ed2b469e3495baf1a7a6256 (patch) | |
| tree | e5cdf2e4eff5b633c207d1a0a48ec047c8c540c5 | |
| parent | ad80131bb176b17fda15e9a76f3934913829a0bb (diff) | |
| download | samba-b40d2815cd3495b66ed2b469e3495baf1a7a6256.tar.gz samba-b40d2815cd3495b66ed2b469e3495baf1a7a6256.tar.bz2 samba-b40d2815cd3495b66ed2b469e3495baf1a7a6256.zip | |
s4-smbtorture: make sure to not attempt to remove a driver file twice.
Guenther
| -rw-r--r-- | source4/torture/rpc/spoolss.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index 0ccd79ad0a..6b06e4a999 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"); |