s3: smbd: Change remove_msdfs_link() to call SMB_VFS_UNLINKAT().
authorJeremy Allison <jra@samba.org>
Fri, 13 Sep 2019 18:20:36 +0000 (11:20 -0700)
committerRalph Boehme <slow@samba.org>
Thu, 26 Sep 2019 17:20:48 +0000 (17:20 +0000)
Use conn->cwd_fsp as current fsp. Rework to modern standards.

No logic change for now.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/smbd/msdfs.c

index dabad0722051e936d3907ea3245834af3a998f09..fe8553215a42e38a82ff57131242f9b36d380eda 100644 (file)
@@ -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;
        }