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/smbd/service.c | |
| parent | 8d72e612ac2845cd873c4fd614456fe8749db130 (diff) | |
| download | samba-128ae06a619b2c50cc9379053abb18277e814747.tar.gz | |
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/smbd/service.c')
| -rw-r--r-- | source3/smbd/service.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/service.c b/source3/smbd/service.c index d5a757c61f..2ac462f930 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -403,7 +403,7 @@ static NTSTATUS create_connection_session_info(struct smbd_server_connection *sc } } else { if (!user_ok_token(vuid_serverinfo->unix_info->unix_name, - vuid_serverinfo->info3->base.domain.string, + vuid_serverinfo->info->domain_name, vuid_serverinfo->security_token, snum)) { DEBUG(2, ("user '%s' (from session setup) not " "permitted to access this share " @@ -617,7 +617,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn, 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, lp_pathname(snum)); if (!s) { *pstatus = NT_STATUS_NO_MEMORY; @@ -739,7 +739,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn, 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, lp_rootpreexec(snum)); DEBUG(5,("cmd=%s\n",cmd)); ret = smbrun(cmd,NULL); @@ -777,7 +777,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn, 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, lp_preexec(snum)); ret = smbrun(cmd,NULL); TALLOC_FREE(cmd); @@ -1097,7 +1097,7 @@ void close_cnum(connection_struct *conn, uint16 vuid) 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, lp_postexec(SNUM(conn))); smbrun(cmd,NULL); TALLOC_FREE(cmd); @@ -1113,7 +1113,7 @@ void close_cnum(connection_struct *conn, uint16 vuid) 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, lp_rootpostexec(SNUM(conn))); smbrun(cmd,NULL); TALLOC_FREE(cmd); |