From 592fce7fb149ca5e82b14d9c8f13a4da1babe2b7 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 13 Jan 2005 18:49:10 +0000
Subject: r4726: - use the name tcon and tid instead of conn and cnum

- make use of talloc destructors

metze
(This used to be commit 8308da6ce4a95f8c10e22949ef00e9e64f2dbb85)
---
 source4/libcli/cliconnect.c  | 2 +-
 source4/libcli/raw/clitree.c | 6 +++---
 source4/libcli/util/clilsa.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'source4/libcli')

diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index 6185ba7b7d..a0ba5ae0a1 100644
--- a/source4/libcli/cliconnect.c
+++ b/source4/libcli/cliconnect.c
@@ -140,7 +140,7 @@ NTSTATUS smbcli_send_tconX(struct smbcli_state *cli, const char *sharename,
 	
 	status = smb_tree_connect(cli->tree, mem_ctx, &tcon);
 
-	cli->tree->tid = tcon.tconx.out.cnum;
+	cli->tree->tid = tcon.tconx.out.tid;
 
 	talloc_free(mem_ctx);
 
diff --git a/source4/libcli/raw/clitree.c b/source4/libcli/raw/clitree.c
index 777279f5f9..0f56c0fe2e 100644
--- a/source4/libcli/raw/clitree.c
+++ b/source4/libcli/raw/clitree.c
@@ -96,12 +96,12 @@ NTSTATUS smb_tree_connect_recv(struct smbcli_request *req, TALLOC_CTX *mem_ctx,
 	case RAW_TCON_TCON:
 		SMBCLI_CHECK_WCT(req, 2);
 		parms->tcon.out.max_xmit = SVAL(req->in.vwv, VWV(0));
-		parms->tcon.out.cnum = SVAL(req->in.vwv, VWV(1));
+		parms->tcon.out.tid = SVAL(req->in.vwv, VWV(1));
 		break;
 
 	case RAW_TCON_TCONX:
 		ZERO_STRUCT(parms->tconx.out);
-		parms->tconx.out.cnum = SVAL(req->in.hdr, HDR_TID);
+		parms->tconx.out.tid = SVAL(req->in.hdr, HDR_TID);
 		if (req->in.wct >= 4) {
 			parms->tconx.out.options = SVAL(req->in.vwv, VWV(3));
 		}
@@ -274,7 +274,7 @@ NTSTATUS smbcli_tree_full_connection(TALLOC_CTX *parent_ctx,
 		return status;
 	}
 
-	tree->tid = tcon.tconx.out.cnum;
+	tree->tid = tcon.tconx.out.tid;
 	if (tcon.tconx.out.dev_type) {
 		tree->device = talloc_strdup(tree, tcon.tconx.out.dev_type);
 	}
diff --git a/source4/libcli/util/clilsa.c b/source4/libcli/util/clilsa.c
index c032af0abc..eac6984254 100644
--- a/source4/libcli/util/clilsa.c
+++ b/source4/libcli/util/clilsa.c
@@ -74,7 +74,7 @@ static NTSTATUS smblsa_connect(struct smbcli_state *cli)
 		talloc_free(lsa);
 		return status;
 	}
-	lsa->ipc_tree->tid = tcon.tconx.out.cnum;
+	lsa->ipc_tree->tid = tcon.tconx.out.tid;
 
 	lsa->pipe = dcerpc_pipe_init(lsa);
 	if (lsa->pipe == NULL) {
-- 
cgit