From 6412e8eeae6b4abfb65514b00c49419a7cb97b1a Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Sat, 11 Jun 2005 03:35:28 +0000 Subject: r7482: Rename smbcli_send_tconX() to smbcli_tconX() so as not to get it confused with an async function. (This used to be commit 340ad67cada15329051c205c5b094ad641718c72) --- source4/client/smbmount.c | 3 +-- source4/libcli/cliconnect.c | 4 ++-- source4/torture/torture.c | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/source4/client/smbmount.c b/source4/client/smbmount.c index 7f73807ec6..7e9c74da57 100644 --- a/source4/client/smbmount.c +++ b/source4/client/smbmount.c @@ -228,8 +228,7 @@ static struct smbcli_state *do_connection(char *the_service) DEBUG(4,("%d: session setup ok\n", sys_getpid())); - if (!smbcli_send_tconX(c, share, "?????", - password, strlen(password)+1)) { + if (!smbcli_tconX(c, share, "?????", password, strlen(password)+1)) { DEBUG(0,("%d: tree connect failed: %s\n", sys_getpid(), smbcli_errstr(c))); smbcli_shutdown(c); diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c index ace9389ae8..a866e26970 100644 --- a/source4/libcli/cliconnect.c +++ b/source4/libcli/cliconnect.c @@ -84,8 +84,8 @@ NTSTATUS smbcli_session_setup(struct smbcli_state *cli, } /* wrapper around smb_tree_connect() */ -NTSTATUS smbcli_send_tconX(struct smbcli_state *cli, const char *sharename, - const char *devtype, const char *password) +NTSTATUS smbcli_tconX(struct smbcli_state *cli, const char *sharename, + const char *devtype, const char *password) { union smb_tcon tcon; TALLOC_CTX *mem_ctx; diff --git a/source4/torture/torture.c b/source4/torture/torture.c index c3a2f53385..3d1353450d 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -486,7 +486,7 @@ static BOOL run_tcon_test(void) } tree1 = cli->tree; /* save old tree connection */ - if (NT_STATUS_IS_ERR(smbcli_send_tconX(cli, share, "?????", password))) { + if (NT_STATUS_IS_ERR(smbcli_tconX(cli, share, "?????", password))) { printf("%s refused 2nd tree connect (%s)\n", host, smbcli_errstr(cli->tree)); smbcli_shutdown(cli); @@ -564,7 +564,7 @@ static BOOL tcon_devtest(struct smbcli_state *cli, BOOL ret; const char *password = lp_parm_string(-1, "torture", "password"); - status = NT_STATUS_IS_OK(smbcli_send_tconX(cli, myshare, devtype, + status = NT_STATUS_IS_OK(smbcli_tconX(cli, myshare, devtype, password)); printf("Trying share %s with devtype %s\n", myshare, devtype); -- cgit