From: Jeremy Allison <jra@samba.org>
Date: Wed, 14 Jan 2009 21:17:58 +0000 (-0800)
Subject: Fix bug #6035 - Possible race between fcntl F_SETLKW and alarm delivery.
X-Git-Tag: samba-3.0.34~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=771c6822127b13d065a37888f9cd2a02fbe12196;p=thirdparty%2Fsamba.git

Fix bug #6035 - Possible race between fcntl F_SETLKW and alarm delivery.
Jeremy.
(cherry picked from commit 0b880a684356d5cc2c266c760994838910134eef)
---

diff --git a/source/passdb/pdb_smbpasswd.c b/source/passdb/pdb_smbpasswd.c
index e01b4b1855c..18fbe88859b 100644
--- a/source/passdb/pdb_smbpasswd.c
+++ b/source/passdb/pdb_smbpasswd.c
@@ -101,7 +101,7 @@ static BOOL do_file_lock(int fd, int waitsecs, int type)
 	alarm(0);
 	CatchSignal(SIGALRM, SIGNAL_CAST oldsig_handler);
 
-	if (gotalarm) {
+	if (gotalarm && ret == -1) {
 		DEBUG(0, ("do_file_lock: failed to %s file.\n",
 			type == F_UNLCK ? "unlock" : "lock"));
 		return False;