summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/cliconnect.c4
-rw-r--r--source4/libcli/composite/connect.c4
-rw-r--r--source4/libcli/raw/clitree.c16
-rw-r--r--source4/libcli/util/clilsa.c2
4 files changed, 13 insertions, 13 deletions
diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index 624b54c3f2..cc02af1162 100644
--- a/source4/libcli/cliconnect.c
+++ b/source4/libcli/cliconnect.c
@@ -83,7 +83,7 @@ NTSTATUS smbcli_session_setup(struct smbcli_state *cli,
return status;
}
-/* wrapper around smb_tree_connect() */
+/* wrapper around smb_raw_tcon() */
NTSTATUS smbcli_tconX(struct smbcli_state *cli, const char *sharename,
const char *devtype, const char *password)
{
@@ -116,7 +116,7 @@ NTSTATUS smbcli_tconX(struct smbcli_state *cli, const char *sharename,
tcon.tconx.in.path = sharename;
tcon.tconx.in.device = devtype;
- status = smb_tree_connect(cli->tree, mem_ctx, &tcon);
+ status = smb_raw_tcon(cli->tree, mem_ctx, &tcon);
cli->tree->tid = tcon.tconx.out.tid;
diff --git a/source4/libcli/composite/connect.c b/source4/libcli/composite/connect.c
index d6d87380ec..adac9bcf67 100644
--- a/source4/libcli/composite/connect.c
+++ b/source4/libcli/composite/connect.c
@@ -77,7 +77,7 @@ static NTSTATUS connect_tcon(struct composite_context *c,
struct connect_state *state = talloc_get_type(c->private, struct connect_state);
NTSTATUS status;
- status = smb_tree_connect_recv(state->req, c, state->io_tcon);
+ status = smb_raw_tcon_recv(state->req, c, state->io_tcon);
NT_STATUS_NOT_OK_RETURN(status);
io->out.tree->tid = state->io_tcon->tconx.out.tid;
@@ -134,7 +134,7 @@ static NTSTATUS connect_session_setup(struct composite_context *c,
state->io_tcon->tconx.in.device = io->in.service_type;
}
- state->req = smb_tree_connect_send(io->out.tree, state->io_tcon);
+ state->req = smb_raw_tcon_send(io->out.tree, state->io_tcon);
NT_STATUS_HAVE_NO_MEMORY(state->req);
state->req->async.fn = request_handler;
diff --git a/source4/libcli/raw/clitree.c b/source4/libcli/raw/clitree.c
index 76cb1a43fe..25f346ef5d 100644
--- a/source4/libcli/raw/clitree.c
+++ b/source4/libcli/raw/clitree.c
@@ -56,8 +56,8 @@ struct smbcli_tree *smbcli_tree_init(struct smbcli_session *session,
/****************************************************************************
Send a tconX (async send)
****************************************************************************/
-struct smbcli_request *smb_tree_connect_send(struct smbcli_tree *tree,
- union smb_tcon *parms)
+struct smbcli_request *smb_raw_tcon_send(struct smbcli_tree *tree,
+ union smb_tcon *parms)
{
struct smbcli_request *req = NULL;
@@ -92,8 +92,8 @@ struct smbcli_request *smb_tree_connect_send(struct smbcli_tree *tree,
/****************************************************************************
Send a tconX (async recv)
****************************************************************************/
-NTSTATUS smb_tree_connect_recv(struct smbcli_request *req, TALLOC_CTX *mem_ctx,
- union smb_tcon *parms)
+NTSTATUS smb_raw_tcon_recv(struct smbcli_request *req, TALLOC_CTX *mem_ctx,
+ union smb_tcon *parms)
{
uint8_t *p;
@@ -134,11 +134,11 @@ failed:
/****************************************************************************
Send a tconX (sync interface)
****************************************************************************/
-NTSTATUS smb_tree_connect(struct smbcli_tree *tree, TALLOC_CTX *mem_ctx,
- union smb_tcon *parms)
+NTSTATUS smb_raw_tcon(struct smbcli_tree *tree, TALLOC_CTX *mem_ctx,
+ union smb_tcon *parms)
{
- struct smbcli_request *req = smb_tree_connect_send(tree, parms);
- return smb_tree_connect_recv(req, mem_ctx, parms);
+ struct smbcli_request *req = smb_raw_tcon_send(tree, parms);
+ return smb_raw_tcon_recv(req, mem_ctx, parms);
}
diff --git a/source4/libcli/util/clilsa.c b/source4/libcli/util/clilsa.c
index ad2006756b..f5de5014e3 100644
--- a/source4/libcli/util/clilsa.c
+++ b/source4/libcli/util/clilsa.c
@@ -69,7 +69,7 @@ static NTSTATUS smblsa_connect(struct smbcli_state *cli)
tcon.tconx.in.password = data_blob(NULL, 0);
tcon.tconx.in.path = "ipc$";
tcon.tconx.in.device = "IPC";
- status = smb_tree_connect(lsa->ipc_tree, lsa, &tcon);
+ status = smb_raw_tcon(lsa->ipc_tree, lsa, &tcon);
if (!NT_STATUS_IS_OK(status)) {
talloc_free(lsa);
return status;