diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-07-15 15:55:31 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-07-20 09:17:11 +1000 |
| commit | 92895379934b660affa70cd406e40719d429ae2a (patch) | |
| tree | 6a6185b2e0476a7045535332fad6201caeda2424 /source3/modules | |
| parent | a39187f0f5e6f99ce8a38cba997e4ad15353e09e (diff) | |
| download | samba-92895379934b660affa70cd406e40719d429ae2a.tar.gz samba-92895379934b660affa70cd406e40719d429ae2a.tar.bz2 samba-92895379934b660affa70cd406e40719d429ae2a.zip | |
s3-auth Use struct auth_user_info_unix for unix_name and sanitized_username
This is closer to the layout of struct auth_session_info in auth.idl
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/onefs_open.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_expand_msdfs.c | 4 | ||||
| -rw-r--r-- | source3/modules/vfs_full_audit.c | 4 | ||||
| -rw-r--r-- | source3/modules/vfs_recycle.c | 4 | ||||
| -rw-r--r-- | source3/modules/vfs_smb_traffic_analyzer.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c index 101dc5bc6e..dd4eb90b13 100644 --- a/source3/modules/onefs_open.c +++ b/source3/modules/onefs_open.c @@ -327,7 +327,7 @@ static NTSTATUS onefs_open_file(files_struct *fsp, fsp->wcp = NULL; /* Write cache pointer. */ DEBUG(2,("%s opened file %s read=%s write=%s (numopen=%d)\n", - conn->session_info->unix_name, + conn->session_info->unix_info->unix_name, smb_fname_str_dbg(smb_fname), BOOLSTR(fsp->can_read), BOOLSTR(fsp->can_write), conn->num_files_open)); diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c index 8cb59b2cdd..c857c1a424 100644 --- a/source3/modules/vfs_expand_msdfs.c +++ b/source3/modules/vfs_expand_msdfs.c @@ -157,10 +157,10 @@ static char *expand_msdfs_target(TALLOC_CTX *ctx, targethost = talloc_sub_advanced(ctx, lp_servicename(SNUM(conn)), - conn->session_info->unix_name, + conn->session_info->unix_info->unix_name, conn->connectpath, conn->session_info->unix_token->gid, - conn->session_info->sanitized_username, + conn->session_info->unix_info->sanitized_username, conn->session_info->info3->base.domain.string, targethost); diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index 9e7981b408..da28551046 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -406,10 +406,10 @@ static char *audit_prefix(TALLOC_CTX *ctx, connection_struct *conn) } result = talloc_sub_advanced(ctx, lp_servicename(SNUM(conn)), - conn->session_info->unix_name, + conn->session_info->unix_info->unix_name, conn->connectpath, conn->session_info->unix_token->gid, - conn->session_info->sanitized_username, + conn->session_info->unix_info->sanitized_username, conn->session_info->info3->base.domain.string, prefix); TALLOC_FREE(prefix); diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c index 72355cd55e..65de114b83 100644 --- a/source3/modules/vfs_recycle.c +++ b/source3/modules/vfs_recycle.c @@ -443,10 +443,10 @@ static int recycle_unlink(vfs_handle_struct *handle, int rc = -1; repository = talloc_sub_advanced(NULL, lp_servicename(SNUM(conn)), - conn->session_info->unix_name, + conn->session_info->unix_info->unix_name, conn->connectpath, conn->session_info->unix_token->gid, - conn->session_info->sanitized_username, + conn->session_info->unix_info->sanitized_username, conn->session_info->info3->base.domain.string, recycle_repository(handle)); ALLOC_CHECK(repository, done); diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c index 2ce8beb04f..fb36c4c99e 100644 --- a/source3/modules/vfs_smb_traffic_analyzer.c +++ b/source3/modules/vfs_smb_traffic_analyzer.c @@ -459,7 +459,7 @@ static void smb_traffic_analyzer_send_data(vfs_handle_struct *handle, * function. */ username = smb_traffic_analyzer_anonymize( talloc_tos(), - handle->conn->session_info->sanitized_username, + handle->conn->session_info->unix_info->sanitized_username, handle); if (!username) { |