diff options
| author | Simo Sorce <ssorce@redhat.com> | 2010-05-27 03:41:56 -0400 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-05-28 00:55:53 +0200 |
| commit | d9cffc01be58184312a6a7b55bd523cf8daefa78 (patch) | |
| tree | a7037d21510273479d752c9c7964264ac12524a1 /source3/modules | |
| parent | 6713f3d945f09a732e620641771d9ff403aca9ef (diff) | |
| download | samba-d9cffc01be58184312a6a7b55bd523cf8daefa78.tar.gz samba-d9cffc01be58184312a6a7b55bd523cf8daefa78.tar.bz2 samba-d9cffc01be58184312a6a7b55bd523cf8daefa78.zip | |
s3:auth use info3 in auth_serversupplied_info
Signed-off-by: Günther Deschner <gd@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 0772215a28..d7ae3976bf 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), + conn->server_info->info3->base.domain.string, 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 a89b95f05c..9c665c81a0 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -396,7 +396,7 @@ static char *audit_prefix(TALLOC_CTX *ctx, connection_struct *conn) conn->connectpath, conn->server_info->utok.gid, conn->server_info->sanitized_username, - pdb_get_domain(conn->server_info->sam_account), + conn->server_info->info3->base.domain.string, prefix); TALLOC_FREE(prefix); return result; diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c index fb009a148f..3cd1f9dc80 100644 --- a/source3/modules/vfs_recycle.c +++ b/source3/modules/vfs_recycle.c @@ -467,7 +467,7 @@ static int recycle_unlink(vfs_handle_struct *handle, conn->connectpath, conn->server_info->utok.gid, conn->server_info->sanitized_username, - pdb_get_domain(conn->server_info->sam_account), + conn->server_info->info3->base.domain.string, 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 75450c79df..6384c97856 100644 --- a/source3/modules/vfs_smb_traffic_analyzer.c +++ b/source3/modules/vfs_smb_traffic_analyzer.c @@ -356,8 +356,8 @@ static char *smb_traffic_analyzer_create_string( TALLOC_CTX *ctx, (unsigned int) strlen(handle->conn->connectpath), handle->conn->connectpath, (unsigned int) - strlen(pdb_get_domain(handle->conn->server_info->sam_account)), - pdb_get_domain(handle->conn->server_info->sam_account), + strlen(handle->conn->server_info->info3->base.domain.string), + handle->conn->server_info->info3->base.domain.string, (unsigned int) strlen(timestr), timestr); @@ -460,7 +460,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, - pdb_get_domain(handle->conn->server_info->sam_account), + handle->conn->server_info->info3->base.domain.string, Write ? 'W' : 'R', handle->conn->connectpath, s_data->filename, |