diff options
| author | Jeremy Allison <jra@samba.org> | 2008-03-31 16:46:20 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-03-31 16:46:20 -0700 |
| commit | e11cd466e1b6beae82fa0117c300669b8eff7f0a (patch) | |
| tree | 6382b4a0d6d976e80c46cb6c2606695c983a24e3 | |
| parent | c523c2c3e678756b72665127a23443a7a6b32bde (diff) | |
| download | samba-e11cd466e1b6beae82fa0117c300669b8eff7f0a.tar.gz samba-e11cd466e1b6beae82fa0117c300669b8eff7f0a.tar.bz2 samba-e11cd466e1b6beae82fa0117c300669b8eff7f0a.zip | |
Reduce the race condition in Samba4 in RAW-RENAME test. We rename a file
using trans2 setfileinfo on one connection, and then check the
file name has changed on the other. In Samba we achieve this by
sending a local message to the other process. This change causes
us to re-scan for incoming messages after we've woken up from the
select (which is cheap if there are no pending messages). This reduces
the race significantly. Volker please review.
Jeremy.
(This used to be commit a7499e994aef743ea9c443f9a1618b262f6eda93)
| -rw-r--r-- | source3/smbd/process.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 9c01bbaa4a..03216a0700 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -853,6 +853,15 @@ static NTSTATUS receive_message_or_smb(TALLOC_CTX *mem_ctx, char **buffer, goto again; } + /* + * We've just woken up from a protentially long select sleep. + * Ensure we process local messages as we need to synchronously + * process any messages from other smbd's to avoid file rename race + * conditions. This call is cheap if there are no messages waiting. + * JRA. + */ + message_dispatch(smbd_messaging_context()); + /* if we get EINTR then maybe we have received an oplock signal - treat this as select returning 1. This is ugly, but is the best we can do until the oplock code knows more about |