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

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  776f83e vfs_smb_traffic_analyzer shall also transfer the clients IP address.
       via  3766fab s3: Fix a C++ warning
      from  d4c0a2b s3: Fix a typed-punned warning

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


- Log -----------------------------------------------------------------
commit 776f83ee3d4d1e92b0e9f886d4d3e75c0fd77154
Author: Holger Hetterich <hhetter at novell.com>
Date:   Sun Feb 13 18:20:00 2011 +0100

    vfs_smb_traffic_analyzer shall also transfer the clients IP address.

commit 3766fab194d8312e733ce462fbca3227aee4b17a
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Feb 14 20:56:09 2011 +0100

    s3: Fix a C++ warning
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Mon Feb 14 21:44:55 CET 2011 on sn-devel-104
    (cherry picked from commit 64c63a3e1ca7206cb3bb11ff6c8c206bb9a00444)

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

Summary of changes:
 source3/libsmb/smb_share_modes.c           |    2 +-
 source3/modules/vfs_smb_traffic_analyzer.c |    9 ++++++---
 source3/modules/vfs_smb_traffic_analyzer.h |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/smb_share_modes.c b/source3/libsmb/smb_share_modes.c
index e752f61..bf3250b 100644
--- a/source3/libsmb/smb_share_modes.c
+++ b/source3/libsmb/smb_share_modes.c
@@ -272,7 +272,7 @@ static uint32_t smb_name_hash(const char *sharepath, const char *filename, int *
 	uint32_t name_hash;
 
 	*err = 0;
-	fullpath = malloc(sharepath_size + filename_size + 2);
+	fullpath = (char *)malloc(sharepath_size + filename_size + 2);
 	if (fullpath == NULL) {
 		*err = 1;
 		return 0;
diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c
index 8cde7f4..90acfcc 100644
--- a/source3/modules/vfs_smb_traffic_analyzer.c
+++ b/source3/modules/vfs_smb_traffic_analyzer.c
@@ -20,6 +20,7 @@
  */
 
 #include "includes.h"
+#include "../smbd/globals.h"
 #include "../lib/crypto/crypto.h"
 #include "vfs_smb_traffic_analyzer.h"
 #include "../libcli/security/security.h"
@@ -313,6 +314,7 @@ static char *smb_traffic_analyzer_create_string( TALLOC_CTX *ctx,
 	 * 4.affected share
 	 * 5.domain
 	 * 6.timestamp
+	 * 7.IP Addresss of client
 	 */
 
 	/*
@@ -348,10 +350,9 @@ static char *smb_traffic_analyzer_create_string( TALLOC_CTX *ctx,
 		tm->tm_sec, \
 		(int)seconds);
 	len = strlen( timestr );
-
 	/* create the string of common data */
 	buf = talloc_asprintf(ctx,
-		"%s%04u%s%04u%s%04u%s%04u%s%04u%s%04u%s",
+		"%s%04u%s%04u%s%04u%s%04u%s%04u%s%04u%s%04u%s",
 		common_data_count_str,
 		(unsigned int) strlen(vfs_operation_str),
 		vfs_operation_str,
@@ -365,7 +366,9 @@ static char *smb_traffic_analyzer_create_string( TALLOC_CTX *ctx,
 		strlen(handle->conn->server_info->info3->base.domain.string),
 		handle->conn->server_info->info3->base.domain.string,
 		(unsigned int) strlen(timestr),
-		timestr);
+		timestr,
+		(unsigned int) strlen(handle->conn->sconn->client_id.addr),
+		handle->conn->sconn->client_id.addr);
 
 	talloc_free(common_data_count_str);
 
diff --git a/source3/modules/vfs_smb_traffic_analyzer.h b/source3/modules/vfs_smb_traffic_analyzer.h
index 3f47ea5..bfc0614 100644
--- a/source3/modules/vfs_smb_traffic_analyzer.h
+++ b/source3/modules/vfs_smb_traffic_analyzer.h
@@ -85,7 +85,7 @@
  * so that if the receiver is using an older version of the protocol
  * it knows which blocks it can ignore.
  */
-#define SMBTA_COMMON_DATA_COUNT "00016"
+#define SMBTA_COMMON_DATA_COUNT "00017"
 
 /*
  * VFS Functions identifier table. In protocol version 2, every vfs


-- 
Samba Shared Repository