diff options
Diffstat (limited to 'source/lib/util_file.c')
| -rw-r--r-- | source/lib/util_file.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/lib/util_file.c b/source/lib/util_file.c index 7ea9825ad1d..526e8b01568 100644 --- a/source/lib/util_file.c +++ b/source/lib/util_file.c @@ -50,10 +50,9 @@ 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_IGN); + CatchSignal(SIGALRM, SIGNAL_CAST SIG_DFL); if (gotalarm) { DEBUG(0, ("do_file_lock: failed to %s file.\n", @@ -467,7 +466,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]); + unix_to_dos(ret[i], True); } return ret; |