From 32f6eb2e9891c13cc82455cadf363aea2edfaefc Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 10 Aug 2022 21:40:47 -0700 Subject: 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 Reviewed-by: Ralph Boehme --- source3/modules/vfs_default.c | 1 - source3/rpc_server/dfs/srv_dfs_nt.c | 3 --- source3/smbd/msdfs.c | 1 - source3/smbd/proto.h | 1 - 4 files changed, 6 deletions(-) diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 48ff174ebbe..9481c9f36d5 100644 --- 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 a69494e3902..2ff6796cd5d 100644 --- 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 34d22a5e1d2..83121bb0227 100644 --- 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 c4a33014515..73bff98e553 100644 --- 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); -- cgit v1.2.1