summaryrefslogtreecommitdiff
path: root/source3/client
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1999-01-27 19:37:29 +0000
committerLuke Leighton <lkcl@samba.org>1999-01-27 19:37:29 +0000
commitf6c646467d3b6a4ad296e50a1bf89a36ce9551bc (patch)
treeb5d134397f1186982548c83c4dcd79fbf99a78c4 /source3/client
parent4423c27fe5ff58580add16b28f08ca693144107b (diff)
downloadsamba-f6c646467d3b6a4ad296e50a1bf89a36ce9551bc.tar.gz
samba-f6c646467d3b6a4ad296e50a1bf89a36ce9551bc.tar.bz2
samba-f6c646467d3b6a4ad296e50a1bf89a36ce9551bc.zip
set_port warning / unused / global/local variable overlap issues
cmd_svcctl.c tests got put into cvs by mistake. (This used to be commit 0ed70972d72533558f0fdd43e6ec95ac2102b9d0)
Diffstat (limited to 'source3/client')
-rw-r--r--source3/client/client.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/source3/client/client.c b/source3/client/client.c
index afee7dbbd3..830a43287e 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -1620,7 +1620,7 @@ static void process_stdin(void)
/*****************************************************
return a connection to a server
*******************************************************/
-struct cli_state *do_connect(char *server, char *share)
+struct cli_state *do_connect(char *server, char *share, int smb_port)
{
struct cli_state *c;
struct nmb_name called, calling;
@@ -1643,15 +1643,15 @@ struct cli_state *do_connect(char *server, char *share)
make_nmb_name(&calling, global_myname, 0x0, "");
make_nmb_name(&called , server, name_type, "");
- if (port == 0)
- port = 139; /* If not set, set to 139, FIXME, NUMBERS BAD */
+ if (smb_port == 0)
+ smb_port = 139; /* If not set, set to 139, FIXME, NUMBERS BAD */
again:
ip = ipzero;
if (have_ip) ip = dest_ip;
/* have to open a new connection */
- if (!(c=cli_initialise(NULL)) || (cli_set_port(c, port) == 0) ||
+ if (!(c=cli_initialise(NULL)) || (cli_set_port(c, smb_port) == 0) ||
!cli_connect(c, server_n, &ip)) {
DEBUG(0,("Connection to %s failed\n", server_n));
return NULL;
@@ -1722,7 +1722,7 @@ struct cli_state *do_connect(char *server, char *share)
****************************************************************************/
static BOOL process(char *base_directory)
{
- cli = do_connect(desthost, service);
+ cli = do_connect(desthost, service, port);
if (!cli) {
return(False);
}
@@ -1837,9 +1837,9 @@ static void get_password_file(void)
/****************************************************************************
handle a -L query
****************************************************************************/
-static int do_host_query(char *query_host, int port)
+static int do_host_query(char *query_host, int smb_port)
{
- cli = do_connect(query_host, "IPC$");
+ cli = do_connect(query_host, "IPC$", smb_port);
if (!cli)
return 1;
@@ -1855,10 +1855,10 @@ static int do_host_query(char *query_host, int port)
/****************************************************************************
handle a tar operation
****************************************************************************/
-static int do_tar_op(int port, char *base_directory)
+static int do_tar_op(int smb_port, char *base_directory)
{
int ret;
- cli = do_connect(desthost, service);
+ cli = do_connect(desthost, service, smb_port);
if (!cli)
return 1;