[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  6309f7b... s4-smbtorture: make RPC-SPOOLSS-ACCESS more compatible with older samba releases.
       via  3ad2fa6... s4-smbtorture: remove another incarnation of test_ClosePrinter.
      from  e89502e... s4-smbtorture: add RPC-SPOOLSS-ACCESS.

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


- Log -----------------------------------------------------------------
commit 6309f7b9505d1de60ef01a7129e2d6022cdc8b9d
Author: Günther Deschner <gd at samba.org>
Date:   Sat Jun 5 01:26:49 2010 +0200

    s4-smbtorture: make RPC-SPOOLSS-ACCESS more compatible with older samba releases.
    
    Guenther

commit 3ad2fa672818269f2cbb7a63ff71df4f2cc81a95
Author: Günther Deschner <gd at samba.org>
Date:   Sat Jun 5 01:25:05 2010 +0200

    s4-smbtorture: remove another incarnation of test_ClosePrinter.
    
    This should fix the build; why waf didn't catch that durint make bin/smbtorture4 ?
    
    Guenther

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

Summary of changes:
 source4/torture/rpc/spoolss_access.c |   15 +++++++++------
 source4/torture/rpc/spoolss_notify.c |   19 -------------------
 2 files changed, 9 insertions(+), 25 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/rpc/spoolss_access.c b/source4/torture/rpc/spoolss_access.c
index f86c2e3..812a280 100644
--- a/source4/torture/rpc/spoolss_access.c
+++ b/source4/torture/rpc/spoolss_access.c
@@ -357,7 +357,7 @@ static bool spoolss_access_setup_sd(struct torture_context *tctx,
 }
 
 static bool test_EnumPrinters_findone(struct torture_context *tctx,
-				      struct dcerpc_binding_handle *b,
+				      struct dcerpc_pipe *p,
 				      const char **printername)
 {
 	struct spoolss_EnumPrinters r;
@@ -365,11 +365,12 @@ static bool test_EnumPrinters_findone(struct torture_context *tctx,
 	union spoolss_PrinterInfo *info;
 	uint32_t needed;
 	int i;
+	struct dcerpc_binding_handle *b = p->binding_handle;
 
 	*printername = NULL;
 
 	r.in.flags = PRINTER_ENUM_LOCAL;
-	r.in.server = NULL;
+	r.in.server = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
 	r.in.level = 1;
 	r.in.buffer = NULL;
 	r.in.offered = 0;
@@ -414,9 +415,11 @@ static bool torture_rpc_spoolss_access_setup_common(struct torture_context *tctx
 	const char *printername;
 	const char *binding = torture_setting_string(tctx, "binding", NULL);
 
-	testuser = torture_create_testuser(tctx, t->user.username,
-					   torture_setting_string(tctx, "workgroup", NULL),
-					   ACB_NORMAL, &testuser_passwd);
+	testuser = torture_create_testuser_max_pwlen(tctx, t->user.username,
+						     torture_setting_string(tctx, "workgroup", NULL),
+						     ACB_NORMAL,
+						     &testuser_passwd,
+						     32);
 	if (!testuser) {
 		torture_fail(tctx, "Failed to create test user");
 	}
@@ -464,7 +467,7 @@ static bool torture_rpc_spoolss_access_setup_common(struct torture_context *tctx
 		"Error connecting to server");
 
 	torture_assert(tctx,
-		test_EnumPrinters_findone(tctx, spoolss_pipe->binding_handle, &printername),
+		test_EnumPrinters_findone(tctx, spoolss_pipe, &printername),
 		"failed to enumerate printers");
 
 	if (t->user.sd) {
diff --git a/source4/torture/rpc/spoolss_notify.c b/source4/torture/rpc/spoolss_notify.c
index 9fa6b63..26faf0a 100644
--- a/source4/torture/rpc/spoolss_notify.c
+++ b/source4/torture/rpc/spoolss_notify.c
@@ -372,25 +372,6 @@ static bool test_RouterRefreshPrinterChangeNotify(struct torture_context *tctx,
 	return true;
 }
 
-static bool test_ClosePrinter(struct torture_context *tctx,
-			      struct dcerpc_binding_handle *b,
-			      struct policy_handle *handle)
-{
-	struct spoolss_ClosePrinter r;
-
-	r.in.handle = handle;
-	r.out.handle = handle;
-
-	torture_comment(tctx, "Testing ClosePrinter\n");
-
-	torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_ClosePrinter_r(b, tctx, &r),
-		"ClosePrinter failed");
-	torture_assert_werr_ok(tctx, r.out.result,
-		"ClosePrinter failed");
-
-	return true;
-}
-
 static bool test_SetPrinter(struct torture_context *tctx,
 			    struct dcerpc_pipe *p,
 			    struct policy_handle *handle)


-- 
Samba Shared Repository