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

missed nmbsync.c when adding setup count and setup pointer arguments to

Browse Source 
cli_call_api().  sorting this for jeremy.

there is a discrepancy between the client.c list_servers() and the nmbsync.c
add_info() calls to cli_call_api() - one has an mdrcount of 1024, the other
of zero.

i don't know what difference this makes.
This commit is contained in:
Luke Leighton 0001-01-01 00:00:00 +00:00
parent 0cc8ce43e1
commit d8c265c515
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/client/client.c
View File

@ -2138,7 +2138,8 @@ static void do_cancel(int job)
SSVAL(p,0,job); SSVAL(p,0,job);
p += 2; p += 2;
if (cli_call_api(PIPE_LANMAN, PTR_DIFF(p,param),0, 6, 0, 1000, if (cli_call_api(PIPE_LANMAN, PTR_DIFF(p,param),0, 0,
6, 1000,
&rprcnt,&rdrcnt, &rprcnt,&rdrcnt,
param,NULL, NULL, param,NULL, NULL,
&rparam,&rdata)) &rparam,&rdata))
@ -2473,7 +2474,8 @@ static void cmd_p_queue_4(char *inbuf,char *outbuf )
p = skip_string(p,1); p = skip_string(p,1);
DEBUG(1,("Calling DosPrintJobEnum()...\n")); DEBUG(1,("Calling DosPrintJobEnum()...\n"));
if( cli_call_api(PIPE_LANMAN, PTR_DIFF(p,param), 0, 10, 0, 4096, if( cli_call_api(PIPE_LANMAN, PTR_DIFF(p,param), 0,
10, 0, 4096,
&rprcnt, &rdrcnt, &rprcnt, &rdrcnt,
param, NULL, NULL, param, NULL, NULL,
&rparam, &rdata) ) &rparam, &rdata) )
@ -2579,7 +2581,8 @@ static void cmd_qinfo(char *inbuf,char *outbuf )
p = skip_string(p,1); p = skip_string(p,1);
DEBUG(1,("Calling DosPrintQueueGetInfo()...\n")); DEBUG(1,("Calling DosPrintQueueGetInfo()...\n"));
if( cli_call_api(PIPE_LANMAN, PTR_DIFF(p,param), 0, 10, 0, 4096, if( cli_call_api(PIPE_LANMAN, PTR_DIFF(p,param), 0, 0,
10, 4096,
&rprcnt, &rdrcnt, &rprcnt, &rdrcnt,
param, NULL, NULL, param, NULL, NULL,
&rparam, &rdata) ) &rparam, &rdata) )
@ -2974,7 +2977,8 @@ static BOOL browse_host(BOOL sort)
SSVAL(p,2,BUFFER_SIZE); SSVAL(p,2,BUFFER_SIZE);
p += 4; p += 4;
if (cli_call_api(PIPE_LANMAN, PTR_DIFF(p,param),0, 1024, 0, BUFFER_SIZE, if (cli_call_api(PIPE_LANMAN, PTR_DIFF(p,param),0, 0,
1024, BUFFER_SIZE,
&rprcnt,&rdrcnt, &rprcnt,&rdrcnt,
param,NULL, NULL, param,NULL, NULL,
&rparam,&rdata)) &rparam,&rdata))
@ -3065,7 +3069,8 @@ static void server_info()
SSVAL(p,2,1000); SSVAL(p,2,1000);
p += 6; p += 6;
if (cli_call_api(PIPE_LANMAN, PTR_DIFF(p,param),0, 6, 0, 1000, if (cli_call_api(PIPE_LANMAN, PTR_DIFF(p,param),0, 0,
6, 1000,
&rprcnt,&rdrcnt, &rprcnt,&rdrcnt,
param,NULL, NULL, param,NULL, NULL,
&rparam,&rdata)) &rparam,&rdata))
@ -3139,8 +3144,8 @@ static BOOL list_servers(char *wk_grp)
/* first ask for a list of servers in this workgroup */ /* first ask for a list of servers in this workgroup */
SIVAL(svtype_p,0,SV_TYPE_ALL); SIVAL(svtype_p,0,SV_TYPE_ALL);
if (cli_call_api(PIPE_LANMAN, PTR_DIFF(p+4,param),0, 8, 0, if (cli_call_api(PIPE_LANMAN, PTR_DIFF(p+4,param),0, 0,
BUFFER_SIZE - SAFETY_MARGIN, 8, BUFFER_SIZE - SAFETY_MARGIN,
&rprcnt,&rdrcnt, &rprcnt,&rdrcnt,
param,NULL, NULL, param,NULL, NULL,
&rparam,&rdata)) &rparam,&rdata))
@ -3178,8 +3183,8 @@ static BOOL list_servers(char *wk_grp)
/* now ask for a list of workgroups */ /* now ask for a list of workgroups */
SIVAL(svtype_p,0,SV_TYPE_DOMAIN_ENUM); SIVAL(svtype_p,0,SV_TYPE_DOMAIN_ENUM);
if (cli_call_api(PIPE_LANMAN, PTR_DIFF(p+4,param),0, 8, 0, if (cli_call_api(PIPE_LANMAN, PTR_DIFF(p+4,param),0, 0,
BUFFER_SIZE - SAFETY_MARGIN, 8, BUFFER_SIZE - SAFETY_MARGIN,
&rprcnt,&rdrcnt, &rprcnt,&rdrcnt,
param,NULL, NULL, param,NULL, NULL,
&rparam,&rdata)) &rparam,&rdata))

11
source/nmbsync.c
View File

@ -82,9 +82,14 @@ static BOOL add_info(struct subnet_record *d, struct work_record *work, int serv
pstrcpy(p, work->work_group); pstrcpy(p, work->work_group);
p = skip_string(p,1); p = skip_string(p,1);
if (cli_call_api(PIPE_LANMAN, PTR_DIFF(p,param),0, 8, if (cli_call_api(PIPE_LANMAN,
BUFFER_SIZE - SAFETY_MARGIN, PTR_DIFF(p,param), /* param count */
&rprcnt,&rdrcnt, param,NULL, 8, /*data count */,
0, /* setup count */,
0, /* mprcount - whatever that is */
BUFFER_SIZE - SAFETY_MARGIN, /* mdrcount - whatever that is */
&rprcnt,&rdrcnt,
param,NULL, NULL,
&rparam,&rdata)) &rparam,&rdata))
{ {
int res = SVAL(rparam,0); int res = SVAL(rparam,0);