sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3: Lift talloc_autofree_context() from make_auth_context_fixed()

Browse Source
This commit is contained in:
Volker Lendecke 2010-09-25 15:35:44 -07:00
parent 242e329610
commit 6ee0d866c2
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/auth/auth.c
View File

@ -538,11 +538,12 @@ NTSTATUS make_auth_context_subsystem(TALLOC_CTX *mem_ctx,
Make a auth_info struct with a fixed challenge
***************************************************************************/
NTSTATUS make_auth_context_fixed(struct auth_context **auth_context, uchar chal[8])
NTSTATUS make_auth_context_fixed(TALLOC_CTX *mem_ctx,
struct auth_context **auth_context,
uchar chal[8])
{
NTSTATUS nt_status;
nt_status = make_auth_context_subsystem(talloc_autofree_context(),
auth_context);
nt_status = make_auth_context_subsystem(mem_ctx, auth_context);
if (!NT_STATUS_IS_OK(nt_status)) {
return nt_status;
}

4
source3/include/proto.h
View File

@ -31,7 +31,9 @@ bool load_auth_module(struct auth_context *auth_context,
const char *module, auth_methods **ret) ;
NTSTATUS make_auth_context_subsystem(TALLOC_CTX *mem_ctx,
struct auth_context **auth_context);
NTSTATUS make_auth_context_fixed(struct auth_context **auth_context, uchar chal[8]) ;
NTSTATUS make_auth_context_fixed(TALLOC_CTX *mem_ctx,
struct auth_context **auth_context,
uchar chal[8]) ;
/* The following definitions come from auth/auth_builtin.c */

2
source3/rpc_server/srv_netlog_nt.c
View File

@ -1323,7 +1323,7 @@ static NTSTATUS _netr_LogonSamLogon_base(struct pipes_struct *p,
{
const char *wksname = nt_workstation;
status = make_auth_context_fixed(&auth_context,
status = make_auth_context_fixed(talloc_tos(), &auth_context,
logon->network->challenge);
if (!NT_STATUS_IS_OK(status)) {
return status;

4
source3/smbd/sesssetup.c
View File

@ -147,8 +147,8 @@ static NTSTATUS check_guest_password(struct auth_serversupplied_info **server_in
DEBUG(3,("Got anonymous request\n"));
if (!NT_STATUS_IS_OK(nt_status = make_auth_context_fixed(&auth_context,
chal))) {
nt_status = make_auth_context_fixed(talloc_tos(), &auth_context, chal);
if (!NT_STATUS_IS_OK(nt_status)) {
return nt_status;
}