summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2013-01-16 00:04:41 +0100
committerDavid Disseldorp <ddiss@samba.org>2013-01-17 17:11:37 +0100
commite8feca012e7b2ff29de58cef80c7511f33989a84 (patch)
tree7c61dc531c45c4325351a65a447aa3b1c0d37945 /source3
parente1d50a6b24012b42f9987b439a4b94cd8db79999 (diff)
downloadsamba-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 'source3')
-rw-r--r--source3/printing/nt_printing_migrate.c2
-rw-r--r--source3/rpc_client/init_spoolss.c4
-rw-r--r--source3/rpcclient/cmd_spoolss.c4
3 files changed, 4 insertions, 6 deletions
diff --git a/source3/printing/nt_printing_migrate.c b/source3/printing/nt_printing_migrate.c
index 616d7af3d6..94dc3daa56 100644
--- a/source3/printing/nt_printing_migrate.c
+++ b/source3/printing/nt_printing_migrate.c
@@ -252,8 +252,6 @@ NTSTATUS printing_tdb_migrate_printer(TALLOC_CTX *mem_ctx,
}
devmode_ctr.devmode = &dm;
-
- info2.devmode_ptr = 1;
}
result = winreg_update_printer(mem_ctx, b,
diff --git a/source3/rpc_client/init_spoolss.c b/source3/rpc_client/init_spoolss.c
index 8b66227ce7..7e29cdc7ca 100644
--- a/source3/rpc_client/init_spoolss.c
+++ b/source3/rpc_client/init_spoolss.c
@@ -107,12 +107,12 @@ void spoolss_printerinfo2_to_setprinterinfo2(const struct spoolss_PrinterInfo2 *
s->drivername = i->drivername;
s->comment = i->comment;
s->location = i->location;
- s->devmode_ptr = 0;
+ s->devmode_ptr = NULL;
s->sepfile = i->sepfile;
s->printprocessor = i->printprocessor;
s->datatype = i->datatype;
s->parameters = i->parameters;
- s->secdesc_ptr = 0;
+ s->secdesc_ptr = NULL;
s->attributes = i->attributes;
s->priority = i->priority;
s->defaultpriority = i->defaultpriority;
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 52631849e0..969b747f4c 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -1796,8 +1796,8 @@ static WERROR cmd_spoolss_addprinterex(struct rpc_pipe_client *cli,
info2.comment = "Created by rpcclient";
info2.printprocessor = "winprint";
info2.datatype = "RAW";
- info2.devmode_ptr = 0;
- info2.secdesc_ptr = 0;
+ info2.devmode_ptr = NULL;
+ info2.secdesc_ptr = NULL;
info2.attributes = PRINTER_ATTRIBUTE_SHARED;
info2.priority = 0;
info2.defaultpriority = 0;