sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

r21164: Fix from Martin Zielinski <mz@seh.de> for EnumprinterdataEX

Browse Source 
on Vista.
Jeremy.
(This used to be commit b16707a861)
This commit is contained in:
Jeremy Allison 2007-02-05 19:32:31 +00:00 committed by Gerald (Jerry) Carter
parent 317d005142
commit 3ad849db21
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source3/rpc_server/srv_spoolss_nt.c
View File

@ -9521,6 +9521,15 @@ WERROR _spoolss_enumprinterdataex(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATAEX *q_
/* housekeeping information in the reply */
/* Fix from Martin Zielinski <mz@seh.de> - ensure
* the hand marshalled container size is a multiple
* of 4 bytes for RPC alignment.
*/
if (needed % 4) {
needed += 4-(needed % 4);
}
r_u->needed = needed;
r_u->returned = num_entries;
@ -9533,15 +9542,6 @@ WERROR _spoolss_enumprinterdataex(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATAEX *q_
r_u->ctr.size = r_u->needed;
/* Fix from Martin Zielinski <mz@seh.de> - ensure
* the hand marshalled container size is a multiple
* of 4 bytes for RPC alignment.
*/
if (needed % 4) {
r_u->ctr.size += 4-(needed % 4);
}
r_u->ctr.size_of_array = r_u->returned;
r_u->ctr.values = enum_values;