diff options
| author | Volker Lendecke <vl@samba.org> | 2008-05-11 11:26:33 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-05-25 11:43:57 +0200 |
| commit | 50ab871813d8281760e0c70d454cba996e0b67d8 (patch) | |
| tree | 124efcddf0cbdc86afbc764a0aad75c339d6e5a3 /source3/modules | |
| parent | 320fadd8fc600262d26ea417a92d395aeb16ef57 (diff) | |
| download | samba-50ab871813d8281760e0c70d454cba996e0b67d8.tar.gz samba-50ab871813d8281760e0c70d454cba996e0b67d8.tar.bz2 samba-50ab871813d8281760e0c70d454cba996e0b67d8.zip | |
Remove some references to get_current_username() and current_user_info
(This used to be commit 344d69f95e217d16213eaa6b53141af6ab459708)
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/vfs_expand_msdfs.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_full_audit.c | 6 | ||||
| -rw-r--r-- | source3/modules/vfs_recycle.c | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c index 133c5eb28b..9b85ad2dda 100644 --- a/source3/modules/vfs_expand_msdfs.c +++ b/source3/modules/vfs_expand_msdfs.c @@ -148,7 +148,7 @@ static char *expand_msdfs_target(TALLOC_CTX *ctx, conn->server_info->unix_name, conn->connectpath, conn->server_info->gid, - get_current_username(), + conn->server_info->sanitized_username, current_user_info.domain, targethost); diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index 31069c1669..8718dbd886 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -59,8 +59,6 @@ #include "includes.h" -extern userdom_struct current_user_info; - static int vfs_full_audit_debug_level = DBGC_VFS; struct vfs_full_audit_private_data { @@ -697,8 +695,8 @@ static char *audit_prefix(TALLOC_CTX *ctx, connection_struct *conn) conn->server_info->unix_name, conn->connectpath, conn->server_info->gid, - get_current_username(), - current_user_info.domain, + conn->server_info->sanitized_username, + pdb_get_domain(conn->server_info->sam_account), prefix); } diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c index abfae78b72..e6028cebdd 100644 --- a/source3/modules/vfs_recycle.c +++ b/source3/modules/vfs_recycle.c @@ -435,7 +435,7 @@ static int recycle_unlink(vfs_handle_struct *handle, const char *file_name) conn->server_info->unix_name, conn->connectpath, conn->server_info->gid, - get_current_username(), + conn->server_info->sanitized_username, current_user_info.domain, recycle_repository(handle)); ALLOC_CHECK(repository, done); |