diff options
| author | Jeremy Allison <jra@samba.org> | 2000-11-22 01:26:09 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-11-22 01:26:09 +0000 |
| commit | 6003be4856d3cecc444e5b1d6daa25843b4ca2dc (patch) | |
| tree | 68e788d8a66ef06fb48c7f36feb7547439bb4833 | |
| parent | 7254a66e00f47578ebcb207368a7e33dede31c22 (diff) | |
| download | samba-6003be4856d3cecc444e5b1d6daa25843b4ca2dc.tar.gz samba-6003be4856d3cecc444e5b1d6daa25843b4ca2dc.tar.bz2 samba-6003be4856d3cecc444e5b1d6daa25843b4ca2dc.zip | |
ADDPRINTERDRIVER info level 6 fix - this is dynamic depending
on a field in the struct - that's why it was so hard to find.
Jeremy.
(This used to be commit 0ab6eb01b0d15e5eb744333d2bd79c27451f50e3)
| -rw-r--r-- | source3/rpc_parse/parse_spoolss.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c index fb6ce219e0..e3d9f896f5 100644 --- a/source3/rpc_parse/parse_spoolss.c +++ b/source3/rpc_parse/parse_spoolss.c @@ -4340,13 +4340,15 @@ BOOL spool_io_printer_driver_info_level_6(char *desc, SPOOL_PRINTER_DRIVER_INFO_ if(!prs_uint32("version", ps, depth, &il->version)) return False; -#if 0 - /* - * Older build versions of W2K seem to need this. JRA. - */ - if(!prs_uint32("dummy4", ps, depth, &il->dummy4)) - return False; -#endif + if (il->version != 0) { + /* + * If version != 0 then there are an extra 4 bytes. + * JohnR and I have verified this at Roseville... JRA. + */ + if(!prs_uint32("dummy4", ps, depth, &il->dummy4)) + return False; + } + if(!prs_uint32("name_ptr", ps, depth, &il->name_ptr)) return False; if(!prs_uint32("environment_ptr", ps, depth, &il->environment_ptr)) |