1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00

r21214: fixed a valgrind error that can be caused by a semi-async call inside

a nested ntvfs call. The req structure can go away while processing a
ntvfs request
(This used to be commit f62b3c505f)
This commit is contained in:
Andrew Tridgell 2007-02-07 07:06:28 +00:00 committed by Gerald (Jerry) Carter
parent 80445f7596
commit 667cff3699

View File

@ -156,7 +156,7 @@ static NTSTATUS unixuid_setup_security(struct ntvfs_module_context *ntvfs,
token = req->session_info->security_token;
*sec = save_unix_security(req);
*sec = save_unix_security(ntvfs);
if (*sec == NULL) {
return NT_STATUS_NO_MEMORY;
}
@ -166,6 +166,7 @@ static NTSTATUS unixuid_setup_security(struct ntvfs_module_context *ntvfs,
} else {
status = nt_token_to_unix_security(ntvfs, req, token, &newsec);
if (!NT_STATUS_IS_OK(status)) {
talloc_free(*sec);
return status;
}
if (private->last_sec_ctx) {
@ -178,6 +179,7 @@ static NTSTATUS unixuid_setup_security(struct ntvfs_module_context *ntvfs,
status = set_unix_security(newsec);
if (!NT_STATUS_IS_OK(status)) {
talloc_free(*sec);
return status;
}
@ -194,6 +196,7 @@ static NTSTATUS unixuid_setup_security(struct ntvfs_module_context *ntvfs,
NT_STATUS_NOT_OK_RETURN(status); \
status = ntvfs_next_##op args; \
status2 = set_unix_security(sec); \
talloc_free(sec); \
if (!NT_STATUS_IS_OK(status2)) smb_panic("Unable to reset security context"); \
} while (0)