The branch, v3-6-test has been updated
via fb0868e Fix bug #9571 - Unlink after open causes smbd to panic.
from 99d2cb2 Fix bug #9588 - ACLs are not inherited to directories for
DFS shares.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit fb0868e290cdc23671a84b7600af689a8b8b806f
Author: Pavel Shilovsky <[email protected]>
Date: Wed Jan 16 15:02:26 2013 +0400
Fix bug #9571 - Unlink after open causes smbd to panic.
s3:smbd: fix wrong lock order in posix unlink
Signed-off-by: Pavel Shilovsky <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/trans2.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index bdbdbc0..2824f93 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -7586,8 +7586,8 @@ static NTSTATUS smb_posix_unlink(connection_struct *conn,
continue;
}
/* Fail with sharing violation. */
- close_file(req, fsp, NORMAL_CLOSE);
TALLOC_FREE(lck);
+ close_file(req, fsp, NORMAL_CLOSE);
return NT_STATUS_SHARING_VIOLATION;
}
}
@@ -7601,12 +7601,12 @@ static NTSTATUS smb_posix_unlink(connection_struct
*conn,
fsp,
smb_fname);
+ TALLOC_FREE(lck);
+
if (!NT_STATUS_IS_OK(status)) {
close_file(req, fsp, NORMAL_CLOSE);
- TALLOC_FREE(lck);
return status;
}
- TALLOC_FREE(lck);
return close_file(req, fsp, NORMAL_CLOSE);
}
--
Samba Shared Repository
