From 3d6a8d9ae0d55d92068c06651f6722b8158c25c8 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 13 Sep 2019 11:20:36 -0700 Subject: s3: smbd: Change remove_msdfs_link() to call SMB_VFS_UNLINKAT(). Use conn->cwd_fsp as current fsp. Rework to modern standards. No logic change for now. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- source3/smbd/msdfs.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source3/smbd') diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c index dabad072205..fe8553215a4 100644 --- a/source3/smbd/msdfs.c +++ b/source3/smbd/msdfs.c @@ -1455,6 +1455,7 @@ bool remove_msdfs_link(const struct junction_map *jucn) bool ret = False; struct smb_filename *smb_fname; bool ok; + int retval; ok = junction_to_local_path_tos(jucn, &path, &conn); if (!ok) { @@ -1473,7 +1474,11 @@ bool remove_msdfs_link(const struct junction_map *jucn) return false; } - if( SMB_VFS_UNLINK(conn, smb_fname) == 0 ) { + retval = SMB_VFS_UNLINKAT(conn, + conn->cwd_fsp, + smb_fname, + 0); + if (retval == 0) { ret = True; } -- cgit v1.2.1