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

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  093fc8c6bf1420c0f1e171598c4894b4df24862c (commit)
      from  e3e89077a5559eda39ea27f0ce6f9f0ebeba8f1e (commit)

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


- Log -----------------------------------------------------------------
commit 093fc8c6bf1420c0f1e171598c4894b4df24862c
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Sep 30 15:22:24 2008 -0700

    Remove current_user_info - not needed.
    Jeremy.

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

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


Changeset truncated at 500 lines:

diff --git a/source/modules/vfs_smb_traffic_analyzer.c b/source/modules/vfs_smb_traffic_analyzer.c
index cd843e6..12c893f 100644
--- a/source/modules/vfs_smb_traffic_analyzer.c
+++ b/source/modules/vfs_smb_traffic_analyzer.c
@@ -27,8 +27,6 @@
 
 /* Prototypes */
 
-extern userdom_struct current_user_info;
-
 static int vfs_smb_traffic_analyzer_debug_level = DBGC_VFS;
 
 /* create the timestamp in sqlite compatible format */
@@ -187,9 +185,9 @@ static void smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
 
 	strlcpy(Sender, str, sizeof(Sender));
 	strlcat(Sender, ",\"", sizeof(Sender));
-	strlcat(Sender, get_current_username(), sizeof(Sender));
+	strlcat(Sender, handle->conn->server_info->sanitized_username, sizeof(Sender));
 	strlcat(Sender, "\",\"", sizeof(Sender));
-	strlcat(Sender, current_user_info.domain, sizeof(Sender));
+	strlcat(Sender, pdb_get_domain(handle->conn->server_info->sam_account), sizeof(Sender));
 	strlcat(Sender, "\",\"", sizeof(Sender));
         if (Write)
 		strlcat(Sender, "W", sizeof(Sender));


-- 
Samba Shared Repository