summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-03-14 01:36:31 +0100
committerGünther Deschner <gd@samba.org>2009-03-17 10:58:22 +0100
commitc6e3e5eabc6de32117ce7d5403948e9ab739e4eb (patch)
tree84c856d90ddd77fd3f4a8a30b9976bbef300c568
parente56be5cf847e758794687706a5f2ba4261b0c270 (diff)
downloadsamba-c6e3e5eabc6de32117ce7d5403948e9ab739e4eb.tar.gz
samba-c6e3e5eabc6de32117ce7d5403948e9ab739e4eb.tar.bz2
samba-c6e3e5eabc6de32117ce7d5403948e9ab739e4eb.zip
s4-smbtorture: fix test_GetPrinterData tests after out pointer changes.
Guenther
-rw-r--r--source4/torture/rpc/spoolss.c2
-rw-r--r--source4/torture/rpc/spoolss_win.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index f8029b246b..9e02c90396 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -1338,12 +1338,14 @@ static bool test_GetPrinterData(struct torture_context *tctx,
struct spoolss_GetPrinterData r;
uint32_t needed;
enum spoolss_PrinterDataType type;
+ union spoolss_PrinterData data;
r.in.handle = handle;
r.in.value_name = value_name;
r.in.offered = 0;
r.out.needed = &needed;
r.out.type = &type;
+ r.out.data = &data;
torture_comment(tctx, "Testing GetPrinterData\n");
diff --git a/source4/torture/rpc/spoolss_win.c b/source4/torture/rpc/spoolss_win.c
index add06522c6..1f22c39842 100644
--- a/source4/torture/rpc/spoolss_win.c
+++ b/source4/torture/rpc/spoolss_win.c
@@ -157,6 +157,7 @@ static bool test_GetPrinterData(struct torture_context *tctx,
struct spoolss_GetPrinterData gpd;
uint32_t needed;
enum spoolss_PrinterDataType type;
+ union spoolss_PrinterData data;
torture_comment(tctx, "Testing GetPrinterData(%s).\n", value_name);
gpd.in.handle = handle;
@@ -164,6 +165,7 @@ static bool test_GetPrinterData(struct torture_context *tctx,
gpd.in.offered = 4;
gpd.out.needed = &needed;
gpd.out.type = &type;
+ gpd.out.data = &data;
status = dcerpc_spoolss_GetPrinterData(p, tctx, &gpd);
torture_assert_ntstatus_ok(tctx, status, "GetPrinterData failed.");
@@ -171,7 +173,7 @@ static bool test_GetPrinterData(struct torture_context *tctx,
"GetPrinterData did not return expected error value.");
if (W_ERROR_IS_OK(expected_werr)) {
- torture_assert_int_equal(tctx, gpd.out.data.value,
+ torture_assert_int_equal(tctx, data.value,
expected_value,
"GetPrinterData did not return expected value.");
}