diff options
Diffstat (limited to 'source3/modules/vfs_acl_common.c')
| -rw-r--r-- | source3/modules/vfs_acl_common.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c index b01fd18b9b..a4d712f525 100644 --- a/source3/modules/vfs_acl_common.c +++ b/source3/modules/vfs_acl_common.c @@ -831,6 +831,13 @@ static int acl_common_remove_object(vfs_handle_struct *handle, const char *final_component = NULL; struct smb_filename local_fname; int saved_errno = 0; + char *saved_dir = NULL; + + saved_dir = vfs_GetWd(talloc_tos(),conn); + if (!saved_dir) { + saved_errno = errno; + goto out; + } if (!parent_dirname(talloc_tos(), path, &parent_dir, &final_component)) { @@ -843,7 +850,7 @@ static int acl_common_remove_object(vfs_handle_struct *handle, parent_dir, final_component )); /* cd into the parent dir to pin it. */ - ret = SMB_VFS_CHDIR(conn, parent_dir); + ret = vfs_ChDir(conn, parent_dir); if (ret == -1) { saved_errno = errno; goto out; @@ -897,7 +904,9 @@ static int acl_common_remove_object(vfs_handle_struct *handle, TALLOC_FREE(parent_dir); - vfs_ChDir(conn, conn->connectpath); + if (saved_dir) { + vfs_ChDir(conn, saved_dir); + } if (saved_errno) { errno = saved_errno; } |