summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-11-29 17:48:42 +0100
committerGünther Deschner <gd@samba.org>2010-11-29 17:48:42 +0100
commit7f2afe25e7552bf871b68278749742c54b729d76 (patch)
tree9abcbe705b6de44ed248f8c111b49751a60f14e9
parent118a79719c220ef521088e41ff37aff9da1ad03a (diff)
downloadsamba-7f2afe25e7552bf871b68278749742c54b729d76.tar.gz
samba-7f2afe25e7552bf871b68278749742c54b729d76.tar.bz2
samba-7f2afe25e7552bf871b68278749742c54b729d76.zip
s4-smbtorture: make add-printerdriver test more robust against empty configfiles.
Guenther
-rw-r--r--source4/torture/rpc/spoolss.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 985ff33e09..1c9482b6f5 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -8857,7 +8857,9 @@ static bool test_add_driver_arg(struct torture_context *tctx,
info8.driver_path = talloc_asprintf(tctx, "%s\\%s", d->remote.driver_directory, d->info8.driver_path);
info8.data_file = talloc_asprintf(tctx, "%s\\%s", d->remote.driver_directory, d->info8.data_file);
- info8.config_file = talloc_asprintf(tctx, "%s\\%s", d->remote.driver_directory, d->info8.config_file);
+ if (d->info8.config_file) {
+ info8.config_file = talloc_asprintf(tctx, "%s\\%s", d->remote.driver_directory, d->info8.config_file);
+ }
for (i=0; i < ARRAY_SIZE(levels); i++) {