From d04b55f2186fb8af998cf61c576771a5f72f4892 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 30 Apr 2002 13:28:41 +0000
Subject: Start of merge to 2_2_RELEASE branch for release. Jeremy.

---
 source/lib/util_file.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source/lib/util_file.c')

diff --git a/source/lib/util_file.c b/source/lib/util_file.c
index 526e8b01568..7ea9825ad1d 100644
--- a/source/lib/util_file.c
+++ b/source/lib/util_file.c
@@ -50,9 +50,10 @@ BOOL do_file_lock(int fd, int waitsecs, int type)
   lock.l_pid = 0;
 
   alarm(waitsecs);
+  /* Note we must *NOT* use sys_fcntl here ! JRA */
   ret = fcntl(fd, SMB_F_SETLKW, &lock);
   alarm(0);
-  CatchSignal(SIGALRM, SIGNAL_CAST SIG_DFL);
+  CatchSignal(SIGALRM, SIGNAL_CAST SIG_IGN);
 
   if (gotalarm) {
     DEBUG(0, ("do_file_lock: failed to %s file.\n",
@@ -466,7 +467,7 @@ static char **file_lines_parse(char *p, size_t size, int *numlines, BOOL convert
 
 	if (convert) {
 		for (i = 0; ret[i]; i++)
-			unix_to_dos(ret[i], True);
+			unix_to_dos(ret[i]);
 	}
 
 	return ret;
-- 
cgit