[SCM] Samba Shared Repository - branch master updated - b3e6247a9eb27835a71d6b42b33b51a48f35b862

[Jeremy Allison]

The branch, master has been updated
       via  b3e6247a9eb27835a71d6b42b33b51a48f35b862 (commit)
      from  e3ef19b9b9ae76c059ddff58324102c7de210f6d (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b3e6247a9eb27835a71d6b42b33b51a48f35b862
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jan 14 13:17:38 2009 -0800

    Fix bug #6035 - Possible race between fcntl F_SETLKW and alarm delivery.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/passdb/pdb_smbpasswd.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index f72638b..b72e0f2 100644
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/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;


-- 
Samba Shared Repository