2 files changed, 16 insertions, 16 deletions

diff --git a/source4/librpc/rpc/dcerpc_smb.c b/source4/librpc/rpc/dcerpc_smb.c
index 95e157b700..51722c8a04 100644
--- a/source4/librpc/rpc/dcerpc_smb.c
+++ b/source4/librpc/rpc/dcerpc_smb.c
@@ -26,15 +26,15 @@
 /* transport private information used by SMB pipe transport */
 struct smb_private {
 	uint16_t fnum;
-	struct cli_tree *tree;
+	struct smbcli_tree *tree;
 };
 
-static struct cli_request *dcerpc_raw_send(struct dcerpc_pipe *p, DATA_BLOB *blob)
+static struct smbcli_request *dcerpc_raw_send(struct dcerpc_pipe *p, DATA_BLOB *blob)
 {
 	struct smb_private *smb = p->transport.private;
 	struct smb_trans2 trans;
 	uint16_t setup[2];
-	struct cli_request *req;
+	struct smbcli_request *req;
 	TALLOC_CTX *mem_ctx;
 
 	mem_ctx = talloc_init("dcerpc_raw_send");
@@ -64,7 +64,7 @@ static struct cli_request *dcerpc_raw_send(struct dcerpc_pipe *p, DATA_BLOB *blo
 
 
 static NTSTATUS dcerpc_raw_recv(struct dcerpc_pipe *p, 
-				struct cli_request *req,
+				struct smbcli_request *req,
 				TALLOC_CTX *mem_ctx,
 				DATA_BLOB *blob)
 {
@@ -154,7 +154,7 @@ static NTSTATUS smb_full_request(struct dcerpc_pipe *p,
 				 DATA_BLOB *request_blob,
 				 DATA_BLOB *reply_blob)
 {
-	struct cli_request *req;
+	struct smbcli_request *req;
 	req = dcerpc_raw_send(p, request_blob);
 	return dcerpc_raw_recv(p, req, mem_ctx, reply_blob);
 }
@@ -282,7 +282,7 @@ static NTSTATUS smb_shutdown_pipe(struct dcerpc_pipe *p)
 	c.close.in.fnum = smb->fnum;
 	c.close.in.write_time = 0;
 	smb_raw_close(smb->tree, &c);
-	cli_tree_close(smb->tree);
+	smbcli_tree_close(smb->tree);
 
 	return NT_STATUS_OK;
 }
@@ -300,7 +300,7 @@ static const char *smb_peer_name(struct dcerpc_pipe *p)
    open a rpc connection to a named pipe 
 */
 NTSTATUS dcerpc_pipe_open_smb(struct dcerpc_pipe **p, 
-			      struct cli_tree *tree,
+			      struct smbcli_tree *tree,
 			      const char *pipe_name)
 {
 	struct smb_private *smb;
@@ -380,7 +380,7 @@ NTSTATUS dcerpc_pipe_open_smb(struct dcerpc_pipe **p,
 /*
   return the SMB tree used for a dcerpc over SMB pipe
 */
-struct cli_tree *dcerpc_smb_tree(struct dcerpc_pipe *p)
+struct smbcli_tree *dcerpc_smb_tree(struct dcerpc_pipe *p)
 {
 	struct smb_private *smb = p->transport.private;
 
diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index d5cd2ab6fe..7f3d49061a 100644
--- a/source4/librpc/rpc/dcerpc_util.c
+++ b/source4/librpc/rpc/dcerpc_util.c
@@ -435,7 +435,7 @@ static NTSTATUS dcerpc_pipe_connect_ncacn_np(struct dcerpc_pipe **p,
 {
 	NTSTATUS status;
 	BOOL retry;
-	struct cli_state *cli;
+	struct smbcli_state *cli;
 	const char *pipe_name;
 	
 	if (!binding->options || !binding->options[0]) {
@@ -458,12 +458,12 @@ static NTSTATUS dcerpc_pipe_connect_ncacn_np(struct dcerpc_pipe **p,
 	}
 	    
 	if ((binding->flags & DCERPC_SCHANNEL_ANY) || !username || !username[0]) {
-		status = cli_full_connection(&cli, lp_netbios_name(),
+		status = smbcli_full_connection(&cli, lp_netbios_name(),
 					     binding->host, NULL, 
 					     "ipc$", "?????", 
 					     "", "", NULL, 0, &retry);
 	} else {
-		status = cli_full_connection(&cli, lp_netbios_name(),
+		status = smbcli_full_connection(&cli, lp_netbios_name(),
 					     binding->host, NULL, 
 					     "ipc$", "?????", 
 					     username, domain,
@@ -477,14 +477,14 @@ static NTSTATUS dcerpc_pipe_connect_ncacn_np(struct dcerpc_pipe **p,
 	status = dcerpc_pipe_open_smb(p, cli->tree, pipe_name);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0,("Failed to open pipe %s - %s\n", pipe_name, nt_errstr(status)));
-		cli_tdis(cli);
-		cli_shutdown(cli);
+		smbcli_tdis(cli);
+		smbcli_shutdown(cli);
                 return status;
         }
 	
 	/* this ensures that the reference count is decremented so
 	   a pipe close will really close the link */
-	cli_tree_close(cli->tree);
+	smbcli_tree_close(cli->tree);
 	
 	(*p)->flags = binding->flags;
 
@@ -649,7 +649,7 @@ NTSTATUS dcerpc_secondary_connection(struct dcerpc_pipe *p, struct dcerpc_pipe *
 				     const char *pipe_uuid,
 				     uint32_t pipe_version)
 {
-	struct cli_tree *tree;
+	struct smbcli_tree *tree;
 	NTSTATUS status = NT_STATUS_INVALID_PARAMETER;
 	struct dcerpc_binding b;
 
@@ -697,7 +697,7 @@ NTSTATUS dcerpc_secondary_connection(struct dcerpc_pipe *p, struct dcerpc_pipe *
 NTSTATUS dcerpc_fetch_session_key(struct dcerpc_pipe *p,
 				  DATA_BLOB *session_key)
 {
-	struct cli_tree *tree;
+	struct smbcli_tree *tree;
 
 	if (p->security_state.generic_state) {
 		return gensec_session_key(p->security_state.generic_state, session_key);