diff options
| author | Jeremy Allison <jra@samba.org> | 2006-09-07 16:51:17 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:51:16 -0500 |
| commit | d07458bd67a29c0a8abfa6e72115732e18f51b2f (patch) | |
| tree | 8ce95e1902e4291fdffdc539f72e04439b68b3a8 /source3/smbd | |
| parent | 253c01f29ee8b0287eb47a29683a54ec846d142e (diff) | |
| download | samba-d07458bd67a29c0a8abfa6e72115732e18f51b2f.tar.gz samba-d07458bd67a29c0a8abfa6e72115732e18f51b2f.tar.bz2 samba-d07458bd67a29c0a8abfa6e72115732e18f51b2f.zip | |
r18224: Paranoia - ensure the oplock event handler is
removed immediately in the handler.
Extra debug info tracking down winbindd DC
selection.
Jeremy.
(This used to be commit 7ba9b6ce588f716589e9f88ed146fad36c4b3758)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/oplock.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index eec19259d0..aaa236effa 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -348,6 +348,12 @@ static void oplock_timeout_handler(struct timed_event *te, { files_struct *fsp = (files_struct *)private_data; + /* Ensure we always remove this event. */ + if (fsp->oplock_timeout != NULL) { + /* Remove the timed event handler. */ + TALLOC_FREE(fsp->oplock_timeout); + fsp->oplock_timeout = NULL; + } DEBUG(0, ("Oplock break failed for file %s -- replying anyway\n", fsp->fsp_name)); global_client_failed_oplock_break = True; remove_oplock(fsp); |