From: Volker Lendecke <vl@samba.org>
Date: Sat, 31 Oct 2020 15:48:31 +0000 (+0100)
Subject: libsmb: Remove cli_state->dfs_mountpoint
X-Git-Tag: talloc-2.3.2~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e8ce497f3d28cfafcf593dbc0b38707c813b513;p=thirdparty%2Fsamba.git

libsmb: Remove cli_state->dfs_mountpoint

Not used anymore

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Nov  4 20:17:47 UTC 2020 on sn-devel-184
---

diff --git a/source3/include/client.h b/source3/include/client.h
index 19a738900b7..14be20ef1e0 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -78,9 +78,6 @@ struct cli_state {
 
 	bool use_oplocks; /* should we use oplocks? */
 
-	/* Where (if anywhere) this is mounted under DFS. */
-	char *dfs_mountpoint;
-
 	struct smbXcli_conn *conn;
 
 	struct {
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index 081de18ac76..26b5499cf73 100644
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -262,22 +262,6 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx,
 	return NT_STATUS_OK;
 }
 
-/****************************************************************************
-****************************************************************************/
-
-static void cli_set_mntpoint(struct cli_state *cli, const char *mnt)
-{
-	TALLOC_CTX *frame = talloc_stackframe();
-	char *name = clean_name(frame, mnt);
-	if (!name) {
-		TALLOC_FREE(frame);
-		return;
-	}
-	TALLOC_FREE(cli->dfs_mountpoint);
-	cli->dfs_mountpoint = talloc_strdup(cli, name);
-	TALLOC_FREE(frame);
-}
-
 /********************************************************************
  Add a new connection to the list.
  referring_cli == NULL means a new initial connection.
@@ -1105,8 +1089,6 @@ NTSTATUS cli_resolve_path(TALLOC_CTX *ctx,
 		return NT_STATUS_NOT_FOUND;
 	}
 
-	cli_set_mntpoint(*targetcli, newmount);
-
 	/* Check for another dfs referral, note that we are not
 	   checking for loops here. */
 
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 4412651f505..7cb89e87a9d 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -101,10 +101,6 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
 		goto error;
 	}
 
-	cli->dfs_mountpoint = talloc_strdup(cli, "");
-	if (!cli->dfs_mountpoint) {
-		goto error;
-	}
 	cli->raw_status = NT_STATUS_INTERNAL_ERROR;
 	cli->map_dos_errors = true; /* remove this */
 	cli->timeout = CLIENT_TIMEOUT;