diff options
| -rw-r--r-- | source3/include/ntioctl.h | 4 | ||||
| -rw-r--r-- | source3/modules/vfs_default.c | 5 | ||||
| -rw-r--r-- | source3/modules/vfs_full_audit.c | 3 | ||||
| -rw-r--r-- | source3/modules/vfs_shadow_copy.c | 5 | ||||
| -rw-r--r-- | source3/modules/vfs_shadow_copy2.c | 4 | ||||
| -rw-r--r-- | source3/modules/vfs_time_audit.c | 2 | ||||
| -rw-r--r-- | source3/smbd/nttrans.c | 5 | ||||
| -rw-r--r-- | source3/smbd/vfs.c | 2 |
8 files changed, 19 insertions, 11 deletions
diff --git a/source3/include/ntioctl.h b/source3/include/ntioctl.h index 41b1dcefa2..3ed4a194a7 100644 --- 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 5d6b512e5f..4d06a10f42 100644 --- 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 cb03413a53..3b9c20a16b 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -697,7 +697,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 b93f98dede..c1ffac7498 100644 --- 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 3613f25b92..fd32f174e8 100644 --- 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 37fe1c6e35..d21542ca79 100644 --- 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 27ac26763c..1d0c9614a9 100644 --- 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 e6ea34bd18..015fc56a78 100644 --- 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); |