From 310536a709ccbfbcb3148f5662d5e89da993f7cd Mon Sep 17 00:00:00 2001
From: Luke Leighton <lkcl@samba.org>
Date: Thu, 23 Oct 1997 17:54:21 +0000
Subject: missed nmbsync.c when adding setup count and setup pointer arguments
 to 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 used to be commit d8c265c515985414962bb5187c9f92d016281dcc)
---
 source3/client/client.c | 23 ++++++++++++++---------
 source3/nmbsync.c       | 11 ++++++++---
 2 files changed, 22 insertions(+), 12 deletions(-)

(limited to 'source3')

diff --git a/source3/client/client.c b/source3/client/client.c
index 0e6c1c384a..59dd7bc7e5 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -2138,7 +2138,8 @@ static void do_cancel(int job)
   SSVAL(p,0,job);     
   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,
 	       param,NULL, NULL,
 	       &rparam,&rdata))
@@ -2473,7 +2474,8 @@ static void cmd_p_queue_4(char *inbuf,char *outbuf )
   p = skip_string(p,1);
 
   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,
                param, NULL, NULL,
                &rparam, &rdata) )
@@ -2579,7 +2581,8 @@ static void cmd_qinfo(char *inbuf,char *outbuf )
   p = skip_string(p,1);
 
   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,
 	       param, NULL, NULL,
 	       &rparam, &rdata) )
@@ -2974,7 +2977,8 @@ static BOOL browse_host(BOOL sort)
   SSVAL(p,2,BUFFER_SIZE);
   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,
 	       param,NULL, NULL,
 	       &rparam,&rdata))
@@ -3065,7 +3069,8 @@ static void server_info()
   SSVAL(p,2,1000);
   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,
 	       param,NULL, NULL,
 	       &rparam,&rdata))
@@ -3139,8 +3144,8 @@ static BOOL list_servers(char *wk_grp)
   /* first ask for a list of servers in this workgroup */
   SIVAL(svtype_p,0,SV_TYPE_ALL);
 
-  if (cli_call_api(PIPE_LANMAN, PTR_DIFF(p+4,param),0, 8, 0,
-           BUFFER_SIZE - SAFETY_MARGIN,
+  if (cli_call_api(PIPE_LANMAN, PTR_DIFF(p+4,param),0, 0,
+           8, BUFFER_SIZE - SAFETY_MARGIN,
 	       &rprcnt,&rdrcnt,
 	       param,NULL, NULL,
 	       &rparam,&rdata))
@@ -3178,8 +3183,8 @@ static BOOL list_servers(char *wk_grp)
   /* now ask for a list of workgroups */
   SIVAL(svtype_p,0,SV_TYPE_DOMAIN_ENUM);
 
-  if (cli_call_api(PIPE_LANMAN, PTR_DIFF(p+4,param),0, 8, 0,
-           BUFFER_SIZE - SAFETY_MARGIN,
+  if (cli_call_api(PIPE_LANMAN, PTR_DIFF(p+4,param),0, 0,
+           8, BUFFER_SIZE - SAFETY_MARGIN,
 	       &rprcnt,&rdrcnt,
 	       param,NULL, NULL,
 	       &rparam,&rdata))
diff --git a/source3/nmbsync.c b/source3/nmbsync.c
index e6061c0a0f..c922c8b833 100644
--- a/source3/nmbsync.c
+++ b/source3/nmbsync.c
@@ -82,9 +82,14 @@ static BOOL add_info(struct subnet_record *d, struct work_record *work, int serv
   pstrcpy(p, work->work_group);
   p = skip_string(p,1);
   
-  if (cli_call_api(PIPE_LANMAN, PTR_DIFF(p,param),0, 8,
-           BUFFER_SIZE - SAFETY_MARGIN,
-		   &rprcnt,&rdrcnt, param,NULL,
+  if (cli_call_api(PIPE_LANMAN,
+           PTR_DIFF(p,param), /* param count */
+           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))
     {
       int res = SVAL(rparam,0);
-- 
cgit