From 8f41e54d538896a929ef8ebf224ddcfea7982ba8 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 19 Jul 2011 16:25:52 +0200
Subject: s3:libsmb: move cli->cnum to cli->smb1.tid and hide it behind
 cli_state_[g|s]et_tid()

metze
---
 source3/utils/net_rpc.c  | 4 ++--
 source3/utils/smbcacls.c | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 5952f4fe32..d0cc2d1043 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -4855,7 +4855,7 @@ static void show_userlist(struct rpc_pipe_client *pipe_hnd,
 			  netname));
 	}
 
-	cnum = cli->cnum;
+	cnum = cli_state_get_tid(cli);
 
 	if (!NT_STATUS_IS_OK(cli_tcon_andx(cli, netname, "A:", "", 0))) {
 		return;
@@ -4899,7 +4899,7 @@ static void show_userlist(struct rpc_pipe_client *pipe_hnd,
 	if (fnum != (uint16_t)-1)
 		cli_close(cli, fnum);
 	cli_tdis(cli);
-	cli->cnum = cnum;
+	cli_state_set_tid(cli, cnum);
 	
 	return;
 }
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index d226c84b9a..208f4e0c64 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -77,7 +77,7 @@ static NTSTATUS cli_lsa_lookup_sid(struct cli_state *cli,
 				   enum lsa_SidType *type,
 				   char **domain, char **name)
 {
-	uint16 orig_cnum = cli->cnum;
+	uint16 orig_cnum = cli_state_get_tid(cli);
 	struct rpc_pipe_client *p = NULL;
 	struct policy_handle handle;
 	NTSTATUS status;
@@ -117,7 +117,7 @@ static NTSTATUS cli_lsa_lookup_sid(struct cli_state *cli,
  fail:
 	TALLOC_FREE(p);
 	cli_tdis(cli);
-	cli->cnum = orig_cnum;
+	cli_state_set_tid(cli, orig_cnum);
 	TALLOC_FREE(frame);
 	return status;
 }
@@ -127,7 +127,7 @@ static NTSTATUS cli_lsa_lookup_name(struct cli_state *cli,
 				    enum lsa_SidType *type,
 				    struct dom_sid *sid)
 {
-	uint16 orig_cnum = cli->cnum;
+	uint16 orig_cnum = cli_state_get_tid(cli);
 	struct rpc_pipe_client *p;
 	struct policy_handle handle;
 	NTSTATUS status;
@@ -165,7 +165,7 @@ static NTSTATUS cli_lsa_lookup_name(struct cli_state *cli,
  fail:
 	TALLOC_FREE(p);
 	cli_tdis(cli);
-	cli->cnum = orig_cnum;
+	cli_state_set_tid(cli, orig_cnum);
 	TALLOC_FREE(frame);
 	return status;
 }
-- 
cgit