summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-02-14 17:17:32 +0000
committerJeremy Allison <jra@samba.org>2007-02-14 17:17:32 +0000
commite8a08de8edf9cb1b4882889c9085b1dc8d3965eb (patch)
treef331883af1494d390781d258b5ea908b71e460d1
parente95a5ab05ef88975f6cd9542bb8bebec64a37d6b (diff)
downloadsamba-e8a08de8edf9cb1b4882889c9085b1dc8d3965eb.tar.gz
samba-e8a08de8edf9cb1b4882889c9085b1dc8d3965eb.tar.xz
samba-e8a08de8edf9cb1b4882889c9085b1dc8d3965eb.zip
r21346: FIXME ! Our parsing here is wrong I think,
but for a level3 it makes no sense for ptr_sec_desc to be NULL. JRA. Based on a Vista sniff from Martin Zielinski <mz@seh.de>. Jerry - part of the Vista patchset. Jeremy.
-rw-r--r--source/rpc_parse/parse_spoolss.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/source/rpc_parse/parse_spoolss.c b/source/rpc_parse/parse_spoolss.c
index 5488d468f2d..90c47950af7 100644
--- a/source/rpc_parse/parse_spoolss.c
+++ b/source/rpc_parse/parse_spoolss.c
@@ -3917,7 +3917,16 @@ BOOL spoolss_io_q_setprinter(const char *desc, SPOOL_Q_SETPRINTER *q_u, prs_stru
}
case 3:
{
- ptr_sec_desc = q_u->info.info_3->secdesc_ptr;
+ /* FIXME ! Our parsing here is wrong I think,
+ * but for a level3 it makes no sense for
+ * ptr_sec_desc to be NULL. JRA. Based on
+ * a Vista sniff from Martin Zielinski <mz@seh.de>.
+ */
+ if (UNMARSHALLING(ps)) {
+ ptr_sec_desc = 1;
+ } else {
+ ptr_sec_desc = q_u->info.info_3->secdesc_ptr;
+ }
break;
}
}