[SCM] Samba Shared Repository - branch v3-0-stable updated - release-3-0-33-111-g0b37b5a

[Karolin Seeger]

The branch, v3-0-stable has been updated
       via  0b37b5ac22b9d56c4eb24b00d1cd1d9057bfbdca (commit)
       via  771c6822127b13d065a37888f9cd2a02fbe12196 (commit)
      from  9cf63bcbc1df74fc15d40ef3ffe8c7dd45118551 (commit)

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


- Log -----------------------------------------------------------------
commit 0b37b5ac22b9d56c4eb24b00d1cd1d9057bfbdca
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu Jan 15 08:34:53 2009 +0100

    WHATSNEW: Update WHATSNEW.
    
    Karolin
    (cherry picked from commit f121ad38a1306b3c69eb4485b18ed187d1fd9270)

commit 771c6822127b13d065a37888f9cd2a02fbe12196
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jan 14 13:17:58 2009 -0800

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

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

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


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index fc12cba..fa0ae84 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -47,6 +47,7 @@ o   Jeremy Allison <jra at samba.org>
     * BUG 5937: Fix filenames with "*" char hiding other files.
     * BUG 6019: File corruption in Clustered SMB/NFS environment
       managed via CTDB.
+    * BUG 6035: Fix possible race between fcntl F_SETLKW and alarm delivery.
     * Remove unecessary msync.
     * Rename cifs.spnego to cifs.upcall.
     * Fix segfault when execution cifs.upcall without any arguments.
diff --git a/source/passdb/pdb_smbpasswd.c b/source/passdb/pdb_smbpasswd.c
index e01b4b1..18fbe88 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;


-- 
Samba Shared Repository