diff options
author | Gerald Carter <jerry@samba.org> | 2003-02-21 17:04:01 +0000 |
---|---|---|
committer | Gerald Carter <jerry@samba.org> | 2003-02-21 17:04:01 +0000 |
commit | 380635538b442ee4de4d7e1242125acd5eb815fd (patch) | |
tree | bc10e84885e534874b7f394bf6dd4042f4adfe44 /source3/rpc_parse | |
parent | b0415dfd7b028d4ff355f23d388487f291ab2766 (diff) | |
download | samba-380635538b442ee4de4d7e1242125acd5eb815fd.tar.gz samba-380635538b442ee4de4d7e1242125acd5eb815fd.tar.bz2 samba-380635538b442ee4de4d7e1242125acd5eb815fd.zip |
couple of merges from APP_HEAD
* performance optimization in enumprinterdataex() when keyname is empty
* fix a few typos in comments
* reload services after addprinter_command()
dump registry data in ascii when the key is REG_SZ or REG_MULTI_SZ
(This used to be commit 3fc90ea1d9b11186f26484516a4dd8502b6d7323)
Diffstat (limited to 'source3/rpc_parse')
-rw-r--r-- | source3/rpc_parse/parse_spoolss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c index cb3b2efd9d..fb2aaf71ec 100644 --- a/source3/rpc_parse/parse_spoolss.c +++ b/source3/rpc_parse/parse_spoolss.c @@ -1372,7 +1372,7 @@ BOOL spoolss_io_r_getprinterdata(const char *desc, SPOOL_R_GETPRINTERDATA *r_u, return False; } - if (!prs_uint8s(False,"data", ps, depth, r_u->data, r_u->size)) + if (!prs_uint8s( r_u->type&(REG_SZ|REG_MULTI_SZ), "data", ps, depth, r_u->data, r_u->size )) return False; if (!prs_align(ps)) |