[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3360-g7c0b99b

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  7c0b99baafc4a0bc04251c9a456bf2cc104058c4 (commit)
      from  25e035815681136e69b9d49d548b7d7b908011c5 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


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

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

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

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


Changeset truncated at 500 lines:

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


-- 
Samba Shared Repository