Changeset 745 for trunk/server/source3/modules/vfs_shadow_copy.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/modules/vfs_shadow_copy.c (modified) (5 diffs)

trunk/server/source3/modules/vfs_shadow_copy.c

@@ -19 +19 @@
 
 #include "includes.h"
+
+
 
 /*
@@ -119 +121 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 static SMB_STRUCT_DIRENT *shadow_copy_readdir(vfs_handle_struct *handle,
                                               SMB_STRUCT_DIR *_dirp,
@@ -163 +217 @@
 }
 
-static int shadow_copy_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels)
+static int shadow_copy_get_shadow_copy_data(vfs_handle_struct *handle,
+                                            files_struct *fsp,
+                                            struct shadow_copy_data *shadow_copy_data,
+                                            bool labels)
 {
         SMB_STRUCT_DIR *p = SMB_VFS_NEXT_OPENDIR(handle,fsp->conn->connectpath,NULL,0);
@@ -197 +254 @@
                 }
 
-                tlabels = (SHADOW_COPY_LABEL *)TALLOC_REALLOC(shadow_copy_data->mem_ctx,
+                tlabels = (SHADOW_COPY_LABEL *)TALLOC_REALLOC(shadow_copy_data,
                                                                         shadow_copy_data->labels,
                                                                         (shadow_copy_data->num_volumes+1)*sizeof(SHADOW_COPY_LABEL));
@@ -217 +274 @@
 static struct vfs_fn_pointers vfs_shadow_copy_fns = {
         .opendir = shadow_copy_opendir,
+
         .readdir = shadow_copy_readdir,
         .seekdir = shadow_copy_seekdir,