diff options
| author | Christof Schmitt <cs@samba.org> | 2014-06-26 12:43:03 -0700 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2014-06-27 06:49:10 +0200 |
| commit | b053d4b3f9fd26f1ea4d81d3a4461a6f74bf7686 (patch) | |
| tree | 0f35ffd271fc57199fdd33f79b8e3a1331c1b526 | |
| parent | 16a6181289b719baeae7fae7fe0ba746fd5d41a6 (diff) | |
| download | samba-b053d4b3f9fd26f1ea4d81d3a4461a6f74bf7686.tar.gz samba-b053d4b3f9fd26f1ea4d81d3a4461a6f74bf7686.tar.xz samba-b053d4b3f9fd26f1ea4d81d3a4461a6f74bf7686.zip | |
s3-shadow-copy2: Remove TODO and fix comments
The patch "s3-shadow-copy2: Fix dir/@GMT-2012.10.15-13.48.43 form of
paths" takes care of a case marked as TODO, remove it and adjust the
comments accordingly.
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
| -rw-r--r-- | source3/modules/vfs_shadow_copy2.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c index 82149f2cb7..029b155208 100644 --- a/source3/modules/vfs_shadow_copy2.c +++ b/source3/modules/vfs_shadow_copy2.c @@ -264,7 +264,12 @@ static bool shadow_copy2_strip_snapshot(TALLOC_CTX *mem_ctx, goto no_snapshot; } if (q[0] == '\0') { - /* the name consists of only the GMT token */ + /* + * 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) { stripped = talloc_strndup(mem_ctx, name, p - name); if (stripped == NULL) { @@ -277,12 +282,8 @@ static bool shadow_copy2_strip_snapshot(TALLOC_CTX *mem_ctx, } if (q[0] != '/') { /* - * The GMT token is either at the end of the path - * or it is not a complete path component, i.e. the - * path component continues after the gmt-token. - * - * TODO: Is this correct? Or would the GMT tag as the - * last component be a valid input? + * It is not a complete path component, i.e. the path + * component continues after the gmt-token. */ DEBUG(10, ("q[0] = %d\n", (int)q[0])); goto no_snapshot; |