s3: Remove SHADOW_COPY_DATA typedef (cherry picked from commit 0ec9a90c29b86435f32c1d...

diff --git a/source3/include/ntioctl.h b/source3/include/ntioctl.h
index 41b1dcefa25d0f866d07153a59a5fb86bcab3e4c..3ed4a194a731c4d540e0e888438a90cce15a5498 100644 (file)
--- a/source3/include/ntioctl.h
+++ b/source3/include/ntioctl.h
@@ -77,13 +77,13 @@
 /* For FSCTL_GET_SHADOW_COPY_DATA ...*/
 typedef char SHADOW_COPY_LABEL[25];
 
-typedef struct shadow_copy_data {
+struct shadow_copy_data {
        TALLOC_CTX *mem_ctx;
        /* Total number of shadow volumes currently mounted */
        uint32 num_volumes;
        /* Concatenated list of labels */
        SHADOW_COPY_LABEL *labels;
-} SHADOW_COPY_DATA;
+};
 
 
 #endif /* _NTIOCTL_H */

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 5d6b512e5fb182ddbf87235804c9b3d4004b7f1c..4d06a10f42607a58cc4ff91004c87cff8796cf87 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -84,7 +84,10 @@ static int vfswrap_set_quota(struct vfs_handle_struct *handle,  enum SMB_QUOTA_T
 #endif
 }
 
-static int vfswrap_get_shadow_copy_data(struct vfs_handle_struct *handle, struct files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels)
+static int vfswrap_get_shadow_copy_data(struct vfs_handle_struct *handle,
+                                       struct files_struct *fsp,
+                                       struct shadow_copy_data *shadow_copy_data,
+                                       bool labels)
 {
        errno = ENOSYS;
        return -1;  /* Not implemented. */

diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index a723a0ce2d6f92c9aedcd432c6c7a0a4d7a06c7a..17713f076068a516f65bd99993c9bcf6b4e9a374 100644 (file)
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -695,7 +695,8 @@ static int smb_full_audit_set_quota(struct vfs_handle_struct *handle,
 
 static int smb_full_audit_get_shadow_copy_data(struct vfs_handle_struct *handle,
                                struct files_struct *fsp,
-                               SHADOW_COPY_DATA *shadow_copy_data, bool labels)
+                               struct shadow_copy_data *shadow_copy_data,
+                               bool labels)
 {
        int result;
 

diff --git a/source3/modules/vfs_shadow_copy.c b/source3/modules/vfs_shadow_copy.c
index b93f98dedee4526eeb30ef5b8ba94d19e9deca67..c1ffac749897c4b330dc1c15f59c1f292ea690dd 100644 (file)
--- a/source3/modules/vfs_shadow_copy.c
+++ b/source3/modules/vfs_shadow_copy.c
@@ -216,7 +216,10 @@ static int shadow_copy_closedir(vfs_handle_struct *handle, SMB_STRUCT_DIR *_dirp
        return 0;       
 }
 
-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);
 

diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c
index df3bde72c9410633009884fdb3c011d136df3ba1..f612c1b9caf91f7bfb514935785ce7a0155b3ac7 100644 (file)
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -837,7 +837,7 @@ static int shadow_copy2_label_cmp_desc(const void *x, const void *y)
   sort the shadow copy data in ascending or descending order
  */
 static void shadow_copy2_sort_data(vfs_handle_struct *handle,
-                                  SHADOW_COPY_DATA *shadow_copy2_data)
+                                  struct shadow_copy_data *shadow_copy2_data)
 {
        int (*cmpfunc)(const void *, const void *);
        const char *sort;
@@ -869,7 +869,7 @@ static void shadow_copy2_sort_data(vfs_handle_struct *handle,
 
 static int shadow_copy2_get_shadow_copy2_data(vfs_handle_struct *handle, 
                                              files_struct *fsp, 
-                                             SHADOW_COPY_DATA *shadow_copy2_data, 
+                                             struct shadow_copy_data *shadow_copy2_data,
                                              bool labels)
 {
        SMB_STRUCT_DIR *p;

diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c
index 37fe1c6e35b635da1acf9119f9acf0902c34f1b2..d21542ca79ec97bb9383f563129d5453cbffadb0 100644 (file)
--- a/source3/modules/vfs_time_audit.c
+++ b/source3/modules/vfs_time_audit.c
@@ -144,7 +144,7 @@ static int smb_time_audit_set_quota(struct vfs_handle_struct *handle,
 
 static int smb_time_audit_get_shadow_copy_data(struct vfs_handle_struct *handle,
                                               struct files_struct *fsp,
-                                              SHADOW_COPY_DATA *shadow_copy_data,
+                                              struct shadow_copy_data *shadow_copy_data,
                                               bool labels)
 {
        int result;

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 5b14182b92fadb1d1ae4ce2e44e011799eaf26c5..524d49029bc269a57b46763945bc7a49d33321d2 100644 (file)
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -2214,7 +2214,7 @@ static void call_nt_transact_ioctl(connection_struct *conn,
                 * Allocate the correct amount and return the pointer to let
                 * it be deallocated when we return.
                 */
-               SHADOW_COPY_DATA *shadow_data = NULL;
+               struct shadow_copy_data *shadow_data = NULL;
                TALLOC_CTX *shadow_mem_ctx = NULL;
                bool labels = False;
                uint32 labels_data_count = 0;
@@ -2243,7 +2243,8 @@ static void call_nt_transact_ioctl(connection_struct *conn,
                        return;
                }
 
-               shadow_data = TALLOC_ZERO_P(shadow_mem_ctx,SHADOW_COPY_DATA);
+               shadow_data = TALLOC_ZERO_P(shadow_mem_ctx,
+                                           struct shadow_copy_data);
                if (shadow_data == NULL) {
                        DEBUG(0,("TALLOC_ZERO() failed!\n"));
                        talloc_destroy(shadow_mem_ctx);

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 3bde0a388e51a7eb05920935e148fa7e1314206f..bdcb8e4a0a8d87f3c9dd13923ba58654043e63a1 100644 (file)
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -1174,7 +1174,7 @@ int smb_vfs_call_set_quota(struct vfs_handle_struct *handle,
 
 int smb_vfs_call_get_shadow_copy_data(struct vfs_handle_struct *handle,
                                      struct files_struct *fsp,
-                                     SHADOW_COPY_DATA *shadow_copy_data,
+                                     struct shadow_copy_data *shadow_copy_data,
                                      bool labels)
 {
        VFS_FIND(get_shadow_copy_data);