From 81aca44d30783d1c162498a257fc47cc44a649fb Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Mon, 13 Apr 2009 14:48:32 +0200
Subject: s4-smbtorture: use printerinfo level 1 name, not description in
 test_EnumPrinters_old().

Guenther
---
 source4/torture/rpc/spoolss.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'source4')

diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 2bdcc3fdaf..f2a503b6fd 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -1816,10 +1816,17 @@ static bool test_EnumPrinters_old(struct torture_context *tctx, struct dcerpc_pi
 
 		for (j=0;j<count;j++) {
 			if (r.in.level == 1) {
-				/* the names appear to be comma-separated name lists? */
-				char *name = talloc_strdup(tctx, info[j].info1.name);
-				char *comma = strchr(name, ',');
-				if (comma) *comma = 0;
+				char *unc = talloc_strdup(tctx, info[j].info1.name);
+				char *slash, *name;
+				name = unc;
+				if (unc[0] == '\\' && unc[1] == '\\') {
+					unc +=2;
+				}
+				slash = strchr(unc, '\\');
+				if (slash) {
+					slash++;
+					name = slash;
+				}
 				if (!test_OpenPrinter(tctx, p, name)) {
 					ret = false;
 				}
-- 
cgit