[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  f385f4a... s4-smbtorture: hand down printername to test_SetPrinterDataEx_matrix.
       via  c5fb655... s4-smbtorture: add more paranoid checks for REG_DWORD SetPrinterDataEx tests.
      from  65f453c... s4-smbtorture: remove check for selfmade parsing artefact.

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


- Log -----------------------------------------------------------------
commit f385f4aeb0e74fc87a22927a23b2289a038af98d
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 5 14:03:03 2010 +0100

    s4-smbtorture: hand down printername to test_SetPrinterDataEx_matrix.
    
    Guenther

commit c5fb6551d92f50ee7b29d330b4458e8a4224be20
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 5 00:56:52 2010 +0100

    s4-smbtorture: add more paranoid checks for REG_DWORD SetPrinterDataEx tests.
    
    Guenther

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

Summary of changes:
 source4/torture/rpc/spoolss.c |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index e03ebc5..1bf77c9 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -3261,7 +3261,8 @@ static bool test_SetPrinterDataEx(struct torture_context *tctx,
 
 static bool test_SetPrinterDataEx_matrix(struct torture_context *tctx,
 					 struct dcerpc_pipe *p,
-					 struct policy_handle *handle)
+					 struct policy_handle *handle,
+					 const char *printername)
 {
 	const char *value_name = "dog";
 	const char *keys[] = {
@@ -3290,7 +3291,6 @@ static bool test_SetPrinterDataEx_matrix(struct torture_context *tctx,
 		REG_DWORD,
 		REG_BINARY
 	};
-	uint32_t value = 12345678;
 	const char *str = "abcdefghijklmnopqrstuvwxzy";
 	int i, t, s;
 
@@ -3309,20 +3309,12 @@ static bool test_SetPrinterDataEx_matrix(struct torture_context *tctx,
 		uint8_t *data_out;
 		uint32_t needed, offered = 0;
 
-		if (types[t] == REG_DWORD) {
-			s = 0xffff;
-		}
-
 		switch (types[t]) {
 		case REG_BINARY:
+		case REG_DWORD:
 			data = blob;
 			offered = blob.length;
 			break;
-		case REG_DWORD:
-			data = data_blob(NULL, 4);
-			SIVAL(data.data, 0, value);
-			offered = 4;
-			break;
 		case REG_SZ:
 			torture_assert(tctx,
 				reg_string_to_val(tctx, lp_iconv_convenience(tctx->lp_ctx),
@@ -3805,7 +3797,7 @@ static bool test_OpenPrinterEx(struct torture_context *tctx,
 		ret = false;
 	}
 
-	if (!test_SetPrinterDataEx_matrix(tctx, p, &handle)) {
+	if (!test_SetPrinterDataEx_matrix(tctx, p, &handle, name)) {
 		ret = false;
 	}
 
@@ -4584,7 +4576,7 @@ static bool test_one_printer(struct torture_context *tctx,
 		ret = false;
 	}
 
-	if (!test_SetPrinterDataEx_matrix(tctx, p, handle)) {
+	if (!test_SetPrinterDataEx_matrix(tctx, p, handle, name)) {
 		ret = false;
 	}
 


-- 
Samba Shared Repository