From: Jeremy Allison <jra@samba.org>
Date: Tue, 30 Sep 2008 22:21:58 +0000 (-0700)
Subject: Remove current_user_info - not needed.
X-Git-Tag: samba-4.0.0alpha6~769^2~228^2~83^2~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e6445a0720d7265f0bddff71cd2e17d6b2ac057;p=thirdparty%2Fsamba.git

Remove current_user_info - not needed.
Jeremy.
---

diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c
index 0d09d213e11..c22ab66e149 100644
--- a/source3/modules/vfs_expand_msdfs.c
+++ b/source3/modules/vfs_expand_msdfs.c
@@ -147,7 +147,7 @@ static char *expand_msdfs_target(TALLOC_CTX *ctx,
 				conn->connectpath,
 				conn->server_info->utok.gid,
 				conn->server_info->sanitized_username,
-				pdb_get_domain(conn->server_info->sam_account),
+				pdb_get_domain(handle->conn->server_info->sam_account),
 				targethost);
 
 	DEBUG(10, ("Expanded targethost to %s\n", targethost));
diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c
index cd843e6ad4e..12c893fae71 100644
--- a/source3/modules/vfs_smb_traffic_analyzer.c
+++ b/source3/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));