diff options
| author | Volker Lendecke <vl@samba.org> | 2008-06-19 16:54:12 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-06-19 18:51:37 +0200 |
| commit | 40f5eab5eb515937e1b23cf6762b77c194d29b9d (patch) | |
| tree | 72ed1a0ab8ef362f84664f0d5c95c7944199c8e0 /source3/modules | |
| parent | e40b6e296a91f87e0a238323fe1dbf76149487e0 (diff) | |
| download | samba-40f5eab5eb515937e1b23cf6762b77c194d29b9d.tar.gz samba-40f5eab5eb515937e1b23cf6762b77c194d29b9d.tar.bz2 samba-40f5eab5eb515937e1b23cf6762b77c194d29b9d.zip | |
Wrap the unix token info in a unix_user_token in auth_serversupplied_info
No functional change, this is a preparation for more current_user ref removal
(This used to be commit dcaedf345e62ab74ea87f0a3fa1e3199c75c5445)
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/vfs_expand_msdfs.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_fake_perms.c | 8 | ||||
| -rw-r--r-- | source3/modules/vfs_full_audit.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_recycle.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c index 3654ae4351..0d09d213e1 100644 --- a/source3/modules/vfs_expand_msdfs.c +++ b/source3/modules/vfs_expand_msdfs.c @@ -145,7 +145,7 @@ static char *expand_msdfs_target(TALLOC_CTX *ctx, lp_servicename(SNUM(conn)), conn->server_info->unix_name, conn->connectpath, - conn->server_info->gid, + conn->server_info->utok.gid, conn->server_info->sanitized_username, pdb_get_domain(conn->server_info->sam_account), targethost); diff --git a/source3/modules/vfs_fake_perms.c b/source3/modules/vfs_fake_perms.c index ef0a2c3d9e..2989322147 100644 --- a/source3/modules/vfs_fake_perms.c +++ b/source3/modules/vfs_fake_perms.c @@ -37,8 +37,8 @@ static int fake_perms_stat(vfs_handle_struct *handle, const char *fname, SMB_STR } else { sbuf->st_mode = S_IRWXU; } - sbuf->st_uid = handle->conn->server_info->uid; - sbuf->st_gid = handle->conn->server_info->gid; + sbuf->st_uid = handle->conn->server_info->utok.uid; + sbuf->st_gid = handle->conn->server_info->utok.gid; } return ret; @@ -55,8 +55,8 @@ static int fake_perms_fstat(vfs_handle_struct *handle, files_struct *fsp, SMB_ST } else { sbuf->st_mode = S_IRWXU; } - sbuf->st_uid = handle->conn->server_info->uid; - sbuf->st_gid = handle->conn->server_info->gid; + sbuf->st_uid = handle->conn->server_info->utok.uid; + sbuf->st_gid = handle->conn->server_info->utok.gid; } return ret; } diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index 3005de3829..3cefbcda34 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -703,7 +703,7 @@ static char *audit_prefix(TALLOC_CTX *ctx, connection_struct *conn) lp_servicename(SNUM(conn)), conn->server_info->unix_name, conn->connectpath, - conn->server_info->gid, + conn->server_info->utok.gid, 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 207f04bc47..acc1936e5f 100644 --- a/source3/modules/vfs_recycle.c +++ b/source3/modules/vfs_recycle.c @@ -432,7 +432,7 @@ static int recycle_unlink(vfs_handle_struct *handle, const char *file_name) repository = talloc_sub_advanced(NULL, lp_servicename(SNUM(conn)), conn->server_info->unix_name, conn->connectpath, - conn->server_info->gid, + conn->server_info->utok.gid, conn->server_info->sanitized_username, pdb_get_domain(conn->server_info->sam_account), recycle_repository(handle)); |