summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2013-01-31 22:06:20 +0100
committerDavid Disseldorp <ddiss@samba.org>2013-05-20 18:50:00 +0200
commite8797a3ecc03cbbdbc51c3952ac72fd663d5849c (patch)
tree5e899d118267ba6d8b649c5d33c8405661a3eb2b
parentcc153fe86f780d4aefe40999064b294b612e92d6 (diff)
downloadsamba-e8797a3ecc03cbbdbc51c3952ac72fd663d5849c.tar.gz
samba-e8797a3ecc03cbbdbc51c3952ac72fd663d5849c.tar.bz2
samba-e8797a3ecc03cbbdbc51c3952ac72fd663d5849c.zip
s4-torture: also deal with "Microsoft XPS Document Writer v4" as default driver.
Guenther Signed-off-by: Günther Deschner <gd@samba.org> Reviewed-by: David Disseldorp <ddiss@samba.org>
-rw-r--r--source4/torture/rpc/spoolss.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 32cc2974c7..cd7dbb913a 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -7767,7 +7767,6 @@ static bool torture_rpc_spoolss_printer_setup_common(struct torture_context *tct
t->driver.local.driver_directory= "/usr/share/cups/drivers";
- t->info2.drivername = "Microsoft XPS Document Writer";
t->info2.portname = "LPT1:";
printer_name = t->info2.printername;
@@ -7785,6 +7784,8 @@ static bool torture_rpc_spoolss_printer_setup_common(struct torture_context *tct
&t->driver.local.driver_directory),
"failed to compose local driver directory");
+ t->info2.drivername = "Microsoft XPS Document Writer";
+
if (test_EnumPrinterDrivers_findone(tctx, b, server_name_slash, t->driver.remote.environment, 3, t->info2.drivername, NULL)) {
torture_comment(tctx, "driver '%s' (architecture: %s, version: 3) is present on server\n",
t->info2.drivername, t->driver.remote.environment);
@@ -7794,6 +7795,16 @@ static bool torture_rpc_spoolss_printer_setup_common(struct torture_context *tct
torture_comment(tctx, "driver '%s' (architecture: %s, version: 3) does not exist on the server\n",
t->info2.drivername, t->driver.remote.environment);
+
+ t->info2.drivername = "Microsoft XPS Document Writer v4";
+
+ if (test_EnumPrinterDrivers_findone(tctx, b, server_name_slash, t->driver.remote.environment, 3, t->info2.drivername, NULL)) {
+ torture_comment(tctx, "driver '%s' (architecture: %s, version: 4) is present on server\n",
+ t->info2.drivername, t->driver.remote.environment);
+ t->have_driver = true;
+ goto try_add;
+ }
+
torture_comment(tctx, "trying to upload own driver\n");
if (!directory_exist(t->driver.local.driver_directory)) {