Remove current_user_info - not needed.

Jeremy.

diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c
index 0d09d213e1177975a3cf7e535ebfd493e4a8173d..c22ab66e149a9f9e62dee50f6b9313643e9f826e 100644 (file)
--- 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 cd843e6ad4e7fb3c6bd347fcc17a4152f8f1e7b7..12c893fae71602061720ab9ee2bef56cb73af175 100644 (file)
--- 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));