svn commit: samba r7482 - in branches/SAMBA_4_0/source: client libcli torture

[tpot at samba.org]

Author: tpot
Date: 2005-06-11 03:35:28 +0000 (Sat, 11 Jun 2005)
New Revision: 7482

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7482

Log:
Rename smbcli_send_tconX() to smbcli_tconX() so as not to get it 
confused with an async function.

Modified:
   branches/SAMBA_4_0/source/client/smbmount.c
   branches/SAMBA_4_0/source/libcli/cliconnect.c
   branches/SAMBA_4_0/source/torture/torture.c


Changeset:
Modified: branches/SAMBA_4_0/source/client/smbmount.c
===================================================================
--- branches/SAMBA_4_0/source/client/smbmount.c	2005-06-11 03:34:11 UTC (rev 7481)
+++ branches/SAMBA_4_0/source/client/smbmount.c	2005-06-11 03:35:28 UTC (rev 7482)
@@ -228,8 +228,7 @@
 
 	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);

Modified: branches/SAMBA_4_0/source/libcli/cliconnect.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/cliconnect.c	2005-06-11 03:34:11 UTC (rev 7481)
+++ branches/SAMBA_4_0/source/libcli/cliconnect.c	2005-06-11 03:35:28 UTC (rev 7482)
@@ -84,8 +84,8 @@
 }
 
 /* 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;

Modified: branches/SAMBA_4_0/source/torture/torture.c
===================================================================
--- branches/SAMBA_4_0/source/torture/torture.c	2005-06-11 03:34:11 UTC (rev 7481)
+++ branches/SAMBA_4_0/source/torture/torture.c	2005-06-11 03:35:28 UTC (rev 7482)
@@ -486,7 +486,7 @@
 	}
 
 	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 @@
 	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);