diff options
| author | Jean-François Micouleau <jfm@samba.org> | 1999-09-24 14:45:21 +0000 |
|---|---|---|
| committer | Jean-François Micouleau <jfm@samba.org> | 1999-09-24 14:45:21 +0000 |
| commit | 7b88001235e6228ed672541f4afd2b06b610b8e1 (patch) | |
| tree | d0f06635edeb9b9342e46c82e21303631d2cbeaf /source3/rpc_parse | |
| parent | 13266d51155f804527206f2ad125cc28751881af (diff) | |
| download | samba-7b88001235e6228ed672541f4afd2b06b610b8e1.tar.gz samba-7b88001235e6228ed672541f4afd2b06b610b8e1.tar.bz2 samba-7b88001235e6228ed672541f4afd2b06b610b8e1.zip | |
Correctly handle the dependent files in the printer_driver_info_3 struct
It means complex printer drivers should now download fine.
J.F.
(This used to be commit a893df5c00189d7e81efd619a4a4ee2bd8ead61f)
Diffstat (limited to 'source3/rpc_parse')
| -rw-r--r-- | source3/rpc_parse/parse_spoolss.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c index 7b15ba2a42..c66d176c78 100644 --- a/source3/rpc_parse/parse_spoolss.c +++ b/source3/rpc_parse/parse_spoolss.c @@ -828,15 +828,25 @@ static void smb_io_relarraystr(char *desc, prs_struct *ps, int depth, UNISTR *** uint32 relative_offset; struct_offset=ps->offset; - while ( (*buffer)[i]!=0x0000 ) { + i++; + } + + i--; + + /* that's for the ending NULL */ + *end_offset-=2; + + do + { *end_offset-= 2*(str_len_uni((*buffer)[i])+1); ps->offset=*end_offset; spoolss_smb_io_unistr(desc, (*buffer)[i], ps, depth); - i++; + i--; } + while (i>=0); ps->offset=struct_offset; relative_offset=*end_offset-*start_offset; @@ -1328,7 +1338,7 @@ static uint32 spoolss_size_printer_driver_info_3(DRIVER_INFO_3 *info) size+=2*(1+ str_len_uni( string[i] ) ); i++; } - size+=4; + size+=6; DEBUGADD(9,("size: [%d]\n", size)); return (size); |