sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

smbd: add a directory argument to safe_symlink_target_path()

Browse Source 
Existing caller passes NULL, no change in behaviour. Prepares for
replacing symlink_target_below_conn() in open.c.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15549

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
This commit is contained in:
Ralph Boehme 2024-01-02 13:25:25 +01:00 committed by Volker Lendecke
parent 0515dded4d
commit fc80c72d65
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source3/include/proto.h
View File

@ -706,6 +706,7 @@ struct smb_filename *synthetic_smb_fname(TALLOC_CTX *mem_ctx,
uint32_t flags); uint32_t flags);
NTSTATUS safe_symlink_target_path(TALLOC_CTX *mem_ctx, NTSTATUS safe_symlink_target_path(TALLOC_CTX *mem_ctx,
const char *connectpath, const char *connectpath,
const char *dir,
const char *target, const char *target,
size_t unparsed, size_t unparsed,
char **_relative); char **_relative);

15
source3/smbd/filename.c
View File

@ -661,6 +661,7 @@ static char *symlink_target_path(
NTSTATUS safe_symlink_target_path(TALLOC_CTX *mem_ctx, NTSTATUS safe_symlink_target_path(TALLOC_CTX *mem_ctx,
const char *connectpath, const char *connectpath,
const char *dir,
const char *target, const char *target,
size_t unparsed, size_t unparsed,
char **_relative) char **_relative)
@ -676,11 +677,22 @@ NTSTATUS safe_symlink_target_path(TALLOC_CTX *mem_ctx,
if (target[0] == '/') { if (target[0] == '/') {
abs_target = talloc_strdup(mem_ctx, target); abs_target = talloc_strdup(mem_ctx, target);
} else { } else if (dir == NULL) {
abs_target = talloc_asprintf(mem_ctx, abs_target = talloc_asprintf(mem_ctx,
"%s/%s", "%s/%s",
connectpath, connectpath,
target); target);
} else if (dir[0] == '/') {
abs_target = talloc_asprintf(mem_ctx,
"%s/%s",
dir,
target);
} else {
abs_target = talloc_asprintf(mem_ctx,
"%s/%s/%s",
connectpath,
dir,
target);
} }
if (abs_target == NULL) { if (abs_target == NULL) {
goto fail; goto fail;
@ -1192,6 +1204,7 @@ next:
status = safe_symlink_target_path(mem_ctx, status = safe_symlink_target_path(mem_ctx,
conn->connectpath, conn->connectpath,
NULL,
target, target,
symlink_err->unparsed, symlink_err->unparsed,
&safe_target); &safe_target);