sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

s3: VFS: shadow_copy2: Fix chdir to store off the needed private variables.

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12531

This is not yet used, the users of this will be added later.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>
(cherry picked from commit 27340df4b52e4341f134667c59d71656a7a1fdae)
This commit is contained in:
Jeremy Allison 2017-01-20 12:06:55 -08:00 committed by Karolin Seeger
parent 21e16d7377
commit 28a4f561c4
1 changed files with 68 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
source3/modules/vfs_shadow_copy2.c
View File

@ -1328,30 +1328,85 @@ static int shadow_copy2_chown(vfs_handle_struct *handle,
return ret;
}
static void store_cwd_data(vfs_handle_struct *handle,
const char *connectpath)
{
struct shadow_copy2_private *priv = NULL;
char *cwd = NULL;
SMB_VFS_HANDLE_GET_DATA(handle, priv, struct shadow_copy2_private,
return);
TALLOC_FREE(priv->shadow_cwd);
cwd = SMB_VFS_NEXT_GETWD(handle);
if (cwd == NULL) {
smb_panic("getwd failed\n");
}
DBG_DEBUG("shadow cwd = %s\n", cwd);
priv->shadow_cwd = talloc_strdup(priv, cwd);
SAFE_FREE(cwd);
if (priv->shadow_cwd == NULL) {
smb_panic("talloc failed\n");
}
TALLOC_FREE(priv->shadow_connectpath);
if (connectpath) {
DBG_DEBUG("shadow conectpath = %s\n", connectpath);
priv->shadow_connectpath = talloc_strdup(priv, connectpath);
if (priv->shadow_connectpath == NULL) {
smb_panic("talloc failed\n");
}
}
}
static int shadow_copy2_chdir(vfs_handle_struct *handle,
const char *fname)
{
time_t timestamp = 0;
char *stripped = NULL;
int ret, saved_errno;
char *conv;
char *snappath = NULL;
int ret = -1;
int saved_errno = 0;
char *conv = NULL;
size_t rootpath_len = 0;
if (!shadow_copy2_strip_snapshot(talloc_tos(), handle, fname,
&timestamp, &stripped)) {
if (!shadow_copy2_strip_snapshot_internal(talloc_tos(), handle, fname,
&timestamp, &stripped, &snappath)) {
return -1;
}
if (timestamp == 0) {
return SMB_VFS_NEXT_CHDIR(handle, fname);
if (stripped != NULL) {
conv = shadow_copy2_do_convert(talloc_tos(),
handle,
stripped,
timestamp,
&rootpath_len);
TALLOC_FREE(stripped);
if (conv == NULL) {
return -1;
}
fname = conv;
}
conv = shadow_copy2_convert(talloc_tos(), handle, stripped, timestamp);
ret = SMB_VFS_NEXT_CHDIR(handle, fname);
if (ret == -1) {
saved_errno = errno;
}
if (ret == 0) {
if (conv != NULL && rootpath_len != 0) {
conv[rootpath_len] = '\0';
} else if (snappath != 0) {
TALLOC_FREE(conv);
conv = snappath;
}
store_cwd_data(handle, conv);
}
TALLOC_FREE(stripped);
if (conv == NULL) {
return -1;
}
ret = SMB_VFS_NEXT_CHDIR(handle, conv);
saved_errno = errno;
TALLOC_FREE(conv);
errno = saved_errno;
if (saved_errno != 0) {
errno = saved_errno;
}
return ret;
}