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

Fixed the printerdata code to return NO_MORE_ITEMS if a size is requested

Browse Source 
and the parameter index doesn't exist. I think this code can be simplified
considerably, but JF needs to check to be sure.
Jeremy.
(This used to be commit 4d792e6bcb)
This commit is contained in:
Jeremy Allison 2000-09-07 20:56:24 +00:00
parent 6ef7bf0eac
commit 8808c4e6c8
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source3/rpc_server/srv_spoolss_nt.c
View File

@ -4525,7 +4525,25 @@ uint32 _spoolss_enumprinterdata(POLICY_HND *handle, uint32 idx,
*/
if ( (in_value_len==0) && (in_data_len==0) ) {
DEBUGADD(6,("Activating NT mega-hack to find sizes\n"));
/*
* NT can ask for a specific parameter size - we need to return NO_MORE_ITEMS
* if this parameter size doesn't exist.
* Ok - my opinion here is that the client is not asking for the greatest
* possible size of all the parameters, but is asking specifically for the size needed
* for this specific parameter. In that case we can remove the loop below and
* simplify this lookup code considerably. JF - comments welcome. JRA.
*/
if (!get_specific_param_by_index(*printer, 2, idx, value, &data, &type, &data_len)) {
safe_free(data);
free_a_printer(&printer, 2);
return ERROR_NO_MORE_ITEMS;
}
safe_free(data);
data = NULL;
param_index=0;
biggest_valuesize=0;
biggest_datasize=0;
@ -4537,6 +4555,7 @@ uint32 _spoolss_enumprinterdata(POLICY_HND *handle, uint32 idx,
DEBUG(6,("current values: [%d], [%d]\n", biggest_valuesize, biggest_datasize));
safe_free(data);
data = NULL;
param_index++;
}