diff options
| author | Günther Deschner <gd@samba.org> | 2009-12-10 14:21:12 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-12-10 17:48:50 +0100 |
| commit | ce33967f4a6a762e97a87513df7d33716db689fb (patch) | |
| tree | e515e21f3a489cf221275fe084951cb123a95987 /source4/torture/rpc/spoolss_win.c | |
| parent | f20effc437970d826c5bd4f047ff47e23e7a1a73 (diff) | |
| download | samba-ce33967f4a6a762e97a87513df7d33716db689fb.tar.gz samba-ce33967f4a6a762e97a87513df7d33716db689fb.tar.bz2 samba-ce33967f4a6a762e97a87513df7d33716db689fb.zip | |
s4-smbtorture: fix and extend enum printerkey test.
Guenther
Diffstat (limited to 'source4/torture/rpc/spoolss_win.c')
| -rw-r--r-- | source4/torture/rpc/spoolss_win.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/source4/torture/rpc/spoolss_win.c b/source4/torture/rpc/spoolss_win.c index 8856729adc..e9ba8b19be 100644 --- a/source4/torture/rpc/spoolss_win.c +++ b/source4/torture/rpc/spoolss_win.c @@ -384,7 +384,8 @@ static bool test_EnumPrinterKey(struct torture_context *tctx, NTSTATUS status; struct spoolss_EnumPrinterKey epk; uint32_t needed = 0; - struct spoolss_StringArray2 key_buffer; + union spoolss_KeyNames key_buffer; + uint32_t _ndr_size; torture_comment(tctx, "Testing EnumPrinterKey(%s)\n", key); @@ -393,13 +394,12 @@ static bool test_EnumPrinterKey(struct torture_context *tctx, epk.in.offered = 0; epk.out.needed = &needed; epk.out.key_buffer = &key_buffer; + epk.out._ndr_size = &_ndr_size; status = dcerpc_spoolss_EnumPrinterKey(p, tctx, &epk); torture_assert_ntstatus_ok(tctx, status, "EnumPrinterKey failed"); if (W_ERROR_EQUAL(epk.out.result, WERR_MORE_DATA)) { - torture_assert(tctx, (key_buffer._ndr_size == 0), - talloc_asprintf(tctx, "EnumPrinterKey did not return 0 _ndr_size (but %d), windows clients would abort here!", key_buffer._ndr_size)); epk.in.offered = needed; status = dcerpc_spoolss_EnumPrinterKey(p, tctx, &epk); torture_assert_ntstatus_ok(tctx, status, @@ -408,11 +408,7 @@ static bool test_EnumPrinterKey(struct torture_context *tctx, torture_assert_werr_ok(tctx, epk.out.result, "EnumPrinterKey failed"); - torture_assert(tctx, (key_buffer._ndr_size * 2 == needed), - talloc_asprintf(tctx, "EnumPrinterKey size mismatch, _ndr_size %d (expected %d)", - key_buffer._ndr_size, needed/2)); - - ctx->printer_keys = key_buffer.string; + ctx->printer_keys = key_buffer.string_array; return true; } |