summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-11-24 10:57:09 +0100
committerGünther Deschner <gd@samba.org>2010-11-24 22:07:33 +0100
commit64424bb1c3a1714371cf7dd9d2e0ff52777b7874 (patch)
tree47a7d8ed7082f996eda9a2bcf0091e3580f3cee7
parent1352a9406f3e3067a8e751ac157eab67796bc0c6 (diff)
downloadsamba-64424bb1c3a1714371cf7dd9d2e0ff52777b7874.tar.gz
samba-64424bb1c3a1714371cf7dd9d2e0ff52777b7874.tar.bz2
samba-64424bb1c3a1714371cf7dd9d2e0ff52777b7874.zip
s4-smbtorture: pick a better printer in RPC-SPOOLSS-ACCESS.
Guenther Autobuild-User: Günther Deschner <gd@samba.org> Autobuild-Date: Wed Nov 24 22:07:33 CET 2010 on sn-devel-104
-rw-r--r--source4/torture/rpc/spoolss_access.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/source4/torture/rpc/spoolss_access.c b/source4/torture/rpc/spoolss_access.c
index b67d6e0bac..1dcc44dd0f 100644
--- a/source4/torture/rpc/spoolss_access.c
+++ b/source4/torture/rpc/spoolss_access.c
@@ -399,7 +399,7 @@ static bool test_EnumPrinters_findone(struct torture_context *tctx,
*printername = NULL;
r.in.flags = PRINTER_ENUM_LOCAL;
- r.in.server = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
+ r.in.server = NULL;
r.in.level = 1;
r.in.buffer = NULL;
r.in.offered = 0;
@@ -426,6 +426,13 @@ static bool test_EnumPrinters_findone(struct torture_context *tctx,
for (i=0; i < count; i++) {
+ if (count > 1 && strequal(info[i].info1.name, "Microsoft XPS Document Writer")) {
+ continue;
+ }
+
+ torture_comment(tctx, "testing printer: %s\n",
+ info[i].info1.name);
+
*printername = talloc_strdup(tctx, info[i].info1.name);
break;