s3: smbd: Remove allow_broken_path from get_referred_path() and it's callers.

It no longer looks at this bool, we must already have a
canonicalized path here.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 48ff174ebbe8dd67cd3998d4a7563af7e687f752..9481c9f36d50f2405e7aef9edac47a83abde4a64 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -258,7 +258,6 @@ static NTSTATUS vfswrap_get_dfs_referrals(struct vfs_handle_struct *handle,
                                   pathnamep,
                                   handle->conn->sconn->remote_address,
                                   handle->conn->sconn->local_address,
-                                  !handle->conn->sconn->using_smb2,
                                   junction, &consumedcnt, &self_referral);
        if (!NT_STATUS_IS_OK(status)) {
                struct smb_filename connectpath_fname = {

diff --git a/source3/rpc_server/dfs/srv_dfs_nt.c b/source3/rpc_server/dfs/srv_dfs_nt.c
index a69494e39028836729029ecdf87a92ac6eb2bdf0..2ff6796cd5dbbeb400a8b575cad74c0c499bdea0 100644 (file)
--- a/source3/rpc_server/dfs/srv_dfs_nt.c
+++ b/source3/rpc_server/dfs/srv_dfs_nt.c
@@ -90,7 +90,6 @@ WERROR _dfs_Add(struct pipes_struct *p, struct dfs_Add *r)
                                   r->in.path,
                                   remote_address,
                                   local_address,
-                                  true, /*allow_broken_path */
                                   jn, &consumedcnt, &self_ref);
        if(!NT_STATUS_IS_OK(status)) {
                return ntstatus_to_werror(status);
@@ -172,7 +171,6 @@ WERROR _dfs_Remove(struct pipes_struct *p, struct dfs_Remove *r)
                                   r->in.dfs_entry_path,
                                   remote_address,
                                   local_address,
-                                  true, /*allow_broken_path */
                                   jn, &consumedcnt, &self_ref);
        if(!NT_STATUS_IS_OK(status)) {
                return WERR_NERR_DFSNOSUCHVOLUME;
@@ -417,7 +415,6 @@ WERROR _dfs_GetInfo(struct pipes_struct *p, struct dfs_GetInfo *r)
                                   r->in.dfs_entry_path,
                                   remote_address,
                                   local_address,
-                                  true, /*allow_broken_path */
                                   jn, &consumedcnt, &self_ref);
        if(!NT_STATUS_IS_OK(status) ||
                        consumedcnt < strlen(r->in.dfs_entry_path)) {

diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index 34d22a5e1d25ae1644ceabf4d092332883da59e7..83121bb0227460d900ee2c0a49e1804f792802d2 100644 (file)
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -1212,7 +1212,6 @@ NTSTATUS get_referred_path(TALLOC_CTX *ctx,
                           const char *dfs_path,
                           const struct tsocket_address *remote_address,
                           const struct tsocket_address *local_address,
-                          bool allow_broken_path,
                           struct junction_map *jucn,
                           size_t *consumedcntp,
                           bool *self_referralp)

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index c4a330145151e560dd43f6d0c17b1cac48edd70d..73bff98e553517775ae7e29b300cda2a80b56463 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -524,7 +524,6 @@ NTSTATUS get_referred_path(TALLOC_CTX *ctx,
                           const char *dfs_path,
                           const struct tsocket_address *remote_address,
                           const struct tsocket_address *local_address,
-                          bool allow_broken_path,
                           struct junction_map *jucn,
                           size_t *consumedcntp,
                           bool *self_referralp);