[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-469-g5136420

[Günther Deschner]

The branch, v3-4-test has been updated
       via  513642018acf1c3690bc35e1d0c6f52177ef511c (commit)
      from  6f87c105748689bf1e902b83603e57c12f7edce3 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 513642018acf1c3690bc35e1d0c6f52177ef511c
Author: Günther Deschner <gd at samba.org>
Date:   Wed Mar 18 01:39:49 2009 +0100

    s4-smbtorture: fix spoolss_EnumPrinterDataEx tests.
    
    sorry, I could swear this did compile...
    
    Guenther
    (cherry picked from commit 6e52c232c7c761a7b7d0ea4ec94214f580a481a7)

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

Summary of changes:
 source4/torture/rpc/spoolss.c     |    3 ++-
 source4/torture/rpc/spoolss_win.c |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index c16def0..2bdcc3f 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -1463,6 +1463,7 @@ static bool test_EnumPrinterDataEx(struct torture_context *tctx,
 {
 	NTSTATUS status;
 	struct spoolss_EnumPrinterDataEx r;
+	struct spoolss_PrinterEnumValues *info;
 	uint32_t needed;
 	uint32_t count;
 
@@ -1471,6 +1472,7 @@ static bool test_EnumPrinterDataEx(struct torture_context *tctx,
 	r.in.offered = 0;
 	r.out.needed = &needed;
 	r.out.count = &count;
+	r.out.info = &info;
 
 	torture_comment(tctx, "Testing EnumPrinterDataEx\n");
 
@@ -1478,7 +1480,6 @@ static bool test_EnumPrinterDataEx(struct torture_context *tctx,
 	torture_assert_ntstatus_ok(tctx, status, "EnumPrinterDataEx failed");
 
 	r.in.offered = needed;
-	r.out.buffer = talloc_array(tctx, uint8_t, needed);
 
 	status = dcerpc_spoolss_EnumPrinterDataEx(p, tctx, &r);
 
diff --git a/source4/torture/rpc/spoolss_win.c b/source4/torture/rpc/spoolss_win.c
index 71c1ce9..5624e68 100644
--- a/source4/torture/rpc/spoolss_win.c
+++ b/source4/torture/rpc/spoolss_win.c
@@ -405,6 +405,7 @@ static bool test_EnumPrinterDataEx(struct torture_context *tctx,
 {
 	NTSTATUS status;
 	struct spoolss_EnumPrinterDataEx epde;
+	struct spoolss_PrinterEnumValues *info;
 	uint32_t needed;
 	uint32_t count;
 
@@ -415,13 +416,12 @@ static bool test_EnumPrinterDataEx(struct torture_context *tctx,
 	epde.in.offered = 0;
 	epde.out.needed = &needed;
 	epde.out.count = &count;
-	epde.out.buffer = talloc_array(tctx, uint8_t, 0);
+	epde.out.info = &info;
 
 	status = dcerpc_spoolss_EnumPrinterDataEx(p, tctx, &epde);
 	torture_assert_ntstatus_ok(tctx, status, "EnumPrinterDataEx failed.");
 	if (W_ERROR_EQUAL(epde.out.result, WERR_MORE_DATA)) {
 		epde.in.offered = needed;
-		epde.out.buffer = talloc_array(tctx, uint8_t, needed);
 		status = dcerpc_spoolss_EnumPrinterDataEx(p, tctx, &epde);
 		torture_assert_ntstatus_ok(tctx, status,
 				"EnumPrinterDataEx failed.");


-- 
Samba Shared Repository