s3: smbd: SMB1 UNIX extensions - remove dead code.
authorJeremy Allison <jra@samba.org>
Tue, 15 Oct 2019 20:28:11 +0000 (13:28 -0700)
committerJeremy Allison <jra@samba.org>
Wed, 6 Nov 2019 19:31:00 +0000 (19:31 +0000)
We no longer set delete_on_fail on return from mknod.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Nov  6 19:31:00 UTC 2019 on sn-devel-184

source3/smbd/trans2.c

index 24a1ad083de355eec327c861f27530764af3d7c2..d5000e83cb1d8d4fa36c28f8bf4e5e2a992b1660 100644 (file)
@@ -8103,7 +8103,6 @@ static NTSTATUS smb_set_file_unix_basic(connection_struct *conn,
        uid_t set_owner = (uid_t)SMB_UID_NO_CHANGE;
        gid_t set_grp = (uid_t)SMB_GID_NO_CHANGE;
        NTSTATUS status = NT_STATUS_OK;
-       bool delete_on_fail = False;
        enum perm_type ptype;
        files_struct *all_fsps = NULL;
        bool modify_mtime = true;
@@ -8222,12 +8221,6 @@ static NTSTATUS smb_set_file_unix_basic(connection_struct *conn,
 
                if (ret != 0) {
                        status = map_nt_error_from_unix(errno);
-                       if (delete_on_fail) {
-                               SMB_VFS_UNLINKAT(conn,
-                                       conn->cwd_fsp,
-                                       smb_fname,
-                                       0);
-                       }
                        return status;
                }
        }
@@ -8256,12 +8249,6 @@ static NTSTATUS smb_set_file_unix_basic(connection_struct *conn,
                }
                if (ret != 0) {
                        status = map_nt_error_from_unix(errno);
-                       if (delete_on_fail) {
-                               SMB_VFS_UNLINKAT(conn,
-                                       conn->cwd_fsp,
-                                       smb_fname,
-                                       0);
-                       }
                        return status;
                }
        }