[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-114-g0b880a6

[Jeremy Allison]

The branch, v3-0-test has been updated
       via  0b880a684356d5cc2c266c760994838910134eef (commit)
      from  01debccb65fe63b070a2e219f7e4f2903f19fcfd (commit)

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


- Log -----------------------------------------------------------------
commit 0b880a684356d5cc2c266c760994838910134eef
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.

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

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 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