diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-07-18 12:58:25 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-07-20 09:17:13 +1000 |
| commit | 128ae06a619b2c50cc9379053abb18277e814747 (patch) | |
| tree | f3c7c0639a4adcbcff13cbfb1322cee0b08cba1a /source3/modules | |
| parent | 8d72e612ac2845cd873c4fd614456fe8749db130 (diff) | |
| download | samba-128ae06a619b2c50cc9379053abb18277e814747.tar.gz samba-128ae06a619b2c50cc9379053abb18277e814747.tar.bz2 samba-128ae06a619b2c50cc9379053abb18277e814747.zip | |
s3-auth use auth_user_info not netr_SamInfo3 in auth3_session_info
This makes auth3_session_info identical to auth_session_info
The logic to convert the info3 to a struct auth_user_info is
essentially moved up the stack from the named pipe proxy in
source3/rpc_server to create_local_token().
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/vfs_expand_msdfs.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_full_audit.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_recycle.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_smb_traffic_analyzer.c | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c index c857c1a424..a0d0d3d12a 100644 --- a/source3/modules/vfs_expand_msdfs.c +++ b/source3/modules/vfs_expand_msdfs.c @@ -161,7 +161,7 @@ static char *expand_msdfs_target(TALLOC_CTX *ctx, conn->connectpath, conn->session_info->unix_token->gid, conn->session_info->unix_info->sanitized_username, - conn->session_info->info3->base.domain.string, + conn->session_info->info->domain_name, targethost); DEBUG(10, ("Expanded targethost to %s\n", targethost)); diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index da28551046..9471e6d8c2 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -410,7 +410,7 @@ static char *audit_prefix(TALLOC_CTX *ctx, connection_struct *conn) conn->connectpath, conn->session_info->unix_token->gid, conn->session_info->unix_info->sanitized_username, - conn->session_info->info3->base.domain.string, + conn->session_info->info->domain_name, prefix); TALLOC_FREE(prefix); return result; diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c index 65de114b83..03da571d1a 100644 --- a/source3/modules/vfs_recycle.c +++ b/source3/modules/vfs_recycle.c @@ -447,7 +447,7 @@ static int recycle_unlink(vfs_handle_struct *handle, conn->connectpath, conn->session_info->unix_token->gid, conn->session_info->unix_info->sanitized_username, - conn->session_info->info3->base.domain.string, + conn->session_info->info->domain_name, recycle_repository(handle)); ALLOC_CHECK(repository, done); /* shouldn't we allow absolute path names here? --metze */ diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c index fb36c4c99e..5f05fa68d1 100644 --- a/source3/modules/vfs_smb_traffic_analyzer.c +++ b/source3/modules/vfs_smb_traffic_analyzer.c @@ -373,8 +373,8 @@ static char *smb_traffic_analyzer_create_string( TALLOC_CTX *ctx, (unsigned int) strlen(service_name), service_name, (unsigned int) - strlen(handle->conn->session_info->info3->base.domain.string), - handle->conn->session_info->info3->base.domain.string, + strlen(handle->conn->session_info->info->domain_name), + handle->conn->session_info->info->domain_name, (unsigned int) strlen(timestr), timestr, (unsigned int) strlen(raddr), @@ -490,7 +490,7 @@ static void smb_traffic_analyzer_send_data(vfs_handle_struct *handle, "\"%04d-%02d-%02d %02d:%02d:%02d.%03d\"\n", (unsigned int) s_data->len, username, - handle->conn->session_info->info3->base.domain.string, + handle->conn->session_info->info->domain_name, Write ? 'W' : 'R', handle->conn->connectpath, s_data->filename, |