The Samba-Bugzilla – Attachment 4400 Details for
Bug 6538
Fail to back out lockingX calls on error.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Metze's patch for 3.4.x.
test (text/plain), 1.24 KB, created by
Jeremy Allison
on 2009-07-07 15:14:06 UTC
(
hide
)
Description:
Metze's patch for 3.4.x.
Filename:
MIME Type:
Creator:
Jeremy Allison
Created:
2009-07-07 15:14:06 UTC
Size:
1.24 KB
patch
obsolete
>From: Stefan Metzmacher <metze@samba.org> >Date: Tue, 7 Jul 2009 15:16:21 +0000 (+0200) >Subject: s3:smbd: cancel all locks that are made before the first failure >X-Git-Url: http://gitweb.samba.org/metze/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=b94725cc5027d852ee264cc7d8d5d83c1a49d4b1 > >s3:smbd: cancel all locks that are made before the first failure > >We never reached the cleanup code and directly returned the error. > >metze >--- > >diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c >index 8700146..c07ac33 100644 >--- a/source3/smbd/reply.c >+++ b/source3/smbd/reply.c >@@ -7491,18 +7491,18 @@ void reply_lockingX(struct smb_request *req) > } > > if (NT_STATUS_V(status)) { >- END_PROFILE(SMBlockingX); >- reply_nterror(req, status); >- return; >+ break; > } > } > > /* If any of the above locks failed, then we must unlock > all of the previous locks (X/Open spec). */ >+ if (num_locks != 0 && !NT_STATUS_IS_OK(status)) { >+ >+ if (locktype & LOCKING_ANDX_CANCEL_LOCK) { >+ i = -1; /* we want to skip the for loop */ >+ } > >- if (!(locktype & LOCKING_ANDX_CANCEL_LOCK) && >- (i != num_locks) && >- (num_locks != 0)) { > /* > * Ensure we don't do a remove on the lock that just failed, > * as under POSIX rules, if we have a lock already there, we
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 6538
:
4400
|
4401
|
4408