[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  64424bb s4-smbtorture: pick a better printer in RPC-SPOOLSS-ACCESS.
      from  1352a94 s4:objectclass LDB module - LSA objects - allow them if the SYSTEM control is specified

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 64424bb1c3a1714371cf7dd9d2e0ff52777b7874
Author: Günther Deschner <gd at samba.org>
Date:   Wed Nov 24 10:57:09 2010 +0100

    s4-smbtorture: pick a better printer in RPC-SPOOLSS-ACCESS.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Wed Nov 24 22:07:33 CET 2010 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source4/torture/rpc/spoolss_access.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/rpc/spoolss_access.c b/source4/torture/rpc/spoolss_access.c
index b67d6e0..1dcc44d 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;


-- 
Samba Shared Repository