[SCM] Samba Shared Repository - branch master updated - 4e6445a0720d7265f0bddff71cd2e17d6b2ac057

[Jeremy Allison]

The branch, master has been updated
       via  4e6445a0720d7265f0bddff71cd2e17d6b2ac057 (commit)
      from  321191d5e2ec1eaf22728dcee944e0a250a7725d (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4e6445a0720d7265f0bddff71cd2e17d6b2ac057
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date:   Tue Sep 30 15:21:58 2008 -0700

    Remove current_user_info - not needed.
    Jeremy.

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

Summary of changes:
 source3/modules/vfs_expand_msdfs.c         |    2 +-
 source3/modules/vfs_smb_traffic_analyzer.c |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_expand_msdfs.c 
b/source3/modules/vfs_expand_msdfs.c
index 0d09d21..c22ab66 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 cd843e6..12c893f 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));


-- 
Samba Shared Repository