From f5e41c5cde30e72a7f3597814cebaee4c1f0f9b4 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 30 Apr 2010 14:38:07 +0200 Subject: s4-torture: Fixed spoolss dsspooler printername test. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Günther Deschner --- source4/torture/rpc/spoolss.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index bb114b658a..cb15ffd5e3 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -4972,6 +4972,7 @@ static bool test_PrinterData_DsSpooler(struct torture_context *tctx, union spoolss_SetPrinterInfo sinfo; union spoolss_PrinterInfo info; struct dcerpc_binding_handle *b = p->binding_handle; + const char *pname; ZERO_STRUCT(info_ctr); ZERO_STRUCT(devmode_ctr); @@ -5061,7 +5062,14 @@ do {\ TEST_SZ("description", info.info2.comment); TEST_SZ("driverName", info.info2.drivername); TEST_SZ("location", info.info2.location); - TEST_SZ("printerName", info.info2.printername); + + pname = strrchr(info.info2.printername, '\\'); + if (pname == NULL) { + pname = info.info2.printername; + } else { + pname++; + } + TEST_SZ("printerName", pname); /* TEST_SZ("printSeparatorFile", info.info2.sepfile); */ /* TEST_SZ("printShareName", info.info2.sharename); */ -- cgit