The branch, v3-6-test has been updated
via eb2d8f7 Use corrcet function instead of cut-and-paste code. (cherry
picked from commit 1121091f8bf857948c335f326088cfafa78ed013)
via d39d8db Fix leak in error path. (cherry picked from commit
0a7f1af82ca94a9ea3f2fbe6b4bf64ff17c76cce)
from c9b1ab0 libcli/security: Make add_sid_to_array_unique use a uin32_t
counter
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit eb2d8f7844d1e02f60f091e84d4c1a2bc858e10b
Author: Jeremy Allison <[email protected]>
Date: Mon Feb 7 17:34:22 2011 -0800
Use corrcet function instead of cut-and-paste code.
(cherry picked from commit 1121091f8bf857948c335f326088cfafa78ed013)
commit d39d8dba6e5b762ab3c6e2b4e10527c4a46d22e6
Author: Jeremy Allison <[email protected]>
Date: Mon Feb 7 17:33:26 2011 -0800
Fix leak in error path.
(cherry picked from commit 0a7f1af82ca94a9ea3f2fbe6b4bf64ff17c76cce)
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/open.c | 1 +
source3/smbd/reply.c | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 0ef2b3a..e6a70bc 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2720,6 +2720,7 @@ static NTSTATUS open_directory(connection_struct *conn,
fsp->posix_open = (file_attributes & FILE_FLAG_POSIX_SEMANTICS) ? True
: False;
status = fsp_set_smb_fname(fsp, smb_dname);
if (!NT_STATUS_IS_OK(status)) {
+ file_free(req, fsp);
return status;
}
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index f7265e0..e64627b 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -4821,7 +4821,7 @@ void reply_close(struct smb_request *req)
* We can only use check_fsp if we know it's not a directory.
*/
- if(!fsp || (fsp->conn != conn) || (fsp->vuid != req->vuid)) {
+ if (!check_fsp_open(conn, req, fsp)) {
reply_nterror(req, NT_STATUS_INVALID_HANDLE);
END_PROFILE(SMBclose);
return;
--
Samba Shared Repository
