From e8feca012e7b2ff29de58cef80c7511f33989a84 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 16 Jan 2013 00:04:41 +0100 Subject: spoolss: make spoolss deal with ndr64 ULONG_PTR of devmode_ptr and secdesc_ptr. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Guenther Signed-off-by: Günther Deschner Reviewed-by: David Disseldorp --- source4/torture/rpc/spoolss.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source4/torture/rpc/spoolss.c') diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index 064d3b434d..49a0be68e2 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -244,12 +244,12 @@ static bool PrinterInfo_to_SetPrinterInfo(struct torture_context *tctx, s->info2->drivername = i->info2.drivername; s->info2->comment = i->info2.comment; s->info2->location = i->info2.location; - s->info2->devmode_ptr = 0; + s->info2->devmode_ptr = NULL; s->info2->sepfile = i->info2.sepfile; s->info2->printprocessor = i->info2.printprocessor; s->info2->datatype = i->info2.datatype; s->info2->parameters = i->info2.parameters; - s->info2->secdesc_ptr = 0; + s->info2->secdesc_ptr = NULL; s->info2->attributes = i->info2.attributes; s->info2->priority = i->info2.priority; s->info2->defaultpriority = i->info2.defaultpriority; @@ -1417,8 +1417,8 @@ static bool test_SetPrinter_errors(struct torture_context *tctx, static void clear_info2(struct spoolss_SetPrinterInfoCtr *r) { if ((r->level == 2) && (r->info.info2)) { - r->info.info2->secdesc_ptr = 0; - r->info.info2->devmode_ptr = 0; + r->info.info2->secdesc_ptr = NULL; + r->info.info2->devmode_ptr = NULL; } } @@ -1883,7 +1883,7 @@ static bool test_sd_set_level(struct torture_context *tctx, case 3: { struct spoolss_SetPrinterInfo3 info3; - info3.sec_desc_ptr = 0; + info3.sec_desc_ptr = NULL; info_ctr.level = 3; info_ctr.info.info3 = &info3; @@ -2054,7 +2054,7 @@ static bool test_devmode_set_level(struct torture_context *tctx, case 8: { struct spoolss_SetPrinterInfo8 info8; - info8.devmode_ptr = 0; + info8.devmode_ptr = NULL; info_ctr.level = 8; info_ctr.info.info8 = &info8; -- cgit