diff options
| author | Gerald Carter <jerry@samba.org> | 2000-08-14 03:17:17 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2000-08-14 03:17:17 +0000 |
| commit | e2bb0779af16fe6527ae4aa81bea3f297e503a2d (patch) | |
| tree | 2f3a130eaabaaf2b80f5c6b6dee8ef4ccb431a13 | |
| parent | 13913e2c97501039ad44a3367134805ae66d38b0 (diff) | |
| download | samba-e2bb0779af16fe6527ae4aa81bea3f297e503a2d.tar.gz samba-e2bb0779af16fe6527ae4aa81bea3f297e503a2d.tar.bz2 samba-e2bb0779af16fe6527ae4aa81bea3f297e503a2d.zip | |
fix for new_smb_io_relarraystr() and new_smb_io_relstr()
to use spool_smb_io_unistr() as this does not call prs_align()
befrore parsing the UNISTR.
Parsing a void* buffer from an RPC should not be aligned
on 4 byte boundaries. Don't think this change affects
any marshalling code, only unmarshalling...
jerry
(This used to be commit bc154e8522a75540a8504195c1e6f45739167e6b)
| -rw-r--r-- | source3/rpc_parse/parse_spoolss.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c index 42494ed76e..1b565cb2d9 100644 --- a/source3/rpc_parse/parse_spoolss.c +++ b/source3/rpc_parse/parse_spoolss.c @@ -1559,7 +1559,7 @@ static BOOL new_smb_io_relstr(char *desc, NEW_BUFFER *buffer, int depth, UNISTR return False; /* read the string */ - if (!smb_io_unistr(desc, string, ps, depth)) + if (!spoolss_smb_io_unistr(desc, string, ps, depth)) return False; if(!prs_set_offset(ps, old_offset)) @@ -1649,7 +1649,7 @@ static BOOL new_smb_io_relarraystr(char *desc, NEW_BUFFER *buffer, int depth, ui return False; do { - if (!smb_io_unistr(desc, &chaine, ps, depth)) + if (!spoolss_smb_io_unistr(desc, &chaine, ps, depth)) return False; l_chaine=str_len_uni(&chaine); |