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

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  6a8496adce6fa54d5cb86592dd977168319d5da3 (commit)
      from  43d6aabfa58cda95f362e86c324c7f2ae21aec53 (commit)

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


- Log -----------------------------------------------------------------
commit 6a8496adce6fa54d5cb86592dd977168319d5da3
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jan 14 13:15:59 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