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

merge from APPLIANCE_HEAD

Browse Source 
(This used to be commit f8b18b2594)
This commit is contained in:
Gerald Carter 2001-11-30 20:33:35 +00:00
parent 605248abd9
commit 9cc8cb5134
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source3/rpc_server/srv_spoolss_nt.c
View File

@ -6006,10 +6006,6 @@ WERROR _spoolss_enumprinterdata(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATA *q_u, S
ZERO_STRUCT(printer);
*out_max_value_len=0;
*out_value=NULL;
*out_value_len=0;
*out_type=0;
*out_max_data_len=0;
@ -6071,18 +6067,6 @@ WERROR _spoolss_enumprinterdata(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATA *q_u, S
param_index++;
}
/*
* I think this is correct, it doesn't break APW and
* allows Gerald's Win32 test programs to work correctly,
* but may need altering.... JRA.
*/
if (param_index == 0) {
/* No parameters found. */
free_a_printer(&printer, 2);
return WERR_NO_MORE_ITEMS;
}
/* the value is an UNICODE string but realvaluesize is the length in bytes including the leading 0 */
*out_value_len=2*(1+biggest_valuesize);
*out_data_len=biggest_datasize;
@ -6099,8 +6083,28 @@ WERROR _spoolss_enumprinterdata(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATA *q_u, S
*/
if (!get_specific_param_by_index(*printer, 2, idx, value, &data, &type, &data_len)) {
SAFE_FREE(data);
free_a_printer(&printer, 2);
/* out_value should default to "" or else NT4 has
problems unmarshalling the response */
*out_max_value_len=(in_value_len/sizeof(uint16));
if((*out_value=(uint16 *)malloc(in_value_len*sizeof(uint8))) == NULL)
return WERR_NOMEM;
ZERO_STRUCTP(*out_value);
*out_value_len = rpcstr_push((char *)*out_value, "", in_value_len, 0);
/* the data is counted in bytes */
*out_max_data_len = in_data_len;
*out_data_len = in_data_len;
if((*data_out=(uint8 *)malloc(in_data_len*sizeof(uint8))) == NULL)
return WERR_NOMEM;
memset(*data_out,'\0',in_data_len);
return WERR_NO_MORE_ITEMS;
}