[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4954-g31d854f

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  31d854fff40799f056748333c35df81466c3614c (commit)
      from  6b654d12fd46b68fef824bf281783396ca81283d (commit)

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


- Log -----------------------------------------------------------------
commit 31d854fff40799f056748333c35df81466c3614c
Author: Holger Hetterich <hhetter at novell.com>
Date:   Wed Feb 4 15:31:24 2009 +0100

    Enable total anonymization in vfs_smb_traffic_analyzer, by mapping any user names to the one given by anonymize_prefix, without generating a hash number. This setting is optional and is compatible with the module configuration format of Samba 3.3.

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

Summary of changes:
 docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml |   11 ++++++++++
 source/modules/vfs_smb_traffic_analyzer.c          |   21 +++++++++++++++----
 2 files changed, 27 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
index 556fa3e..3a16b61 100644
--- a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
+++ b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
@@ -117,6 +117,17 @@
 		</listitem>
 		</varlistentry>
 
+		<varlistentry>
+		<term>smb_traffic_analyzer:total_anonymization = STRING</term>
+		<listitem>
+		<para>If STRING matches to 'yes', the module will replace
+		any user name with the string given by the option 
+		smb_traffic_analyzer:anonymize_prefix, without generating
+		an additional hash number. This means that any transfer data
+		will be mapped to a single user, leading to a total 
+		anonymization of user related data.</para>
+		</listitem>
+		</varlistentry>
 
 	</variablelist>
 </refsect1>
diff --git a/source/modules/vfs_smb_traffic_analyzer.c b/source/modules/vfs_smb_traffic_analyzer.c
index 63cc904..a5599ba 100644
--- a/source/modules/vfs_smb_traffic_analyzer.c
+++ b/source/modules/vfs_smb_traffic_analyzer.c
@@ -164,6 +164,7 @@ static void smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
 	char *str = NULL;
 	char *username = NULL;
 	const char *anon_prefix = NULL;
+	const char *total_anonymization = NULL;
 	size_t len;
 
 	SMB_VFS_HANDLE_GET_DATA(handle, rf_sock, struct refcounted_sock, return);
@@ -184,14 +185,24 @@ static void smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
 
 	/* check if anonymization is required */
 
+	total_anonymization=lp_parm_const_string(SNUM(handle->conn),"smb_traffic_analyzer",
+					"total_anonymization", NULL);
+
 	anon_prefix=lp_parm_const_string(SNUM(handle->conn),"smb_traffic_analyzer",\
 					"anonymize_prefix", NULL );
 	if (anon_prefix!=NULL) {
-		username = talloc_asprintf(talloc_tos(),
-			"%s%i",
-			anon_prefix,
-			str_checksum(
-				handle->conn->server_info->sanitized_username )	); 
+		if (total_anonymization!=NULL) {
+			username = talloc_asprintf(talloc_tos(),
+				"%s",
+				anon_prefix);
+		} else {
+			username = talloc_asprintf(talloc_tos(),
+				"%s%i",
+				anon_prefix,
+				str_checksum(
+					handle->conn->server_info->sanitized_username )	); 
+		}
+
 	} else {
 		username = handle->conn->server_info->sanitized_username;
 	}


-- 
Samba Shared Repository