The Samba-Bugzilla – Attachment 9517 Details for
Bug 10259
shadow_copy2 module "Previous Version" not working in Windows 7
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for 4.1, cherry-picked from master
shadow_copy2.v4-1-test.patchset (text/plain), 78.37 KB, created by
Michael Adam
on 2013-12-09 11:58:26 UTC
(
hide
)
Description:
patch for 4.1, cherry-picked from master
Filename:
MIME Type:
Creator:
Michael Adam
Created:
2013-12-09 11:58:26 UTC
Size:
78.37 KB
patch
obsolete
>From 7f76c385bf73b6d1bc9a43b95b9be737d3b62a58 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Fri, 4 Oct 2013 13:15:34 +0200 >Subject: [PATCH 01/33] shadow_copy2: break overly long lines in > shadow_copy2_snapshot_to_gmt() > >According to coding guidelines. > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit 01cb88977da5bc44443407b100345531d047c77c) >--- > source3/modules/vfs_shadow_copy2.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index aa7e50f..dd66010 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -1030,7 +1030,8 @@ static bool shadow_copy2_snapshot_to_gmt(vfs_handle_struct *handle, > ZERO_STRUCT(timestamp); > if (lp_parm_bool(SNUM(handle->conn), "shadow", "sscanf", false)) { > if (sscanf(name, fmt, ×tamp_long) != 1) { >- DEBUG(10, ("shadow_copy2_snapshot_to_gmt: no sscanf match %s: %s\n", >+ DEBUG(10, ("shadow_copy2_snapshot_to_gmt: " >+ "no sscanf match %s: %s\n", > fmt, name)); > return false; > } >@@ -1038,11 +1039,13 @@ static bool shadow_copy2_snapshot_to_gmt(vfs_handle_struct *handle, > gmtime_r(×tamp_t, ×tamp); > } else { > if (strptime(name, fmt, ×tamp) == NULL) { >- DEBUG(10, ("shadow_copy2_snapshot_to_gmt: no match %s: %s\n", >+ DEBUG(10, ("shadow_copy2_snapshot_to_gmt: " >+ "no match %s: %s\n", > fmt, name)); > return false; > } >- DEBUG(10, ("shadow_copy2_snapshot_to_gmt: match %s: %s\n", fmt, name)); >+ DEBUG(10, ("shadow_copy2_snapshot_to_gmt: match %s: %s\n", >+ fmt, name)); > > if (lp_parm_bool(SNUM(handle->conn), "shadow", "localtime", false)) { > timestamp.tm_isdst = -1; >-- >1.7.9.5 > > >From d7b2b95f2b2e0a47ee687f86a5dcc8dd2bedd774 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Thu, 23 May 2013 23:32:15 +0200 >Subject: [PATCH 02/33] shadow_copy2: add comment header describing > shadow_copy2_strip_snapshot() > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit 9361824ddd291cb0e543a5a0829246831fcb9e84) >--- > source3/modules/vfs_shadow_copy2.c | 5 +++++ > 1 file changed, 5 insertions(+) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index dd66010..8bbb7b8 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -186,6 +186,11 @@ static char *shadow_copy2_insert_string(TALLOC_CTX *mem_ctx, > snaptime_string); > } > >+/** >+ * Strip a snapshot component from an filename as >+ * handed in via the smb layer. >+ * Returns the parsed timestamp and the stripped filename. >+ */ > static bool shadow_copy2_strip_snapshot(TALLOC_CTX *mem_ctx, > struct vfs_handle_struct *handle, > const char *name, >-- >1.7.9.5 > > >From 49e803bd5ede6a9feda9614806ffe50d9ce2fab6 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Thu, 23 May 2013 23:59:49 +0200 >Subject: [PATCH 03/33] shadow_copy2: add header comment explaining > have_snapdir() > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit 5b494b3dea559f632d57c9d33172e46e459e852f) >--- > source3/modules/vfs_shadow_copy2.c | 6 ++++++ > 1 file changed, 6 insertions(+) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index 8bbb7b8..932f93f 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -963,6 +963,12 @@ done: > return result; > } > >+/** >+ * Check whether a given directory contains a >+ * snapshot directory as direct subdirectory. >+ * If yes, return the path of the snapshot-subdir, >+ * otherwise return NULL. >+ */ > static char *have_snapdir(struct vfs_handle_struct *handle, > const char *path) > { >-- >1.7.9.5 > > >From 906f9e89ca34eccb2cb8969a18b186260aaa9c51 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Fri, 24 May 2013 00:01:14 +0200 >Subject: [PATCH 04/33] shadow_copy2: add comment block explaining > shadow_copy2_find_snapdir() > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit b90d1e6ac06fd4c1aaaceadcb711800499334117) >--- > source3/modules/vfs_shadow_copy2.c | 4 ++++ > 1 file changed, 4 insertions(+) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index 932f93f..9f4f111 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -992,6 +992,10 @@ static char *have_snapdir(struct vfs_handle_struct *handle, > return NULL; > } > >+/** >+ * Find the snapshot directory (if any) for the given >+ * filename (which is relative to the share). >+ */ > static char *shadow_copy2_find_snapdir(TALLOC_CTX *mem_ctx, > struct vfs_handle_struct *handle, > struct smb_filename *smb_fname) >-- >1.7.9.5 > > >From 8b039449c48cf3254a14e243f3f3b6c6e8a3a02a Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Fri, 24 May 2013 17:20:42 +0200 >Subject: [PATCH 05/33] shadow_copy2: add comment block explaining > shadow_copy2_insert_string() > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit 5da5512985cf65c09abb33abaf5e8dc28167dac3) >--- > source3/modules/vfs_shadow_copy2.c | 5 +++++ > 1 file changed, 5 insertions(+) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index 9f4f111..06e5115 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -141,6 +141,11 @@ static bool shadow_copy2_find_slashes(TALLOC_CTX *mem_ctx, const char *str, > return true; > } > >+/** >+ * Given a timstamp, build the string to insert into a path >+ * as a path component for creating the local path to the >+ * snapshot at the given timestamp of the input path. >+ */ > static char *shadow_copy2_insert_string(TALLOC_CTX *mem_ctx, > struct vfs_handle_struct *handle, > time_t snapshot) >-- >1.7.9.5 > > >From d862d60958feb7b9f7a9878a6a20906cc3e0cfed Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Wed, 29 May 2013 01:13:57 +0200 >Subject: [PATCH 06/33] shadow_copy2: add comment block explaining > shadow_copy2_convert() > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit 5c900fd930edd45e9f23b36c1e68e5c2d8b96867) >--- > source3/modules/vfs_shadow_copy2.c | 5 +++++ > 1 file changed, 5 insertions(+) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index 06e5115..70d5174 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -314,6 +314,11 @@ static char *shadow_copy2_find_mount_point(TALLOC_CTX *mem_ctx, > return path; > } > >+/** >+ * Convert from a name as handed in via the SMB layer >+ * and a timestamp into the local path of the snapshot >+ * of the provided file at the provided time. >+ */ > static char *shadow_copy2_convert(TALLOC_CTX *mem_ctx, > struct vfs_handle_struct *handle, > const char *name, time_t timestamp) >-- >1.7.9.5 > > >From c81a767688bb0a5cd14e59d691cca0a1d31a0119 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Wed, 29 May 2013 17:11:44 +0200 >Subject: [PATCH 07/33] shadow_copy2: add comment explaining the SMB level GMT > format pattern > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit 6da7375cd881f85f2873578db7fcfb368deab94f) >--- > source3/include/smb.h | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > >diff --git a/source3/include/smb.h b/source3/include/smb.h >index cfc12a7..e1ab344 100644 >--- a/source3/include/smb.h >+++ b/source3/include/smb.h >@@ -567,7 +567,15 @@ Offset Data length. > #define NOTIFY_ACTION_REMOVED_STREAM 7 > #define NOTIFY_ACTION_MODIFIED_STREAM 8 > >-/* timestamp format used in "previous versions" */ >+/* >+ * Timestamp format used in "previous versions": >+ * The is the windows-level format of the @GMT- token. >+ * It is a fixed format not to be confused with the >+ * format for the POSIX-Level token of the shadow_copy2 >+ * VFS module that can be configured via the "shadow:format" >+ * configuration option but defaults to the same format. >+ * See the shadow_copy2 module. >+ */ > #define GMT_NAME_LEN 24 /* length of a @GMT- name */ > #define GMT_FORMAT "@GMT-%Y.%m.%d-%H.%M.%S" > >-- >1.7.9.5 > > >From ff9ec11d4a0638dd589bdb4f94cf9654bf24f10d Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Fri, 24 May 2013 01:35:44 +0200 >Subject: [PATCH 08/33] shadow_copy2: introduce config struct and function > shadow_copy2_connect() > >This moves the parsing of the config to a central place. >So users of configuation don't need to call lp_parm_... all the time. > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit 1ecef5743583cf617f5506bc2fca3baa70cfb9b3) >--- > source3/modules/vfs_shadow_copy2.c | 173 ++++++++++++++++++++++++++++++------ > 1 file changed, 145 insertions(+), 28 deletions(-) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index 70d5174..d5b1653 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -107,6 +107,18 @@ > #include <ccan/hash/hash.h> > #include "util_tdb.h" > >+struct shadow_copy2_config { >+ char *gmt_format; >+ bool use_sscanf; >+ bool use_localtime; >+ char *snapdir; >+ bool snapdirseverywhere; >+ bool crossmountpoints; >+ bool fixinodes; >+ char *sort_order; >+ bool snapdir_absolute; >+}; >+ > static bool shadow_copy2_find_slashes(TALLOC_CTX *mem_ctx, const char *str, > size_t **poffsets, > unsigned *pnum_offsets) >@@ -150,23 +162,25 @@ static char *shadow_copy2_insert_string(TALLOC_CTX *mem_ctx, > struct vfs_handle_struct *handle, > time_t snapshot) > { >- const char *fmt; > struct tm snap_tm; > fstring snaptime_string; > size_t snaptime_len; >+ struct shadow_copy2_config *config; > >- fmt = lp_parm_const_string(SNUM(handle->conn), "shadow", >- "format", GMT_FORMAT); >+ SMB_VFS_HANDLE_GET_DATA(handle, config, struct shadow_copy2_config, >+ return NULL); > >- if (lp_parm_bool(SNUM(handle->conn), "shadow", "sscanf", false)) { >- snaptime_len = snprintf(snaptime_string, sizeof(snaptime_string), fmt, >- (unsigned long)snapshot); >+ if (config->use_sscanf) { >+ snaptime_len = snprintf(snaptime_string, >+ sizeof(snaptime_string), >+ config->gmt_format, >+ (unsigned long)snapshot); > if (snaptime_len <= 0) { > DEBUG(10, ("snprintf failed\n")); > return NULL; > } > } else { >- if (lp_parm_bool(SNUM(handle->conn), "shadow", "localtime", false)) { >+ if (config->use_localtime) { > if (localtime_r(&snapshot, &snap_tm) == 0) { > DEBUG(10, ("gmtime_r failed\n")); > return NULL; >@@ -177,18 +191,17 @@ static char *shadow_copy2_insert_string(TALLOC_CTX *mem_ctx, > return NULL; > } > } >- snaptime_len = strftime(snaptime_string, sizeof(snaptime_string), fmt, >- &snap_tm); >+ snaptime_len = strftime(snaptime_string, >+ sizeof(snaptime_string), >+ config->gmt_format, >+ &snap_tm); > if (snaptime_len == 0) { > DEBUG(10, ("strftime failed\n")); > return NULL; > } > } > return talloc_asprintf(mem_ctx, "/%s/%s", >- lp_parm_const_string( >- SNUM(handle->conn), "shadow", "snapdir", >- ".snapshots"), >- snaptime_string); >+ config->snapdir, snaptime_string); > } > > /** >@@ -208,6 +221,10 @@ static bool shadow_copy2_strip_snapshot(TALLOC_CTX *mem_ctx, > char *q; > char *stripped; > size_t rest_len, dst_len; >+ struct shadow_copy2_config *config; >+ >+ SMB_VFS_HANDLE_GET_DATA(handle, config, struct shadow_copy2_config, >+ return false); > > p = strstr_m(name, "@GMT-"); > if (p == NULL) { >@@ -244,8 +261,7 @@ static bool shadow_copy2_strip_snapshot(TALLOC_CTX *mem_ctx, > rest_len = strlen(q); > dst_len = (p-name) + rest_len; > >- if (lp_parm_bool(SNUM(handle->conn), "shadow", "snapdirseverywhere", >- false)) { >+ if (config->snapdirseverywhere) { > char *insert; > bool have_insert; > insert = shadow_copy2_insert_string(talloc_tos(), handle, >@@ -334,6 +350,10 @@ static char *shadow_copy2_convert(TALLOC_CTX *mem_ctx, > size_t insertlen; > int i, saved_errno; > size_t min_offset; >+ struct shadow_copy2_config *config; >+ >+ SMB_VFS_HANDLE_GET_DATA(handle, config, struct shadow_copy2_config, >+ return NULL); > > path = talloc_asprintf(mem_ctx, "%s/%s", handle->conn->connectpath, > name); >@@ -376,8 +396,7 @@ static char *shadow_copy2_convert(TALLOC_CTX *mem_ctx, > > min_offset = 0; > >- if (!lp_parm_bool(SNUM(handle->conn), "shadow", "crossmountpoints", >- false)) { >+ if (!config->crossmountpoints) { > char *mount_point; > > mount_point = shadow_copy2_find_mount_point(talloc_tos(), >@@ -461,7 +480,12 @@ fail: > static void convert_sbuf(vfs_handle_struct *handle, const char *fname, > SMB_STRUCT_STAT *sbuf) > { >- if (lp_parm_bool(SNUM(handle->conn), "shadow", "fixinodes", False)) { >+ struct shadow_copy2_config *config; >+ >+ SMB_VFS_HANDLE_GET_DATA(handle, config, struct shadow_copy2_config, >+ return); >+ >+ if (config->fixinodes) { > /* some snapshot systems, like GPFS, return the name > device:inode for the snapshot files as the current > files. That breaks the 'restore' button in the shadow copy >@@ -984,12 +1008,14 @@ static char *have_snapdir(struct vfs_handle_struct *handle, > { > struct smb_filename smb_fname; > int ret; >+ struct shadow_copy2_config *config; >+ >+ SMB_VFS_HANDLE_GET_DATA(handle, config, struct shadow_copy2_config, >+ return NULL); > > ZERO_STRUCT(smb_fname); >- smb_fname.base_name = talloc_asprintf( >- talloc_tos(), "%s/%s", path, >- lp_parm_const_string(SNUM(handle->conn), "shadow", "snapdir", >- ".snapshots")); >+ smb_fname.base_name = talloc_asprintf(talloc_tos(), "%s/%s", >+ path, config->snapdir); > if (smb_fname.base_name == NULL) { > return NULL; > } >@@ -1012,6 +1038,10 @@ static char *shadow_copy2_find_snapdir(TALLOC_CTX *mem_ctx, > { > char *path, *p; > char *snapdir; >+ struct shadow_copy2_config *config; >+ >+ SMB_VFS_HANDLE_GET_DATA(handle, config, struct shadow_copy2_config, >+ return NULL); > > path = talloc_asprintf(mem_ctx, "%s/%s", > handle->conn->connectpath, >@@ -1048,12 +1078,15 @@ static bool shadow_copy2_snapshot_to_gmt(vfs_handle_struct *handle, > time_t timestamp_t; > unsigned long int timestamp_long; > const char *fmt; >+ struct shadow_copy2_config *config; >+ >+ SMB_VFS_HANDLE_GET_DATA(handle, config, struct shadow_copy2_config, >+ return NULL); > >- fmt = lp_parm_const_string(SNUM(handle->conn), "shadow", >- "format", GMT_FORMAT); >+ fmt = config->gmt_format; > > ZERO_STRUCT(timestamp); >- if (lp_parm_bool(SNUM(handle->conn), "shadow", "sscanf", false)) { >+ if (config->use_sscanf) { > if (sscanf(name, fmt, ×tamp_long) != 1) { > DEBUG(10, ("shadow_copy2_snapshot_to_gmt: " > "no sscanf match %s: %s\n", >@@ -1072,7 +1105,7 @@ static bool shadow_copy2_snapshot_to_gmt(vfs_handle_struct *handle, > DEBUG(10, ("shadow_copy2_snapshot_to_gmt: match %s: %s\n", > fmt, name)); > >- if (lp_parm_bool(SNUM(handle->conn), "shadow", "localtime", false)) { >+ if (config->use_localtime) { > timestamp.tm_isdst = -1; > timestamp_t = mktime(×tamp); > gmtime_r(×tamp_t, ×tamp); >@@ -1101,9 +1134,12 @@ static void shadow_copy2_sort_data(vfs_handle_struct *handle, > { > int (*cmpfunc)(const void *, const void *); > const char *sort; >+ struct shadow_copy2_config *config; > >- sort = lp_parm_const_string(SNUM(handle->conn), "shadow", >- "sort", "desc"); >+ SMB_VFS_HANDLE_GET_DATA(handle, config, struct shadow_copy2_config, >+ return); >+ >+ sort = config->sort_order; > if (sort == NULL) { > return; > } >@@ -1536,8 +1572,89 @@ static int shadow_copy2_get_real_filename(struct vfs_handle_struct *handle, > return ret; > } > >+static int shadow_copy2_connect(struct vfs_handle_struct *handle, >+ const char *service, const char *user) >+{ >+ struct shadow_copy2_config *config; >+ int ret; >+ const char *snapdir; >+ const char *gmt_format; >+ const char *sort_order; >+ >+ DEBUG(10, (__location__ ": cnum[%u], connectpath[%s]\n", >+ (unsigned)handle->conn->cnum, >+ handle->conn->connectpath)); >+ >+ ret = SMB_VFS_NEXT_CONNECT(handle, service, user); >+ if (ret < 0) { >+ return ret; >+ } >+ >+ config = talloc_zero(handle->conn, struct shadow_copy2_config); >+ if (config == NULL) { >+ DEBUG(0, ("talloc_zero() failed\n")); >+ errno = ENOMEM; >+ return -1; >+ } >+ >+ gmt_format = lp_parm_const_string(SNUM(handle->conn), >+ "shadow", "format", >+ GMT_FORMAT); >+ config->gmt_format = talloc_strdup(config, gmt_format); >+ if (config->gmt_format == NULL) { >+ DEBUG(0, ("talloc_strdup() failed\n")); >+ errno = ENOMEM; >+ return -1; >+ } >+ >+ config->use_sscanf = lp_parm_bool(SNUM(handle->conn), >+ "shadow", "sscanf", false); >+ >+ config->use_localtime = lp_parm_bool(SNUM(handle->conn), >+ "shadow", "localtime", >+ false); >+ >+ snapdir = lp_parm_const_string(SNUM(handle->conn), >+ "shadow", "snapdir", >+ ".snapshots"); >+ config->snapdir = talloc_strdup(config, snapdir); >+ if (config->snapdir == NULL) { >+ DEBUG(0, ("talloc_strdup() failed\n")); >+ errno = ENOMEM; >+ return -1; >+ } >+ >+ config->snapdirseverywhere = lp_parm_bool(SNUM(handle->conn), >+ "shadow", >+ "snapdirseverywhere", >+ false); >+ >+ config->crossmountpoints = lp_parm_bool(SNUM(handle->conn), >+ "shadow", "crossmountpoints", >+ false); >+ >+ config->fixinodes = lp_parm_bool(SNUM(handle->conn), >+ "shadow", "fixinodes", >+ false); >+ >+ sort_order = lp_parm_const_string(SNUM(handle->conn), >+ "shadow", "sort", "desc"); >+ config->sort_order = talloc_strdup(config, sort_order); >+ if (config->sort_order == NULL) { >+ DEBUG(0, ("talloc_strdup() failed\n")); >+ errno = ENOMEM; >+ return -1; >+ } >+ >+ SMB_VFS_HANDLE_SET_DATA(handle, config, >+ NULL, struct shadow_copy2_config, >+ return -1); >+ >+ return 0; >+} > > static struct vfs_fn_pointers vfs_shadow_copy2_fns = { >+ .connect_fn = shadow_copy2_connect, > .opendir_fn = shadow_copy2_opendir, > .rename_fn = shadow_copy2_rename, > .link_fn = shadow_copy2_link, >-- >1.7.9.5 > > >From 7081ed113a90f80548f29e3081daa9a4cd1cc1b5 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Wed, 29 May 2013 17:10:51 +0200 >Subject: [PATCH 09/33] shadow_copy2: introduce the bool "snapdir_absolute" in > the config. > >Not exposed but to be used internally. > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit 843954989cbec6640d2565d0d23a48f296740a23) >--- > source3/modules/vfs_shadow_copy2.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index d5b1653..0694473 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -1646,6 +1646,16 @@ static int shadow_copy2_connect(struct vfs_handle_struct *handle, > return -1; > } > >+ if (config->snapdir[0] == '/') { >+ config->snapdir_absolute = true; >+ if (config->snapdirseverywhere == true) { >+ DEBUG(1, (__location__ " Warning: An absolute snapdir " >+ "is incompatible with 'snapdirseverywhere', " >+ "setting 'snapdirseverywhere' to false.\n")); >+ config->snapdirseverywhere = false; >+ } >+ } >+ > SMB_VFS_HANDLE_SET_DATA(handle, config, > NULL, struct shadow_copy2_config, > return -1); >-- >1.7.9.5 > > >From 08c9e996e3d2bf12fc5139e6a0bac78b4d2b0815 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Thu, 30 May 2013 13:19:50 +0200 >Subject: [PATCH 10/33] shadow_copy2: disable "snapdir:crossmountpoints" if > the snapdir is absolute. > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit 1e887fcda097b93a879df726f2b7c2c8d3c4cf54) >--- > source3/modules/vfs_shadow_copy2.c | 7 +++++++ > 1 file changed, 7 insertions(+) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index 0694473..adcc855 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -1654,6 +1654,13 @@ static int shadow_copy2_connect(struct vfs_handle_struct *handle, > "setting 'snapdirseverywhere' to false.\n")); > config->snapdirseverywhere = false; > } >+ >+ if (config->crossmountpoints == true) { >+ DEBUG(1, (__location__ " Warning: 'crossmountpoints' " >+ "is not supported with an absolute snapdir. " >+ "Disabling it.\n")); >+ config->crossmountpoints = false; >+ } > } > > SMB_VFS_HANDLE_SET_DATA(handle, config, >-- >1.7.9.5 > > >From d41d7e83388893035b5a5e378f870a33d3c5e896 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Thu, 30 May 2013 17:26:44 +0200 >Subject: [PATCH 11/33] shadow_copy2: re-add the basedir option. >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Disable basedir if it is not an absolute path or if >snapdirseverywhere or crossmountpoints is enabled. > >Pair-Programmed-With: Björn Baumbach <bb@sernet.de> > >Signed-off-by: Michael Adam <obnox@samba.org> >Signed-off-by: Björn Baumbach <bb@sernet.de> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit ed751b9ee49d8e4a319759640321e8b49be4f154) >--- > source3/modules/vfs_shadow_copy2.c | 56 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 56 insertions(+) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index adcc855..d584fa9 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -117,6 +117,8 @@ struct shadow_copy2_config { > bool fixinodes; > char *sort_order; > bool snapdir_absolute; >+ char *basedir; >+ char *mount_point; > }; > > static bool shadow_copy2_find_slashes(TALLOC_CTX *mem_ctx, const char *str, >@@ -1580,6 +1582,7 @@ static int shadow_copy2_connect(struct vfs_handle_struct *handle, > const char *snapdir; > const char *gmt_format; > const char *sort_order; >+ const char *basedir; > > DEBUG(10, (__location__ ": cnum[%u], connectpath[%s]\n", > (unsigned)handle->conn->cnum, >@@ -1646,6 +1649,59 @@ static int shadow_copy2_connect(struct vfs_handle_struct *handle, > return -1; > } > >+ config->mount_point = shadow_copy2_find_mount_point(config, handle); >+ if (config->mount_point == NULL) { >+ DEBUG(0, (__location__ ": shadow_copy2_find_mount_point " >+ "failed: %s\n", strerror(errno))); >+ return -1; >+ } >+ >+ basedir = lp_parm_const_string(SNUM(handle->conn), >+ "shadow", "basedir", NULL); >+ >+ if (basedir != NULL) { >+ if (basedir[0] != '/') { >+ DEBUG(1, (__location__ " Warning: 'basedir' is " >+ "relative ('%s'), but it has to be an " >+ "absolute path. Disabling basedir.\n", >+ basedir)); >+ } else { >+ char *p; >+ p = strstr(basedir, config->mount_point); >+ if (p != basedir) { >+ DEBUG(1, ("Warning: basedir (%s) is not a " >+ "subdirectory of the share root's " >+ "mount point (%s). " >+ "Disabling basedir\n", >+ basedir, config->mount_point)); >+ } else { >+ config->basedir = talloc_strdup(config, >+ basedir); >+ if (config->basedir == NULL) { >+ DEBUG(0, ("talloc_strdup() failed\n")); >+ errno = ENOMEM; >+ return -1; >+ } >+ } >+ } >+ } >+ >+ if (config->snapdirseverywhere && config->basedir != NULL) { >+ DEBUG(1, (__location__ " Warning: 'basedir' is incompatible " >+ "with 'snapdirseverywhere'. Disabling basedir.\n")); >+ TALLOC_FREE(config->basedir); >+ } >+ >+ if (config->crossmountpoints && config->basedir != NULL) { >+ DEBUG(1, (__location__ " Warning: 'basedir' is incompatible " >+ "with 'crossmountpoints'. Disabling basedir.\n")); >+ TALLOC_FREE(config->basedir); >+ } >+ >+ if (config->basedir == NULL) { >+ config->basedir = config->mount_point; >+ } >+ > if (config->snapdir[0] == '/') { > config->snapdir_absolute = true; > if (config->snapdirseverywhere == true) { >-- >1.7.9.5 > > >From a935eb20ce4a56d7feb6733bc0b1b5c11d719d22 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Fri, 31 May 2013 16:36:33 +0200 >Subject: [PATCH 12/33] shadow_copy2: introduce "shadow:mountpoint" option > >Possiblity to explicitly set the share's mount point. >This is useful mainly for debugging and testing purposes. > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit 2d5a3af4bc44d13877a26fa1857b3ceafe138de8) >--- > source3/modules/vfs_shadow_copy2.c | 43 +++++++++++++++++++++++++++++++----- > 1 file changed, 38 insertions(+), 5 deletions(-) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index d584fa9..afe2ff4 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -1583,6 +1583,7 @@ static int shadow_copy2_connect(struct vfs_handle_struct *handle, > const char *gmt_format; > const char *sort_order; > const char *basedir; >+ const char *mount_point; > > DEBUG(10, (__location__ ": cnum[%u], connectpath[%s]\n", > (unsigned)handle->conn->cnum, >@@ -1649,11 +1650,43 @@ static int shadow_copy2_connect(struct vfs_handle_struct *handle, > return -1; > } > >- config->mount_point = shadow_copy2_find_mount_point(config, handle); >- if (config->mount_point == NULL) { >- DEBUG(0, (__location__ ": shadow_copy2_find_mount_point " >- "failed: %s\n", strerror(errno))); >- return -1; >+ mount_point = lp_parm_const_string(SNUM(handle->conn), >+ "shadow", "mountpoint", NULL); >+ if (mount_point != NULL) { >+ if (mount_point[0] != '/') { >+ DEBUG(1, (__location__ " Warning: 'mountpoint' is " >+ "relative ('%s'), but it has to be an " >+ "absolute path. Ignoring provided value.\n", >+ mount_point)); >+ mount_point = NULL; >+ } else { >+ char *p; >+ p = strstr(handle->conn->connectpath, mount_point); >+ if (p != handle->conn->connectpath) { >+ DEBUG(1, ("Warning: mount_point (%s) is not a " >+ "subdirectory of the share root " >+ "(%s). Ignoring provided value.\n", >+ mount_point, >+ handle->conn->connectpath)); >+ mount_point = NULL; >+ } >+ } >+ } >+ >+ if (mount_point != NULL) { >+ config->mount_point = talloc_strdup(config, mount_point); >+ if (config->mount_point == NULL) { >+ DEBUG(0, (__location__ " talloc_strdup() failed\n")); >+ return -1; >+ } >+ } else { >+ config->mount_point = shadow_copy2_find_mount_point(config, >+ handle); >+ if (config->mount_point == NULL) { >+ DEBUG(0, (__location__ ": shadow_copy2_find_mount_point" >+ " failed: %s\n", strerror(errno))); >+ return -1; >+ } > } > > basedir = lp_parm_const_string(SNUM(handle->conn), >-- >1.7.9.5 > > >From a2812827304bb54643ee623b1e9fd2f0e6bac5d5 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Fri, 4 Oct 2013 00:04:06 +0200 >Subject: [PATCH 13/33] shadow_copy2: add rel_connectpath to config. > >This is the share root, relative to the basedir. > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit d34dc1b0025d18afc9ce638c7000b702f98b5d03) >--- > source3/modules/vfs_shadow_copy2.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index afe2ff4..8f2f466 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -119,6 +119,7 @@ struct shadow_copy2_config { > bool snapdir_absolute; > char *basedir; > char *mount_point; >+ char *rel_connectpath; /* share root, relative to the basedir */ > }; > > static bool shadow_copy2_find_slashes(TALLOC_CTX *mem_ctx, const char *str, >@@ -1735,8 +1736,19 @@ static int shadow_copy2_connect(struct vfs_handle_struct *handle, > config->basedir = config->mount_point; > } > >+ if (strlen(config->basedir) != strlen(handle->conn->connectpath)) { >+ config->rel_connectpath = talloc_strdup(config, >+ handle->conn->connectpath + strlen(config->basedir)); >+ if (config->rel_connectpath == NULL) { >+ DEBUG(0, ("talloc_strdup() failed\n")); >+ errno = ENOMEM; >+ return -1; >+ } >+ } >+ > if (config->snapdir[0] == '/') { > config->snapdir_absolute = true; >+ > if (config->snapdirseverywhere == true) { > DEBUG(1, (__location__ " Warning: An absolute snapdir " > "is incompatible with 'snapdirseverywhere', " >-- >1.7.9.5 > > >From a0de0ccdba02375ac9d168661e17b49f19657cd3 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Fri, 4 Oct 2013 00:07:15 +0200 >Subject: [PATCH 14/33] shadow_copy2: add snapshot_basepath to the config. > >This is the absolute version of snapdir. > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit a7ca55c8da6fbe6452a7a0bfc3c84b5941b8aa27) >--- > source3/modules/vfs_shadow_copy2.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index 8f2f466..f3be5fe 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -120,6 +120,7 @@ struct shadow_copy2_config { > char *basedir; > char *mount_point; > char *rel_connectpath; /* share root, relative to the basedir */ >+ char *snapshot_basepath; /* the absolute version of snapdir */ > }; > > static bool shadow_copy2_find_slashes(TALLOC_CTX *mem_ctx, const char *str, >@@ -1762,6 +1763,16 @@ static int shadow_copy2_connect(struct vfs_handle_struct *handle, > "Disabling it.\n")); > config->crossmountpoints = false; > } >+ >+ config->snapshot_basepath = config->snapdir; >+ } else { >+ config->snapshot_basepath = talloc_asprintf(config, "%s/%s", >+ config->mount_point, config->snapdir); >+ if (config->snapshot_basepath == NULL) { >+ DEBUG(0, ("talloc_asprintf() failed\n")); >+ errno = ENOMEM; >+ return -1; >+ } > } > > SMB_VFS_HANDLE_SET_DATA(handle, config, >-- >1.7.9.5 > > >From b64dd93746009df173f658cef7b3b81cfc635d6b Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Fri, 31 May 2013 17:17:27 +0200 >Subject: [PATCH 15/33] shadow_copy2: log resulting config at the end of > shadow_copy2_connect() > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit c4f9954ebb04da94a5bcd2cb328fb2fbaf9fa062) >--- > source3/modules/vfs_shadow_copy2.c | 29 +++++++++++++++++++++++++++++ > 1 file changed, 29 insertions(+) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index f3be5fe..4c8ee25 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -1775,6 +1775,35 @@ static int shadow_copy2_connect(struct vfs_handle_struct *handle, > } > } > >+ DEBUG(10, ("shadow_copy2_connect: configuration:\n" >+ " share root: '%s'\n" >+ " basedir: '%s'\n" >+ " mountpoint: '%s'\n" >+ " rel share root: '%s'\n" >+ " snapdir: '%s'\n" >+ " snapshot base path: '%s'\n" >+ " format: '%s'\n" >+ " use sscanf: %s\n" >+ " snapdirs everywhere: %s\n" >+ " cross mountpoints: %s\n" >+ " fix inodes: %s\n" >+ " sort order: %s\n" >+ "", >+ handle->conn->connectpath, >+ config->basedir, >+ config->mount_point, >+ config->rel_connectpath, >+ config->snapdir, >+ config->snapshot_basepath, >+ config->gmt_format, >+ config->use_sscanf ? "yes" : "no", >+ config->snapdirseverywhere ? "yes" : "no", >+ config->crossmountpoints ? "yes" : "no", >+ config->fixinodes ? "yes" : "no", >+ config->sort_order >+ )); >+ >+ > SMB_VFS_HANDLE_SET_DATA(handle, config, > NULL, struct shadow_copy2_config, > return -1); >-- >1.7.9.5 > > >From f5528982bb9cc470176077f16600117347b4b15a Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Sat, 1 Jun 2013 02:14:41 +0200 >Subject: [PATCH 16/33] shadow_copy2: implement disk_free > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit ea898ea1ac1cc9364c5b7396db3902aeb114cfb8) >--- > source3/modules/vfs_shadow_copy2.c | 37 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 37 insertions(+) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index 4c8ee25..94621873 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -1576,6 +1576,42 @@ static int shadow_copy2_get_real_filename(struct vfs_handle_struct *handle, > return ret; > } > >+static uint64_t shadow_copy2_disk_free(vfs_handle_struct *handle, >+ const char *path, bool small_query, >+ uint64_t *bsize, uint64_t *dfree, >+ uint64_t *dsize) >+{ >+ time_t timestamp; >+ char *stripped; >+ ssize_t ret; >+ int saved_errno; >+ char *conv; >+ >+ if (!shadow_copy2_strip_snapshot(talloc_tos(), handle, path, >+ ×tamp, &stripped)) { >+ return -1; >+ } >+ if (timestamp == 0) { >+ return SMB_VFS_NEXT_DISK_FREE(handle, path, small_query, >+ bsize, dfree, dsize); >+ } >+ >+ conv = shadow_copy2_convert(talloc_tos(), handle, stripped, timestamp); >+ TALLOC_FREE(stripped); >+ if (conv == NULL) { >+ return -1; >+ } >+ >+ ret = SMB_VFS_NEXT_DISK_FREE(handle, conv, small_query, bsize, dfree, >+ dsize); >+ >+ saved_errno = errno; >+ TALLOC_FREE(conv); >+ errno = saved_errno; >+ >+ return ret; >+} >+ > static int shadow_copy2_connect(struct vfs_handle_struct *handle, > const char *service, const char *user) > { >@@ -1814,6 +1850,7 @@ static int shadow_copy2_connect(struct vfs_handle_struct *handle, > static struct vfs_fn_pointers vfs_shadow_copy2_fns = { > .connect_fn = shadow_copy2_connect, > .opendir_fn = shadow_copy2_opendir, >+ .disk_free_fn = shadow_copy2_disk_free, > .rename_fn = shadow_copy2_rename, > .link_fn = shadow_copy2_link, > .symlink_fn = shadow_copy2_symlink, >-- >1.7.9.5 > > >From 0a886367688658b41c762c12f9041597a0621d8c Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Thu, 23 May 2013 16:21:46 +0200 >Subject: [PATCH 17/33] shadow_copy2: in the classical case, use configured > path in shadow_copy2_find_snapdir() > >There is no point in searching for snapdir if not in snapdirseverywhere mode. > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit dbdb436a80e2fb75d9fd8ae17192702123c3b530) >--- > source3/modules/vfs_shadow_copy2.c | 7 +++++++ > 1 file changed, 7 insertions(+) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index 94621873..952b010 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -1047,6 +1047,13 @@ static char *shadow_copy2_find_snapdir(TALLOC_CTX *mem_ctx, > SMB_VFS_HANDLE_GET_DATA(handle, config, struct shadow_copy2_config, > return NULL); > >+ /* >+ * If the non-snapdisrseverywhere mode, we should not search! >+ */ >+ if (!config->snapdirseverywhere) { >+ return config->snapshot_basepath; >+ } >+ > path = talloc_asprintf(mem_ctx, "%s/%s", > handle->conn->connectpath, > smb_fname->base_name); >-- >1.7.9.5 > > >From a83098b6b531a1d744333d99b5d44f7865878dfb Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Tue, 28 May 2013 17:01:20 +0200 >Subject: [PATCH 18/33] shadow_copy2: make shadow_copy2_find_snapdir() return > const char * > >instead of char *. This eliminates compiler warnings. >snapdir is a const string in all occasions. > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit e86923eb52633c5b6133c45678355ce69bb43a54) >--- > source3/modules/vfs_shadow_copy2.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index 952b010..e227b10 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -1036,12 +1036,12 @@ static char *have_snapdir(struct vfs_handle_struct *handle, > * Find the snapshot directory (if any) for the given > * filename (which is relative to the share). > */ >-static char *shadow_copy2_find_snapdir(TALLOC_CTX *mem_ctx, >- struct vfs_handle_struct *handle, >- struct smb_filename *smb_fname) >+static const char *shadow_copy2_find_snapdir(TALLOC_CTX *mem_ctx, >+ struct vfs_handle_struct *handle, >+ struct smb_filename *smb_fname) > { > char *path, *p; >- char *snapdir; >+ const char *snapdir; > struct shadow_copy2_config *config; > > SMB_VFS_HANDLE_GET_DATA(handle, config, struct shadow_copy2_config, >-- >1.7.9.5 > > >From 0427f791bcb505a4514fc4e001d253f96c41a8be Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Wed, 29 May 2013 17:12:21 +0200 >Subject: [PATCH 19/33] shadow_copy2: shadow_copy2_insert_string(): do not > prepend a "/" in absolute mode > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit 304a0f531caa5f33f205739470f17e983d25a6b5) >--- > source3/modules/vfs_shadow_copy2.c | 22 ++++++++++++++++++++-- > 1 file changed, 20 insertions(+), 2 deletions(-) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index e227b10..97f208e 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -161,6 +161,12 @@ static bool shadow_copy2_find_slashes(TALLOC_CTX *mem_ctx, const char *str, > * Given a timstamp, build the string to insert into a path > * as a path component for creating the local path to the > * snapshot at the given timestamp of the input path. >+ * >+ * In the case of a parallel snapdir (specified with an >+ * absolute path), this is the inital portion of the >+ * local path of any snapshot file. The complete path is >+ * obtained by appending the portion of the file's path >+ * below the share root's mountpoint. > */ > static char *shadow_copy2_insert_string(TALLOC_CTX *mem_ctx, > struct vfs_handle_struct *handle, >@@ -170,6 +176,7 @@ static char *shadow_copy2_insert_string(TALLOC_CTX *mem_ctx, > fstring snaptime_string; > size_t snaptime_len; > struct shadow_copy2_config *config; >+ char *result = NULL; > > SMB_VFS_HANDLE_GET_DATA(handle, config, struct shadow_copy2_config, > return NULL); >@@ -204,8 +211,19 @@ static char *shadow_copy2_insert_string(TALLOC_CTX *mem_ctx, > return NULL; > } > } >- return talloc_asprintf(mem_ctx, "/%s/%s", >- config->snapdir, snaptime_string); >+ >+ if (config->snapdir_absolute) { >+ result = talloc_asprintf(mem_ctx, "%s/%s", >+ config->snapdir, snaptime_string); >+ } else { >+ result = talloc_asprintf(mem_ctx, "/%s/%s", >+ config->snapdir, snaptime_string); >+ } >+ if (result == NULL) { >+ DEBUG(1, (__location__ " talloc_asprintf failed\n")); >+ } >+ >+ return result; > } > > /** >-- >1.7.9.5 > > >From 8a928ba3a45f7713f281a8afb82691069b2cbc6b Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Thu, 30 May 2013 23:51:02 +0200 >Subject: [PATCH 20/33] shadow_copy2: factor shadow_copy2_posix_gmt_string() > out of shadow_copy2_insert_string() > >for re-use.. > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit 4cc5140bbe207f08d9b4fb0d119e74cc839e55dd) >--- > source3/modules/vfs_shadow_copy2.c | 68 +++++++++++++++++++++++++----------- > 1 file changed, 47 insertions(+), 21 deletions(-) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index 97f208e..ac6cdbb 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -158,60 +158,86 @@ static bool shadow_copy2_find_slashes(TALLOC_CTX *mem_ctx, const char *str, > } > > /** >- * Given a timstamp, build the string to insert into a path >- * as a path component for creating the local path to the >- * snapshot at the given timestamp of the input path. >- * >- * In the case of a parallel snapdir (specified with an >- * absolute path), this is the inital portion of the >- * local path of any snapshot file. The complete path is >- * obtained by appending the portion of the file's path >- * below the share root's mountpoint. >+ * Given a timstamp, build the posix level GTM-tag string >+ * based on the configurable format. > */ >-static char *shadow_copy2_insert_string(TALLOC_CTX *mem_ctx, >- struct vfs_handle_struct *handle, >- time_t snapshot) >+static size_t shadow_copy2_posix_gmt_string(struct vfs_handle_struct *handle, >+ time_t snapshot, >+ char *snaptime_string, >+ size_t len) > { > struct tm snap_tm; >- fstring snaptime_string; > size_t snaptime_len; > struct shadow_copy2_config *config; >- char *result = NULL; > > SMB_VFS_HANDLE_GET_DATA(handle, config, struct shadow_copy2_config, >- return NULL); >+ return 0); > > if (config->use_sscanf) { > snaptime_len = snprintf(snaptime_string, >- sizeof(snaptime_string), >+ len, > config->gmt_format, > (unsigned long)snapshot); > if (snaptime_len <= 0) { > DEBUG(10, ("snprintf failed\n")); >- return NULL; >+ return snaptime_len; > } > } else { > if (config->use_localtime) { > if (localtime_r(&snapshot, &snap_tm) == 0) { > DEBUG(10, ("gmtime_r failed\n")); >- return NULL; >+ return -1; > } > } else { > if (gmtime_r(&snapshot, &snap_tm) == 0) { > DEBUG(10, ("gmtime_r failed\n")); >- return NULL; >+ return -1; > } > } > snaptime_len = strftime(snaptime_string, >- sizeof(snaptime_string), >+ len, > config->gmt_format, > &snap_tm); > if (snaptime_len == 0) { > DEBUG(10, ("strftime failed\n")); >- return NULL; >+ return 0; > } > } > >+ return snaptime_len; >+} >+ >+/** >+ * Given a timstamp, build the string to insert into a path >+ * as a path component for creating the local path to the >+ * snapshot at the given timestamp of the input path. >+ * >+ * In the case of a parallel snapdir (specified with an >+ * absolute path), this is the inital portion of the >+ * local path of any snapshot file. The complete path is >+ * obtained by appending the portion of the file's path >+ * below the share root's mountpoint. >+ */ >+static char *shadow_copy2_insert_string(TALLOC_CTX *mem_ctx, >+ struct vfs_handle_struct *handle, >+ time_t snapshot) >+{ >+ fstring snaptime_string; >+ size_t snaptime_len = 0; >+ char *result = NULL; >+ struct shadow_copy2_config *config; >+ >+ SMB_VFS_HANDLE_GET_DATA(handle, config, struct shadow_copy2_config, >+ return NULL); >+ >+ snaptime_len = shadow_copy2_posix_gmt_string(handle, >+ snapshot, >+ snaptime_string, >+ sizeof(snaptime_string)); >+ if (snaptime_len <= 0) { >+ return NULL; >+ } >+ > if (config->snapdir_absolute) { > result = talloc_asprintf(mem_ctx, "%s/%s", > config->snapdir, snaptime_string); >-- >1.7.9.5 > > >From 69e18131dcbe352160e19607115bf40b3dc9fe76 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Fri, 31 May 2013 00:18:52 +0200 >Subject: [PATCH 21/33] shadow_copy2: introduce shadow_copy2_snapshot_path() > >This builds the posix snapshot path for the connection >at the provided timestamp. For the non-snapdirseverywhere case. > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit 38e108563d7e9e14203bf4dabfda09bd1408e980) >--- > source3/modules/vfs_shadow_copy2.c | 37 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 37 insertions(+) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index ac6cdbb..ec60884 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -253,6 +253,43 @@ static char *shadow_copy2_insert_string(TALLOC_CTX *mem_ctx, > } > > /** >+ * Build the posix snapshot path for the connection >+ * at the given timestamp, i.e. the absolute posix path >+ * that contains the snapshot for this file system. >+ * >+ * This only applies to classical case, i.e. not >+ * to the "snapdirseverywhere" mode. >+ */ >+static char *shadow_copy2_snapshot_path(TALLOC_CTX *mem_ctx, >+ struct vfs_handle_struct *handle, >+ time_t snapshot) >+{ >+ fstring snaptime_string; >+ size_t snaptime_len = 0; >+ char *result = NULL; >+ struct shadow_copy2_config *config; >+ >+ SMB_VFS_HANDLE_GET_DATA(handle, config, struct shadow_copy2_config, >+ return NULL); >+ >+ snaptime_len = shadow_copy2_posix_gmt_string(handle, >+ snapshot, >+ snaptime_string, >+ sizeof(snaptime_string)); >+ if (snaptime_len <= 0) { >+ return NULL; >+ } >+ >+ result = talloc_asprintf(mem_ctx, "%s/%s", >+ config->snapshot_basepath, snaptime_string); >+ if (result == NULL) { >+ DEBUG(1, (__location__ " talloc_asprintf failed\n")); >+ } >+ >+ return result; >+} >+ >+/** > * Strip a snapshot component from an filename as > * handed in via the smb layer. > * Returns the parsed timestamp and the stripped filename. >-- >1.7.9.5 > > >From 8d6f63831dd3f0d768802f0ea2c4cf88b4feeae5 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Wed, 29 May 2013 17:14:49 +0200 >Subject: [PATCH 22/33] shadow_copy2: add comments explaining decisions in > shadow_copy2_strip_snapshot() > >This should make it more easy to understand what the cases are. > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit 3d053b1ab3e0b918509e06086a54834a9ae9cdb7) >--- > source3/modules/vfs_shadow_copy2.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index ec60884..ade8c28 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -316,6 +316,7 @@ static bool shadow_copy2_strip_snapshot(TALLOC_CTX *mem_ctx, > goto no_snapshot; > } > if ((p > name) && (p[-1] != '/')) { >+ /* the GMT-token does not start a path-component */ > goto no_snapshot; > } > q = strptime(p, GMT_FORMAT, &tm); >@@ -328,6 +329,7 @@ static bool shadow_copy2_strip_snapshot(TALLOC_CTX *mem_ctx, > goto no_snapshot; > } > if ((p == name) && (q[0] == '\0')) { >+ /* the name consists of only the GMT token */ > if (pstripped != NULL) { > stripped = talloc_strdup(mem_ctx, ""); > if (stripped == NULL) { >@@ -339,6 +341,14 @@ static bool shadow_copy2_strip_snapshot(TALLOC_CTX *mem_ctx, > return true; > } > 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? >+ */ > goto no_snapshot; > } > q += 1; >-- >1.7.9.5 > > >From 61b8756e5da162398a40bd19a70fff35d2b84fb7 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Wed, 29 May 2013 23:57:30 +0200 >Subject: [PATCH 23/33] shadow_copy2: add some debug to > shadow_copy2_strip_snapshot() > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit afcb84e69f46671030710bdda1c8798235b9ace7) >--- > source3/modules/vfs_shadow_copy2.c | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index ade8c28..17eb8ba 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -311,6 +311,8 @@ static bool shadow_copy2_strip_snapshot(TALLOC_CTX *mem_ctx, > SMB_VFS_HANDLE_GET_DATA(handle, config, struct shadow_copy2_config, > return false); > >+ DEBUG(10, (__location__ ": enter path '%s'\n", name)); >+ > p = strstr_m(name, "@GMT-"); > if (p == NULL) { > goto no_snapshot; >@@ -366,11 +368,19 @@ static bool shadow_copy2_strip_snapshot(TALLOC_CTX *mem_ctx, > return false; > } > >+ DEBUG(10, (__location__ ": snapdirseverywhere mode.\n" >+ "path '%s'.\n" >+ "insert string '%s'\n", name, insert)); >+ > have_insert = (strstr(name, insert+1) != NULL); >- TALLOC_FREE(insert); > if (have_insert) { >+ DEBUG(10, (__location__ ": insert string '%s' found in " >+ "path '%s' found in snapdirseverywhere mode " >+ "==> already converted\n", insert, name)); >+ TALLOC_FREE(insert); > goto no_snapshot; > } >+ TALLOC_FREE(insert); > } > > if (pstripped != NULL) { >-- >1.7.9.5 > > >From 9dbd581f40784d78daaf04bc5d0a989f5b4aefdd Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Wed, 29 May 2013 17:16:23 +0200 >Subject: [PATCH 24/33] shadow_copy2: fix shadow_copy2_strip_snapshot() in the > classical case > >I.e., fix detection of already converted names. > >This is done by using the shadow_copy2_snapshot_path() function >and comparing if the input string starts with that. > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit 4b8d9c65f45db426716763629f1e22b0eb859a99) >--- > source3/modules/vfs_shadow_copy2.c | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index 17eb8ba..8c2e767 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -381,6 +381,36 @@ static bool shadow_copy2_strip_snapshot(TALLOC_CTX *mem_ctx, > goto no_snapshot; > } > TALLOC_FREE(insert); >+ } else { >+ char *snapshot_path; >+ char *s; >+ >+ snapshot_path = shadow_copy2_snapshot_path(talloc_tos(), >+ handle, >+ timestamp); >+ if (snapshot_path == NULL) { >+ errno = ENOMEM; >+ return false; >+ } >+ >+ DEBUG(10, (__location__ " path: '%s'.\n" >+ "snapshot path: '%s'\n", name, snapshot_path)); >+ >+ s = strstr(name, snapshot_path); >+ if (s == name) { >+ /* >+ * this starts with "snapshot_basepath/GMT-Token" >+ * so it is already a converted absolute >+ * path. Don't process further. >+ */ >+ DEBUG(10, (__location__ ": path '%s' starts with " >+ "snapshot path '%s' (not in " >+ "snapdirseverywhere mode) ==> " >+ "already converted\n", name, snapshot_path)); >+ talloc_free(snapshot_path); >+ goto no_snapshot; >+ } >+ talloc_free(snapshot_path); > } > > if (pstripped != NULL) { >-- >1.7.9.5 > > >From e875c106a1d69946d86cba46aae5619a03338958 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Tue, 28 May 2013 16:59:25 +0200 >Subject: [PATCH 25/33] shadow_copy2: initialize "converted" string to null in > shadow_copy2_convert() > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit 249e9b4a34d8959bd94735c1921ecfc24d6a2705) >--- > source3/modules/vfs_shadow_copy2.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index 8c2e767..ecf448d 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -509,7 +509,7 @@ static char *shadow_copy2_convert(TALLOC_CTX *mem_ctx, > goto fail; > } > insertlen = talloc_get_size(insert)-1; >- converted = talloc_array(mem_ctx, char, pathlen + insertlen + 1); >+ converted = talloc_zero_array(mem_ctx, char, pathlen + insertlen + 1); > if (converted == NULL) { > goto fail; > } >-- >1.7.9.5 > > >From ef7747994ea960cb61fd903e7b3eff5ae57c32e5 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Wed, 29 May 2013 15:06:22 +0200 >Subject: [PATCH 26/33] shadow_copy2: add some blank lines for visual > separation to shadow_copy2_convert() > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit 86988db1f0ebd170d2bc91b6ed78f8845bfd270c) >--- > source3/modules/vfs_shadow_copy2.c | 2 ++ > 1 file changed, 2 insertions(+) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index ecf448d..95249b2 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -504,11 +504,13 @@ static char *shadow_copy2_convert(TALLOC_CTX *mem_ctx, > &slashes, &num_slashes)) { > goto fail; > } >+ > insert = shadow_copy2_insert_string(talloc_tos(), handle, timestamp); > if (insert == NULL) { > goto fail; > } > insertlen = talloc_get_size(insert)-1; >+ > converted = talloc_zero_array(mem_ctx, char, pathlen + insertlen + 1); > if (converted == NULL) { > goto fail; >-- >1.7.9.5 > > >From 5734ea332873dd3c95510ef99a55d1222e30bfd1 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Thu, 23 May 2013 16:23:03 +0200 >Subject: [PATCH 27/33] shadow_copy2: fix shadow_copy2_convert() in the > classical case. > >I.e. the non-snapdirseverywhere case. >This in particular fixes the case of a snapdir hierarchy >that is parallel to the share or mountpoint and not subordinate. > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit 9ab89371c8eddad2f274736b508866e2a92b74a3) >--- > source3/modules/vfs_shadow_copy2.c | 47 ++++++++++++++++++++++++++++++++++-- > 1 file changed, 45 insertions(+), 2 deletions(-) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index 95249b2..cdab21e 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -490,6 +490,51 @@ static char *shadow_copy2_convert(TALLOC_CTX *mem_ctx, > SMB_VFS_HANDLE_GET_DATA(handle, config, struct shadow_copy2_config, > return NULL); > >+ DEBUG(10, ("converting '%s'\n", name)); >+ >+ if (!config->snapdirseverywhere) { >+ int ret; >+ char *snapshot_path; >+ >+ snapshot_path = shadow_copy2_snapshot_path(talloc_tos(), >+ handle, >+ timestamp); >+ if (snapshot_path == NULL) { >+ goto fail; >+ } >+ >+ if (config->rel_connectpath == NULL) { >+ converted = talloc_asprintf(mem_ctx, "%s/%s", >+ snapshot_path, name); >+ } else { >+ converted = talloc_asprintf(mem_ctx, "%s/%s/%s", >+ snapshot_path, >+ config->rel_connectpath, >+ name); >+ } >+ if (converted == NULL) { >+ goto fail; >+ } >+ >+ ZERO_STRUCT(converted_fname); >+ converted_fname.base_name = converted; >+ >+ ret = SMB_VFS_NEXT_LSTAT(handle, &converted_fname); >+ DEBUG(10, ("Trying[not snapdirseverywhere] %s: %d (%s)\n", >+ converted, >+ ret, ret == 0 ? "ok" : strerror(errno))); >+ if (ret == 0) { >+ DEBUG(10, ("Found %s\n", converted)); >+ result = converted; >+ converted = NULL; >+ goto fail; >+ } else { >+ errno = ENOENT; >+ goto fail; >+ } >+ /* never reached ... */ >+ } >+ > path = talloc_asprintf(mem_ctx, "%s/%s", handle->conn->connectpath, > name); > if (path == NULL) { >@@ -498,8 +543,6 @@ static char *shadow_copy2_convert(TALLOC_CTX *mem_ctx, > } > pathlen = talloc_get_size(path)-1; > >- DEBUG(10, ("converting %s\n", path)); >- > if (!shadow_copy2_find_slashes(talloc_tos(), path, > &slashes, &num_slashes)) { > goto fail; >-- >1.7.9.5 > > >From 1b74ab585e1ace5737fc6984bc6914f0f4e0b0ca Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Fri, 31 May 2013 00:45:16 +0200 >Subject: [PATCH 28/33] shadow_copy2: improve debug in shadow_copy2_convert() > in snapdirseverywhere mode > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit 935120dbc01890e313e2902b13141d4a13fe96d5) >--- > source3/modules/vfs_shadow_copy2.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index cdab21e..950f290 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -613,7 +613,8 @@ static char *shadow_copy2_convert(TALLOC_CTX *mem_ctx, > > ret = SMB_VFS_NEXT_LSTAT(handle, &converted_fname); > >- DEBUG(10, ("Trying %s: %d (%s)\n", converted, >+ DEBUG(10, ("Trying[snapdirseverywhere] %s: %d (%s)\n", >+ converted, > ret, ret == 0 ? "ok" : strerror(errno))); > if (ret == 0) { > /* success */ >-- >1.7.9.5 > > >From 46aa2bf4bd7e2e069cdeb9086ac31cd86f36a735 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Fri, 31 May 2013 00:46:01 +0200 >Subject: [PATCH 29/33] shadow_copy2: use stored mount_point instead of > recalculating. > >In the case of snapdirseverywhere but NOT crossmountpoints. > >This spares stat calls. >And is the only correct thing to do if the mount point was >specified in the configuration. > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit 6ccbc1347d3240fc3c874a1957b654456fb6234c) >--- > source3/modules/vfs_shadow_copy2.c | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index 950f290..ebc50e9 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -577,15 +577,7 @@ static char *shadow_copy2_convert(TALLOC_CTX *mem_ctx, > min_offset = 0; > > if (!config->crossmountpoints) { >- char *mount_point; >- >- mount_point = shadow_copy2_find_mount_point(talloc_tos(), >- handle); >- if (mount_point == NULL) { >- goto fail; >- } >- min_offset = strlen(mount_point); >- TALLOC_FREE(mount_point); >+ min_offset = strlen(config->mount_point); > } > > memcpy(converted, path, pathlen+1); >-- >1.7.9.5 > > >From de359067eb21be4f707c25d96ce8eac14aa2f4f5 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Wed, 4 Dec 2013 13:40:14 +0100 >Subject: [PATCH 30/33] s3:module:shadow_copy2: add my (C) > >Signed-off-by: Michael Adam <obnox@samba.org> >Reviewed-by: Volker Lendecke <vl@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit b5b5674287c935bf923cf570cf218ffb0ae7ce78) >--- > source3/modules/vfs_shadow_copy2.c | 1 + > 1 file changed, 1 insertion(+) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index ebc50e9..1018bcc 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -5,6 +5,7 @@ > * Copyright (C) Ed Plese 2009 > * Copyright (C) Volker Lendecke 2011 > * Copyright (C) Christian Ambach 2011 >+ * Copyright (C) Michael Adam 2013 > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published by >-- >1.7.9.5 > > >From 9551c4bf2ffa028a92fc91ab40526c1d1a69d0f1 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Wed, 4 Dec 2013 15:50:26 +0100 >Subject: [PATCH 31/33] s3:modules:shadow_copy2: improve headline comment > >Signed-off-by: Michael Adam <obnox@samba.org> >Reviewed-by: Volker Lendecke <vl@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit bffaf17d482cb1ad88698ea1a00aa7e4ddb0c0e7) >--- > source3/modules/vfs_shadow_copy2.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index 1018bcc..41a2a0e 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -1,5 +1,5 @@ > /* >- * Third attempt at a shadow copy module >+ * shadow_copy2: a shadow copy module (second implementation) > * > * Copyright (C) Andrew Tridgell 2007 (portions taken from shadow_copy2) > * Copyright (C) Ed Plese 2009 >-- >1.7.9.5 > > >From 9c67cb9f9b09686b7d3ebf578d33d3c0f5cf5dc4 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Wed, 4 Dec 2013 15:55:19 +0100 >Subject: [PATCH 32/33] s3:modules:shadow_copy2: remove redundant > documentation comment block > >and refer to the manual page instead > >Signed-off-by: Michael Adam <obnox@samba.org> >Reviewed-by: Volker Lendecke <vl@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(cherry picked from commit 6685e6512e03d9420439a730a40fcca3411a48db) >--- > source3/modules/vfs_shadow_copy2.c | 81 ++---------------------------------- > 1 file changed, 4 insertions(+), 77 deletions(-) > >diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c >index 41a2a0e..8243f63 100644 >--- a/source3/modules/vfs_shadow_copy2.c >+++ b/source3/modules/vfs_shadow_copy2.c >@@ -23,83 +23,10 @@ > */ > > /* >- >- This is a 3rd implemetation of a shadow copy module for exposing >- snapshots to windows clients as shadow copies. This version has the >- following features: >- >- 1) you don't need to populate your shares with symlinks to the >- snapshots. This can be very important when you have thousands of >- shares, or use [homes] >- >- 2) the inode number of the files is altered so it is different >- from the original. This allows the 'restore' button to work >- without a sharing violation >- >- 3) shadow copy results can be sorted before being sent to the >- client. This is beneficial for filesystems that don't read >- directories alphabetically (the default unix). >- >- 4) vanity naming for snapshots. Snapshots can be named in any >- format compatible with str[fp]time conversions. >- >- 5) time stamps in snapshot names can be represented in localtime >- rather than UTC. >- >- Module options: >- >- shadow:snapdir = <directory where snapshots are kept> >- >- This is the directory containing the @GMT-* snapshot directories. If it is an absolute >- path it is used as-is. If it is a relative path, then it is taken relative to the mount >- point of the filesystem that the root of this share is on >- >- shadow:basedir = <base directory that snapshots are from> >- >- This is an optional parameter that specifies the directory that >- the snapshots are relative to. It defaults to the filesystem >- mount point >- >- shadow:fixinodes = yes/no >- >- If you enable shadow:fixinodes then this module will modify the >- apparent inode number of files in the snapshot directories using >- a hash of the files path. This is needed for snapshot systems >- where the snapshots have the same device:inode number as the >- original files (such as happens with GPFS snapshots). If you >- don't set this option then the 'restore' button in the shadow >- copy UI will fail with a sharing violation. >- >- shadow:sort = asc/desc, or not specified for unsorted (default) >- >- This is an optional parameter that specifies that the shadow >- copy directories should be sorted before sending them to the >- client. This can be beneficial as unix filesystems are usually >- not listed alphabetically sorted. If enabled, you typically >- want to specify descending order. >- >- shadow:format = <format specification for snapshot names> >- >- This is an optional parameter that specifies the format >- specification for the naming of snapshots. The format must >- be compatible with the conversion specifications recognized >- by str[fp]time. The default value is "@GMT-%Y.%m.%d-%H.%M.%S". >- >- shadow:sscanf = yes/no (default is no) >- >- The time is the unsigned long integer (%lu) in the format string >- rather than a time strptime() can parse. The result must be a unix time_t >- time. >- >- shadow:localtime = yes/no (default is no) >- >- This is an optional parameter that indicates whether the >- snapshot names are in UTC/GMT or the local time. >- >- >- The following command would generate a correctly formatted directory name >- for use with the default parameters: >- date -u +@GMT-%Y.%m.%d-%H.%M.%S >+ * This is a second implemetation of a shadow copy module for exposing >+ * file system snapshots to windows clients as shadow copies. >+ * >+ * See the manual page for documentation. > */ > > #include "includes.h" >-- >1.7.9.5 > > >From 9a871397c6f5ef95ea4d168067f48d0d6ce29ed5 Mon Sep 17 00:00:00 2001 >From: Michael Adam <obnox@samba.org> >Date: Wed, 4 Dec 2013 10:27:24 +0100 >Subject: [PATCH 33/33] docs: update the manpage of vfs_shadow_copy2 >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Document the configuration and all the options >available for the shadow_copy2 module. > >Pair-Programmed-With: Björn Baumbach <bb@sernet.de> > >Signed-off-by: Michael Adam <obnox@samba.org> > >Reviewed-by: Andrew Bartlett <abartlet@samba.org> > >Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> >Autobuild-Date(master): Fri Dec 6 22:26:31 CET 2013 on sn-devel-104 >(cherry picked from commit f6ac6f20540f81257e1f180454b6a2c1239e85fa) >--- > docs-xml/manpages/vfs_shadow_copy2.8.xml | 290 +++++++++++++++++++++++++----- > 1 file changed, 242 insertions(+), 48 deletions(-) > >diff --git a/docs-xml/manpages/vfs_shadow_copy2.8.xml b/docs-xml/manpages/vfs_shadow_copy2.8.xml >index b313416..4f60667 100644 >--- a/docs-xml/manpages/vfs_shadow_copy2.8.xml >+++ b/docs-xml/manpages/vfs_shadow_copy2.8.xml >@@ -13,7 +13,8 @@ > > <refnamediv> > <refname>vfs_shadow_copy2</refname> >- <refpurpose>Expose snapshots to Windows clients as shadow copies.</refpurpose> >+ <refpurpose>Expose snapshots to Windows clients as shadow copies. >+ </refpurpose> > </refnamediv> > > <refsynopsisdiv> >@@ -29,21 +30,57 @@ > <citerefentry><refentrytitle>samba</refentrytitle> > <manvolnum>7</manvolnum></citerefentry> suite.</para> > >- <para>The <command>vfs_shadow_copy2</command> VFS module functionality >- that is similar to Microsoft Shadow Copy services. When setup properly, >+ <para> >+ The <command>vfs_shadow_copy2</command> VFS module offers a >+ functionality similar to Microsoft Shadow Copy services. >+ When set up properly, > this module allows Microsoft Shadow Copy clients to browse >- "shadow copies" on Samba shares. >+ through file system snapshots as "shadow copies" on Samba shares. > </para> > >- <para>This is a 2nd implementation of a shadow copy module. This >- version has the following features:</para> >+ <para> >+ This is a second implementation of a shadow copy module >+ which has the following additional features (compared to the original >+ <citerefentry><refentrytitle>shadow_copy</refentrytitle> >+ <manvolnum>8</manvolnum></citerefentry> module): >+ </para> > <orderedlist continuation="restarts" inheritnum="ignore" numeration="arabic"> >- <listitem><para>You don't need to populate your shares with symlinks to the >- snapshots. This can be very important when you have thousands of >- shares, or use [homes].</para></listitem> >- <listitem><para>The inode number of the files is altered so it is different >- from the original. This allows the 'restore' button to work >- without a sharing violation.</para></listitem> >+ <listitem><para> >+ There is no need any more to populate your share's root directory >+ with symlinks to the snapshots if the file system stores the >+ snapshots elsewhere. >+ Instead, you can flexibly configure the module where to look for >+ the file system snapshots. >+ This can be very important when you have thousands of >+ shares, or use [homes]. >+ </para></listitem> >+ <listitem><para> >+ Snapshot directories need not be in one fixed central place but >+ can be located anywhere in the directory tree. This mode helps to >+ support file systems that offer snapshotting of particutlar >+ subtrees, for example the GPFS independent file sets. >+ </para></listitem> >+ <listitem><para> >+ Vanity naming for snapshots: snapshots can be named in any format >+ compatible with with str[fp]time conversions. >+ </para></listitem> >+ <listitem><para> >+ Timestamps can be represented in localtime rather than UTC. >+ </para></listitem> >+ <listitem><para> >+ The inode number of the files can optionally be altered to be >+ different from the original. This fixes the 'restore' button >+ in the Windows GUI to work without a sharing violation when >+ serving from file systems, like GPFS, that return the same >+ device and inode number for the snapshot file and the original. >+ </para></listitem> >+ <listitem><para> >+ Shadow copy results are by default sorted before being sent to the >+ client. This is beneficial for filesystems that don't read >+ directories alphabetically (the default unix). Sort ordering can be >+ configured and sorting can be turned off completely if the file >+ system sorts its directory listing. >+ </para></listitem> > </orderedlist> > > <para>This module is stackable.</para> >@@ -58,25 +95,32 @@ > support for this. > </para> > >- <para>Filesystem snapshots must be mounted on >+ <para>Filesystem snapshots must be available under > specially named directories in order to be recognized by >- <command>vfs_shadow_copy2</command>. The snapshot mount points must >- be immediate children of a the directory being shared.</para> >- >- <para>The snapshot naming convention is @GMT-YYYY.MM.DD-hh.mm.ss, >- where: >+ <command>vfs_shadow_copy2</command>. These snapshot directory >+ is typically a direct subdirectory of the share root's mountpoint >+ but there are other modes that can be configured with the >+ parameters described in detail below.</para> >+ >+ <para>The snapshot at a given point in time is expected in a >+ subdirectory of the snapshot directory where the snapshot's >+ directory is expected to be a formatted version of the >+ snapshot time. The default format which can be changed >+ with the <command>shadow:format</command> option >+ is @GMT-YYYY.MM.DD-hh.mm.ss, where: > <itemizedlist> >- <listitem><para><command>YYYY</command> is the 4 digit year</para></listitem> >- <listitem><para><command>MM</command> is the 2 digit month</para></listitem> >- <listitem><para><command>DD</command> is the 2 digit day</para></listitem> >- <listitem><para><command>hh</command> is the 2 digit hour</para></listitem> >- <listitem><para><command>mm</command> is the 2 digit minute</para></listitem> >- <listitem><para><command>ss</command> is the 2 digit second.</para></listitem> >- </itemizedlist> >+ <listitem><para><command>YYYY</command> is the 4 digit year</para></listitem> >+ <listitem><para><command>MM</command> is the 2 digit month</para></listitem> >+ <listitem><para><command>DD</command> is the 2 digit day</para></listitem> >+ <listitem><para><command>hh</command> is the 2 digit hour</para></listitem> >+ <listitem><para><command>mm</command> is the 2 digit minute</para></listitem> >+ <listitem><para><command>ss</command> is the 2 digit second.</para></listitem> >+ </itemizedlist> > </para> > >- <para>The <command>vfs_shadow_copy2</command> snapshot naming convention can be >- produced with the following <citerefentry><refentrytitle>date</refentrytitle> >+ <para>The <command>vfs_shadow_copy2</command> snapshot naming >+ convention can be produced with the following >+ <citerefentry><refentrytitle>date</refentrytitle> > <manvolnum>1</manvolnum></citerefentry> command: > <programlisting> > TZ=GMT date +@GMT-%Y.%m.%d-%H.%M.%S >@@ -89,11 +133,47 @@ > > <variablelist> > <varlistentry> >+ <term>shadow:mountpoint = MOUNTPOINT >+ </term> >+ <listitem> >+ <para> >+ With this parameter, one can specify the mount point >+ of the filesystem that contains the share path. >+ Usually this mount point is automatically detected. >+ But for some constellations, in particular tests, >+ it can be convenient to be able to specify it. >+ </para> >+ <para>Example: shadow:mountpoint = /path/to/filesystem</para> >+ <para>Default: shadow:mountpoint = NOT SPECIFIED</para> >+ </listitem> >+ </varlistentry> >+ >+ <varlistentry> > <term>shadow:snapdir = SNAPDIR > </term> > <listitem> >- <para>Path to the directory where snapshots are kept. >- </para> >+ <para> >+ Path to the directory where the file system of >+ the share keeps its snapshots. >+ If an absolute path is specified, it is used as-is. >+ If a relative path is specified, then it is taken >+ relative to the mount point of the filesystem of >+ the share root. (See <command>shadow:mountpoint</command>.) >+ </para> >+ <para> >+ Note that <command>shadow:snapdirseverywhere</command> >+ depends on this parameter and needs a relative path. >+ Setting an absolute path disables >+ <command>shadow:snapdirseverywhere</command>. >+ </para> >+ <para> >+ Note that the <command>shadow:crossmountpoints</command> >+ option also requires a relative snapdir. >+ Setting an absolute path disables >+ <command>shadow:crossmountpoints</command>. >+ </para> >+ <para>Example: shadow:snapdir = /some/absolute/path</para> >+ <para>Default: shadow:snapdir = .snapshots</para> > </listitem> > </varlistentry> > >@@ -101,21 +181,65 @@ > <term>shadow:basedir = BASEDIR > </term> > <listitem> >- <para>Path to the base directory that snapshots are from. >- </para> >+ <para> >+ The basedir option allows to specify a directory >+ between the share's mount point and the share root, >+ relative to which the file system's snapshots are taken. >+ </para> >+ <para> >+ For example, if >+ <itemizedlist> >+ <listitem><para> >+ <command>basedir = mountpoint/rel_basedir</command> >+ </para></listitem> >+ <listitem><para> >+ <command>share_root = basedir/rel_share_root</command> >+ </para></listitem> >+ <listitem><para> >+ <command>snapshot_path = mountpoint/snapdir</command> >+ </para> >+ <para> >+ or >+ <command>snapshot_path = snapdir</command> >+ if snapdir is absolute >+ </para></listitem> >+ </itemizedlist> >+ then the snapshot of a >+ <command>file = mountpoint/rel_basedir/rel_share_root/rel_file</command> >+ at a time TIME will be found under >+ <command>snapshot_path/FS_GMT_TOKEN(TIME)/rel_share_root/rel_file</command>, >+ where FS_GMT_TOKEN(TIME) is the timestamp string belonging >+ to TIME in the format required by the file system. >+ (See <command>shadow:format</command>.) >+ </para> >+ <para>The default for the basedir is the mount point >+ of the file system of the share root >+ (see <command>shadow:mountpoint</command>). >+ </para> >+ <para> >+ Note that the <command>shadow:snapdirseverywhere</command> >+ and <command>shadow:crossmountpoints</command> >+ options are incompatible with <command>shadow:basedir</command> >+ and disable the basedir setting. >+ </para> > </listitem> > </varlistentry> > > <varlistentry> >- <term>shadow:sort = asc/desc, or not specified for unsorted (default) >+ <term>shadow:sort = asc/desc > </term> > <listitem> >- <para>By this parameter one can specify that the shadow >- copy directories should be sorted before they are sent to the >- client. This can be beneficial as unix filesystems are usually >- not listed alphabetically sorted. If enabled, you typically >- want to specify descending order. >- </para> >+ <para>By default, this module sorts the shadow copy data >+ alphabetically before sending it to the client. >+ With this parameter, one can specify the sort order. >+ Possible known values are desc (descending, the default) >+ and asc (ascending). If the file system lists directories >+ alphabetically sorted, one can turn off sorting in this >+ module by specifying any other value. >+ </para> >+ <para>Example: shadow:sort = asc</para> >+ <para>Example: shadow:sort = none</para> >+ <para>Default: shadow:sort = desc</para> > </listitem> > </varlistentry> > >@@ -124,9 +248,10 @@ > </term> > <listitem> > <para>This is an optional parameter that indicates whether the >- snapshot names are in UTC/GMT or in local time. By default >- UTC is expected. >+ snapshot names are in UTC/GMT or in local time. If it is >+ disabled then UTC/GMT is expected. > </para> >+ <para>shadow:localtime = no</para> > </listitem> > </varlistentry> > >@@ -135,14 +260,28 @@ > </term> > <listitem> > <para>This is an optional parameter that specifies the format >- specification for the naming of snapshots. The format must >- be compatible with the conversion specifications recognized >- by str[fp]time. The default value is "@GMT-%Y.%m.%d-%H.%M.%S". >+ specification for the naming of snapshots in the file system. >+ The format must be compatible with the conversion >+ specifications recognized by str[fp]time. > </para> >+ <para>Default: shadow:format = "@GMT-%Y.%m.%d-%H.%M.%S"</para> > </listitem> > </varlistentry> > > <varlistentry> >+ <term>shadow:sscanf = yes/no</term> >+ <listitem> >+ <para> >+ This paramter can be used to specify that the time in >+ format string is given as an unsigned long integer (%lu) >+ rather than a time strptime() can parse. >+ The result must be a unix time_t time. >+ </para> >+ <para>Default: shadow:sscanf = no</para> >+ </listitem> >+ </varlistentry> >+ >+ <varlistentry> > <term>shadow:fixinodes = yes/no > </term> > <listitem> >@@ -155,23 +294,78 @@ > this option then the 'restore' button in the shadow copy UI > will fail with a sharing violation. > </para> >+ <para>Default: shadow:fixinodes = no</para> > </listitem> > </varlistentry> >+ > <varlistentry> > <term>shadow:snapdirseverywhere = yes/no > </term> > <listitem> >- <para>If you enable <command moreinfo="none"> >- shadow:snapdirseverywhere </command> then this module will look >- out for snapshot directories in the current and all parent >- directories of the current working directory. >+ <para> >+ If you enable >+ <command moreinfo="none">shadow:snapdirseverywhere </command> >+ then this module will look >+ out for snapshot directories in the current working directory >+ and all parent directories, stopping at the mount point >+ by default. >+ But see <command>shadow:crossmountpoints</command> how to change >+ that behaviour. >+ </para> >+ <para> > An example where this is needed are independent filesets in > IBM's GPFS, but other filesystems might support snapshotting > only particular subtrees of the filesystem as well. > </para> >+ <para> >+ Note that <command>shadow:snapdirseverywhere</command> >+ depends on <command>shadow:snapdir</command> and needs it to be >+ a relative path. Setting an absolute snapdir path disables >+ <command>shadow:snapdirseverywhere</command>. >+ </para> >+ <para> >+ Note that this option is incompatible with the >+ <command>shadow:basedir</command> option and removes the >+ <command>shadow:basedir</command> setting by itself. >+ </para> >+ <para>Example: shadow:snapdirseverywhere = yes</para> >+ <para>Default: shadow:snapdirseverywhere = no</para> > </listitem> > </varlistentry> > >+ <varlistentry> >+ <term>shadow:crossmountpoints = yes/no >+ </term> >+ <listitem> >+ <para> >+ This option is effective in the case of >+ <command>shadow:snapdirseverywhere = yes</command>. >+ Setting this option makes the module not stop at the >+ first mount point encountered when looking for snapdirs, >+ but lets it search potentially all through the path >+ instead. >+ </para> >+ <para> >+ An example where this is needed are independent filesets in >+ IBM's GPFS, but other filesystems might support snapshotting >+ only particular subtrees of the filesystem as well. >+ </para> >+ <para> >+ Note that <command>shadow:snapdirseverywhere</command> >+ depends on <command>shadow:snapdir</command> and needs it to be >+ a relative path. Setting an absolute snapdir path disables >+ <command>shadow:snapdirseverywhere</command>. >+ </para> >+ <para> >+ Note that this option is incompatible with the >+ <command>shadow:basedir</command> option and removes the >+ <command>shadow:basedir</command> setting by itself. >+ </para> >+ <para>Example: shadow:crossmountpoints = yes</para> >+ <para>Default: shadow:crossmountpoints = no</para> >+ </listitem> >+ </varlistentry> >+ > </variablelist> > </refsect1> > >@@ -209,7 +403,7 @@ > <refsect1> > <title>VERSION</title> > >- <para>This man page is correct for version 3.2.7 of the Samba suite. >+ <para>This man page is correct for version 4.0 of the Samba suite. > </para> > </refsect1> > >-- >1.7.9.5 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=9517">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 10259
:
9517
|
9518
|
9559
|
9560
|
9561