summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarolin Seeger <kseeger@samba.org>2008-11-17 14:02:48 +0100
committerKarolin Seeger <kseeger@samba.org>2008-11-17 14:02:48 +0100
commit41eaf9b8e7ee6544c95f2b2bc7165e867fd4fcc6 (patch)
tree56b615192cb48b2ba4f4f69ba25f73e6b1b9c5c2
parent877a58459b8c0e365cdf929e2ffaaca4cb2f380c (diff)
downloadsamba-41eaf9b8e7ee6544c95f2b2bc7165e867fd4fcc6.tar.gz
samba-41eaf9b8e7ee6544c95f2b2bc7165e867fd4fcc6.tar.xz
samba-41eaf9b8e7ee6544c95f2b2bc7165e867fd4fcc6.zip
Revert "Enable optional anonymization of user names,"
This reverts commit e9359e6e8f692c693aad95f9a241c41cc23aa02a.
-rw-r--r--source/modules/vfs_smb_traffic_analyzer.c21
1 files changed, 1 insertions, 20 deletions
diff --git a/source/modules/vfs_smb_traffic_analyzer.c b/source/modules/vfs_smb_traffic_analyzer.c
index a4e3a3bda1a..1402b7c6224 100644
--- a/source/modules/vfs_smb_traffic_analyzer.c
+++ b/source/modules/vfs_smb_traffic_analyzer.c
@@ -43,7 +43,6 @@ static enum sock_type smb_traffic_analyzer_connMode(vfs_handle_struct *handle)
}
}
-
/* Connect to an internet socket */
static int smb_traffic_analyzer_connect_inet_socket(vfs_handle_struct *handle,
@@ -162,8 +161,6 @@ static void smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
struct tm *tm = NULL;
int seconds;
char *str = NULL;
- const char *username = NULL;
- const char *anon_prefix = NULL;
size_t len;
SMB_VFS_HANDLE_GET_DATA(handle, rf_sock, struct refcounted_sock, return);
@@ -182,27 +179,11 @@ static void smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
}
seconds=(float) (tv.tv_usec / 1000);
- /* check if anonymization is required */
-
- 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(get_current_username()));
- } else {
- username = get_current_username();
- }
-
- if (!username) {
- return;
- }
str = talloc_asprintf(talloc_tos(),
"V1,%u,\"%s\",\"%s\",\"%c\",\"%s\",\"%s\","
"\"%04d-%02d-%02d %02d:%02d:%02d.%03d\"\n",
(unsigned int)result,
- username,
+ get_current_username(),
current_user_info.domain,
Write ? 'W' : 'R',
handle->conn->connectpath,