diff options
| author | Günther Deschner <gd@samba.org> | 2009-12-02 23:38:05 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-12-08 09:15:25 +0100 |
| commit | 8842ae8afd398220b46d9d34b583e7ce094d4a78 (patch) | |
| tree | 7aa2ba3b18217153dc573c548894815ec93ac0bd /source4 | |
| parent | 45df0609f8bad804a957281869ae6bf28ed9ee3d (diff) | |
| download | samba-8842ae8afd398220b46d9d34b583e7ce094d4a78.tar.gz samba-8842ae8afd398220b46d9d34b583e7ce094d4a78.tar.xz samba-8842ae8afd398220b46d9d34b583e7ce094d4a78.zip | |
s4-smbtorture: be very strict in checking spools_EnumPrinterKey results.
Guenther
(cherry picked from commit 450211b61016a4fed71eb116c1b526af0f365f13)
(cherry picked from commit 6b8158ddfdce65e32ca39d8cc2c1d7b215cd22ff)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/torture/rpc/spoolss.c | 9 | ||||
| -rw-r--r-- | source4/torture/rpc/spoolss_win.c | 9 |
2 files changed, 15 insertions, 3 deletions
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index e341b713072..bd5c4555bd8 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -3060,6 +3060,9 @@ bool test_printer_keys(struct torture_context *tctx, torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_EnumPrinterKey(p, tctx, &r), "failed to call EnumPrinterKey"); if (W_ERROR_EQUAL(r.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)); + r.in.offered = needed; torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_EnumPrinterKey(p, tctx, &r), "failed to call EnumPrinterKey"); @@ -3067,10 +3070,14 @@ bool test_printer_keys(struct torture_context *tctx, torture_assert_werr_ok(tctx, r.out.result, "failed to call EnumPrinterKey"); + 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)); + key_array = key_buffer.string; } - for (i=0; key_array[i]; i++) { + for (i=0; key_array && key_array[i]; i++) { struct spoolss_EnumPrinterDataEx r; uint32_t count; struct spoolss_PrinterEnumValues *info; diff --git a/source4/torture/rpc/spoolss_win.c b/source4/torture/rpc/spoolss_win.c index 5439d9d57e9..83202fb82d8 100644 --- a/source4/torture/rpc/spoolss_win.c +++ b/source4/torture/rpc/spoolss_win.c @@ -399,8 +399,9 @@ static bool test_EnumPrinterKey(struct torture_context *tctx, 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, @@ -409,6 +410,10 @@ 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; return true; @@ -552,7 +557,7 @@ static bool test_WinXP(struct torture_context *tctx, struct dcerpc_pipe *p) ret &= test_EnumPrinterKey(tctx, p, &handle03, "", ctx); - for (i=0; ctx->printer_keys[i] != NULL; i++) { + for (i=0; ctx->printer_keys && ctx->printer_keys[i] != NULL; i++) { ret &= test_EnumPrinterKey(tctx, p, &handle03, ctx->printer_keys[i], |