diff options
| author | Günther Deschner <gd@samba.org> | 2013-01-16 00:04:41 +0100 |
|---|---|---|
| committer | David Disseldorp <ddiss@samba.org> | 2013-01-17 17:11:37 +0100 |
| commit | e8feca012e7b2ff29de58cef80c7511f33989a84 (patch) | |
| tree | 7c61dc531c45c4325351a65a447aa3b1c0d37945 /source4 | |
| parent | e1d50a6b24012b42f9987b439a4b94cd8db79999 (diff) | |
| download | samba-e8feca012e7b2ff29de58cef80c7511f33989a84.tar.gz samba-e8feca012e7b2ff29de58cef80c7511f33989a84.tar.bz2 samba-e8feca012e7b2ff29de58cef80c7511f33989a84.zip | |
spoolss: make spoolss deal with ndr64 ULONG_PTR of devmode_ptr and secdesc_ptr.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/torture/rpc/spoolss.c | 12 | ||||
| -rw-r--r-- | source4/torture/rpc/spoolss_notify.c | 4 |
2 files changed, 8 insertions, 8 deletions
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; diff --git a/source4/torture/rpc/spoolss_notify.c b/source4/torture/rpc/spoolss_notify.c index ea05d9bd1c..0bf987d1d9 100644 --- a/source4/torture/rpc/spoolss_notify.c +++ b/source4/torture/rpc/spoolss_notify.c @@ -389,12 +389,12 @@ static bool test_SetPrinter(struct torture_context *tctx, info2.drivername = info.info2.drivername; info2.comment = talloc_asprintf(tctx, "torture_comment %d\n", (int)time(NULL)); info2.location = info.info2.location; - info2.devmode_ptr = 0; + info2.devmode_ptr = NULL; info2.sepfile = info.info2.sepfile; info2.printprocessor = info.info2.printprocessor; info2.datatype = info.info2.datatype; info2.parameters = info.info2.parameters; - info2.secdesc_ptr = 0; + info2.secdesc_ptr = NULL; info2.attributes = info.info2.attributes; info2.priority = info.info2.priority; info2.defaultpriority = info.info2.defaultpriority; |