[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  20088f3 vfs_smb_traffic_analyzer: fix off by a second bug
      from  f9ed2ae s3: Fix a segfault in the printer code using create_conn_struct (cherry picked from commit 6beb5563f3464cf32109c9069b39a5cf71134321)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 20088f3b633e433cf62636aeeed95e8f7e8f3e6b
Author: Björn Jacke <bj at sernet.de>
Date:   Mon Aug 30 19:49:35 2010 +0200

    vfs_smb_traffic_analyzer: fix off by a second bug
    
    convert_timespec_to_time_t is rounding but here we keep track of milliseconds
    here - so we should use plain the tv_sec.
    (cherry picked from commit a8d8cf00eae08466ef6a232ccbb5ede9ee4d9626)

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_smb_traffic_analyzer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c
index 3cafdc7..53ea5f9 100644
--- a/source3/modules/vfs_smb_traffic_analyzer.c
+++ b/source3/modules/vfs_smb_traffic_analyzer.c
@@ -421,7 +421,7 @@ static void smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
 	}
 
 	GetTimeOfDay(&tv);
-	tv_sec = convert_timespec_to_time_t(convert_timeval_to_timespec(tv));
+	tv_sec = tv.tv_sec;
 	tm = localtime(&tv_sec);
 	if (!tm) {
 		return;


-- 
Samba Shared Repository