From 0ec9a90c29b86435f32c1d47d89df85fa51742f2 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 30 May 2011 12:06:31 +0200 Subject: s3: Remove SHADOW_COPY_DATA typedef --- source3/modules/vfs_time_audit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/modules/vfs_time_audit.c') 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; -- cgit From c7d2f6d35a95678c91faf0b5ac7f83bc5d1abfde Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 31 May 2011 16:36:06 -0700 Subject: Remove the char * argument from the SMB_VFS_GETWD() call. Now always returns malloc'ed memory. Autobuild-User: Jeremy Allison Autobuild-Date: Wed Jun 1 04:06:12 CEST 2011 on sn-devel-104 --- source3/modules/vfs_time_audit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/modules/vfs_time_audit.c') diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c index d21542ca79..0f32619458 100644 --- a/source3/modules/vfs_time_audit.c +++ b/source3/modules/vfs_time_audit.c @@ -869,14 +869,14 @@ static int smb_time_audit_chdir(vfs_handle_struct *handle, const char *path) return result; } -static char *smb_time_audit_getwd(vfs_handle_struct *handle, char *path) +static char *smb_time_audit_getwd(vfs_handle_struct *handle) { char *result; struct timespec ts1,ts2; double timediff; clock_gettime_mono(&ts1); - result = SMB_VFS_NEXT_GETWD(handle, path); + result = SMB_VFS_NEXT_GETWD(handle); clock_gettime_mono(&ts2); timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9; -- cgit From bb66504dadf56366ea30697ae73673de3df08132 Mon Sep 17 00:00:00 2001 From: Christian Ambach Date: Fri, 17 Jun 2011 21:54:30 +0200 Subject: s3:modules fix Bug 8244 - Cannot copy files larger than 2 GB to Samba share the time_audit module uses int instead of uint64 as return value in get_alloc_size so that sizes of files larger than 2 GB are cut of leading to wrong replies to NtCreateAndX and Windows clients giving up While checking the types of all functions, I found two more wrong return value types that needed correction Autobuild-User: Christian Ambach Autobuild-Date: Fri Jun 17 23:11:10 CEST 2011 on sn-devel-104 --- source3/modules/vfs_time_audit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/modules/vfs_time_audit.c') diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c index 0f32619458..25332e4e03 100644 --- a/source3/modules/vfs_time_audit.c +++ b/source3/modules/vfs_time_audit.c @@ -564,7 +564,7 @@ static SMB_OFF_T smb_time_audit_lseek(vfs_handle_struct *handle, files_struct *fsp, SMB_OFF_T offset, int whence) { - ssize_t result; + SMB_OFF_T result; struct timespec ts1,ts2; double timediff; @@ -721,7 +721,7 @@ static uint64_t smb_time_audit_get_alloc_size(vfs_handle_struct *handle, files_struct *fsp, const SMB_STRUCT_STAT *sbuf) { - int result; + uint64_t result; struct timespec ts1,ts2; double timediff; @@ -2216,7 +2216,7 @@ static ssize_t smb_time_audit_aio_return(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb) { - int result; + ssize_t result; struct timespec ts1,ts2; double timediff; -- cgit