From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 7 Jul 2009 13:16:21 +0000 (+0200)
Subject: s3:smbd: cancel all locks that are made before the first failure
X-Git-Tag: talloc-2.0.0~727
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a830a3f9e292931acd90b5cf5cdffc6e83ea00c7;p=thirdparty%2Fsamba.git

s3:smbd: cancel all locks that are made before the first failure

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 87001468599..c07ac336793 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