diff options
| author | Jeremy Allison <jra@samba.org> | 2000-11-10 19:36:34 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-11-10 19:36:34 +0000 |
| commit | c1900772ce6fdedc5c380d88f3640107d52e2096 (patch) | |
| tree | 2751cd4bb9ffd370f8651f941c83b4a488e1787d /source3/rpc_parse | |
| parent | 3c330068adb081499285d20c8d299d7f70aaf603 (diff) | |
| download | samba-c1900772ce6fdedc5c380d88f3640107d52e2096.tar.gz samba-c1900772ce6fdedc5c380d88f3640107d52e2096.tar.bz2 samba-c1900772ce6fdedc5c380d88f3640107d52e2096.zip | |
printing/nt_printing.c: use getpwuid not smbgetpwuid. Canonicalize printernames.
printing/printing.c: Insure fix for malloc of zero.
rpc_parse/parse_misc.c: Enusre UNISTR's are zero filled.
rpc_parse/parse_spoolss.c: Correct INFO_6 - differs between pre-releases of W2K and shipping build.
rpc_server/srv_spoolss_nt.c: Canonicalize printernames.
Jeremy.
(This used to be commit b17e23a8ff2b44540726968355a4b7e26f244f3b)
Diffstat (limited to 'source3/rpc_parse')
| -rw-r--r-- | source3/rpc_parse/parse_misc.c | 2 | ||||
| -rw-r--r-- | source3/rpc_parse/parse_spoolss.c | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c index 93f47bbc7a..859a800771 100644 --- a/source3/rpc_parse/parse_misc.c +++ b/source3/rpc_parse/parse_misc.c @@ -494,6 +494,8 @@ void init_unistr(UNISTR *str, const char *buf) if (str->buffer == NULL) smb_panic("init_unistr: malloc fail\n"); + memset(str->buffer, '\0', len); + /* store the string (null-terminated copy) */ dos_struni2((char *)str->buffer, buf, len); } diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c index eaacb52f5b..d77cd938a8 100644 --- a/source3/rpc_parse/parse_spoolss.c +++ b/source3/rpc_parse/parse_spoolss.c @@ -4340,6 +4340,10 @@ 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 + if(!prs_uint32("dummy4", ps, depth, &il->dummy4)) + return False; +#endif if(!prs_uint32("name_ptr", ps, depth, &il->name_ptr)) return False; if(!prs_uint32("environment_ptr", ps, depth, &il->environment_ptr)) @@ -4385,30 +4389,37 @@ BOOL spool_io_printer_driver_info_level_6(char *desc, SPOOL_PRINTER_DRIVER_INFO_ return False; if(!prs_align(ps)) return False; + if(!smb_io_unistr2("environment", &il->environment, il->environment_ptr, ps, depth)) return False; if(!prs_align(ps)) return False; + if(!smb_io_unistr2("driverpath", &il->driverpath, il->driverpath_ptr, ps, depth)) return False; if(!prs_align(ps)) return False; + if(!smb_io_unistr2("datafile", &il->datafile, il->datafile_ptr, ps, depth)) return False; if(!prs_align(ps)) return False; + if(!smb_io_unistr2("configfile", &il->configfile, il->configfile_ptr, ps, depth)) return False; if(!prs_align(ps)) return False; + if(!smb_io_unistr2("helpfile", &il->helpfile, il->helpfile_ptr, ps, depth)) return False; if(!prs_align(ps)) return False; + if(!smb_io_unistr2("monitorname", &il->monitorname, il->monitorname_ptr, ps, depth)) return False; if(!prs_align(ps)) return False; + if(!smb_io_unistr2("defaultdatatype", &il->defaultdatatype, il->defaultdatatype_ptr, ps, depth)) return False; if(!prs_align(ps)) |