diff options
| author | Tim Prouty <tprouty@samba.org> | 2009-07-02 13:39:20 -0700 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2009-07-06 15:38:42 -0700 |
| commit | 3cb0e521e1bdddde972b6fd08fb86f7fe73da8d5 (patch) | |
| tree | 22777dd2e4d6db9f30b19275a91a9dd3c21a2fbf /source3/modules/vfs_recycle.c | |
| parent | f39232a8fb93cfccfe1533ab613867572ff7f848 (diff) | |
| download | samba-3cb0e521e1bdddde972b6fd08fb86f7fe73da8d5.tar.gz samba-3cb0e521e1bdddde972b6fd08fb86f7fe73da8d5.tar.bz2 samba-3cb0e521e1bdddde972b6fd08fb86f7fe73da8d5.zip | |
s3: Plumb smb_filename through SMB_VFS_NTIMES
Diffstat (limited to 'source3/modules/vfs_recycle.c')
| -rw-r--r-- | source3/modules/vfs_recycle.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c index 24166d1266..771189ca73 100644 --- a/source3/modules/vfs_recycle.c +++ b/source3/modules/vfs_recycle.c @@ -417,7 +417,6 @@ static void recycle_do_touch(vfs_handle_struct *handle, { struct smb_filename *smb_fname_tmp = NULL; struct smb_file_time ft; - char *fname = NULL; NTSTATUS status; int ret, err; @@ -438,22 +437,16 @@ static void recycle_do_touch(vfs_handle_struct *handle, /* mtime */ ft.mtime = touch_mtime ? ft.atime : smb_fname_tmp->st.st_ex_mtime; - status = get_full_smb_filename(talloc_tos(), smb_fname_tmp, &fname); - if (!NT_STATUS_IS_OK(status)) { - goto out; - } - become_root(); - ret = SMB_VFS_NEXT_NTIMES(handle, fname, &ft); + ret = SMB_VFS_NEXT_NTIMES(handle, smb_fname_tmp, &ft); err = errno; unbecome_root(); if (ret == -1 ) { DEBUG(0, ("recycle: touching %s failed, reason = %s\n", smb_fname_str_dbg(smb_fname_tmp), strerror(err))); } - out: - TALLOC_FREE(fname); + TALLOC_FREE(smb_fname_tmp); } /** |