Changeset 989 for vendor/current/source3/modules/vfs_shadow_copy2.c

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

File:

• vendor/current/source3/modules/vfs_shadow_copy2.c (modified) (3 diffs)

vendor/current/source3/modules/vfs_shadow_copy2.c

@@ -1793 +1793 @@
         char *tmp = NULL;
         char *result = NULL;
+
         int saved_errno;
         size_t rootpath_len = 0;
@@ -1809 +1810 @@
                                       &rootpath_len);
         if (tmp == NULL) {
-                goto done;
+                if (errno != ENOENT) {
+                        goto done;
+                }
+
+                /*
+                 * If the converted path does not exist, and converting
+                 * the parent yields something that does exist, then
+                 * this path refers to something that has not been
+                 * created yet, relative to the parent path.
+                 * The snapshot finding is relative to the parent.
+                 * (usually snapshots are read/only but this is not
+                 * necessarily true).
+                 * This code also covers getting a wildcard in the
+                 * last component, because this function is called
+                 * prior to sanitizing the path, and in SMB1 we may
+                 * get wildcards in path names.
+                 */
+                if (!parent_dirname(talloc_tos(), stripped, &parent_dir,
+                                    NULL)) {
+                        errno = ENOMEM;
+                        goto done;
+                }
+
+                tmp = shadow_copy2_do_convert(talloc_tos(), handle, parent_dir,
+                                              timestamp, &rootpath_len);
+                if (tmp == NULL) {
+                        goto done;
+                }
         }
 
@@ -1827 +1855 @@
         TALLOC_FREE(tmp);
         TALLOC_FREE(stripped);
+
         errno = saved_errno;
         return result;