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/rpc_server/rpc_ncacn_np.c | |
| 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/rpc_server/rpc_ncacn_np.c')
| -rw-r--r-- | source3/rpc_server/rpc_ncacn_np.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/source3/rpc_server/rpc_ncacn_np.c b/source3/rpc_server/rpc_ncacn_np.c index f43d0b81bc..25435b8ea4 100644 --- a/source3/rpc_server/rpc_ncacn_np.c +++ b/source3/rpc_server/rpc_ncacn_np.c @@ -629,8 +629,6 @@ struct np_proxy_state *make_external_rpc_pipe_p(TALLOC_CTX *mem_ctx, struct tevent_req *subreq; struct auth_session_info_transport *session_info_t; struct auth_session_info *session_info_npa; - struct auth_user_info_dc *user_info_dc; - union netr_Validation val; NTSTATUS status; bool ok; int ret; @@ -685,20 +683,7 @@ struct np_proxy_state *make_external_rpc_pipe_p(TALLOC_CTX *mem_ctx, session_info_npa->unix_token = session_info->unix_token; session_info_npa->unix_info = session_info->unix_info; - val.sam3 = session_info->info3; - - /* Convert into something we can build a struct - * auth_session_info from. Most of the work here - * will be to convert the SIDS, which we will then ignore, but - * this is the easier way to handle it */ - status = make_user_info_dc_netlogon_validation(talloc_tos(), "", 3, &val, &user_info_dc); - if (!NT_STATUS_IS_OK(status)) { - DEBUG(0, ("conversion of info3 into user_info_dc failed!\n")); - goto fail; - } - - session_info_npa->info = talloc_move(session_info_npa, &user_info_dc->info); - talloc_free(user_info_dc); + session_info_npa->info = session_info->info; session_info_t = talloc_zero(talloc_tos(), struct auth_session_info_transport); if (session_info_npa == NULL) { |