sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3: vfs: snapper: Fix snapper_gmt_strip_snapshot() function to strip @GMT token identically to shadow_copy2.c:shadow_copy2_strip_snapshot()

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

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Christof Schmitt <cs@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>

Autobuild-User(master): David Disseldorp <ddiss@samba.org>
Autobuild-Date(master): Thu Aug 18 06:43:02 CEST 2016 on sn-devel-144
This commit is contained in:
Jeremy Allison 2016-08-17 10:57:10 -07:00 committed by David Disseldorp
parent 3e3b9be948
commit b21308252e
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source3/modules/vfs_snapper.c
View File

@ -1748,9 +1748,23 @@ static bool snapper_gmt_strip_snapshot(TALLOC_CTX *mem_ctx,
if (timestamp == (time_t)-1) { if (timestamp == (time_t)-1) {
goto no_snapshot; goto no_snapshot;
} }
if ((p == name) && (q[0] == '\0')) { if (q[0] == '\0') {
/*
* The name consists of only the GMT token or the GMT
* token is at the end of the path. XP seems to send
* @GMT- at the end under certain circumstances even
* with a path prefix.
*/
if (pstripped != NULL) { if (pstripped != NULL) {
stripped = talloc_strdup(mem_ctx, ""); if (len_before_gmt > 0) {
/*
* There is a slash before
* the @GMT-. Remove it.
*/
len_before_gmt -= 1;
}
stripped = talloc_strndup(mem_ctx, name,
len_before_gmt);
if (stripped == NULL) { if (stripped == NULL) {
return false; return false;
} }
@ -1760,6 +1774,10 @@ static bool snapper_gmt_strip_snapshot(TALLOC_CTX *mem_ctx,
return true; return true;
} }
if (q[0] != '/') { if (q[0] != '/') {
/*
* It is not a complete path component, i.e. the path
* component continues after the gmt-token.
*/
goto no_snapshot; goto no_snapshot;
} }
q += 1; q += 1;