From 7c0b99baafc4a0bc04251c9a456bf2cc104058c4 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 14 Jan 2009 13:17:02 -0800
Subject: [PATCH] Fix bug #6035 - Possible race between fcntl F_SETLKW and
 alarm delivery. Jeremy.

---
 source/passdb/pdb_smbpasswd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/passdb/pdb_smbpasswd.c b/source/passdb/pdb_smbpasswd.c
index f72638bed50..b72e0f2cba3 100644
--- a/source/passdb/pdb_smbpasswd.c
+++ b/source/passdb/pdb_smbpasswd.c
@@ -100,7 +100,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;
-- 
2.11.4.GIT