mirror of
https://github.com/samba-team/samba.git
synced 2025-01-29 21:47:30 +03:00
it is possible for some of the real time signals to be used by glibc,
which then changes SIGRTMIN. It is also possible for bash to leave some real time signals blocked at startup. This fixes both problems. (This used to be commit 8d45bf644aecb6993c2a82b86a4527b33029ed8f)
This commit is contained in:
parent
0e1ad952fb
commit
893cbb7592
@ -891,6 +891,10 @@ struct printjob;
|
||||
#define SIGCLD SIGCHLD
|
||||
#endif
|
||||
|
||||
#ifndef SIGRTMIN
|
||||
#define SIGRTMIN 32
|
||||
#endif
|
||||
|
||||
#ifndef MAP_FILE
|
||||
#define MAP_FILE 0
|
||||
#endif
|
||||
|
@ -39,7 +39,7 @@ static SIG_ATOMIC_T signals_received;
|
||||
|
||||
|
||||
#ifndef RT_SIGNAL_NOTIFY
|
||||
#define RT_SIGNAL_NOTIFY 34
|
||||
#define RT_SIGNAL_NOTIFY (SIGRTMIN+2)
|
||||
#endif
|
||||
|
||||
#ifndef F_SETSIG
|
||||
@ -233,6 +233,9 @@ struct cnotify_fns *kernel_notify_init(void)
|
||||
cnotify.remove_notify = kernel_remove_notify;
|
||||
cnotify.select_time = -1;
|
||||
|
||||
/* the signal can start off blocked due to a bug in bash */
|
||||
BlockSignals(False, RT_SIGNAL_NOTIFY);
|
||||
|
||||
return &cnotify;
|
||||
}
|
||||
|
||||
|
@ -39,7 +39,7 @@ static SIG_ATOMIC_T fd_pending_array[FD_PENDING_SIZE];
|
||||
#endif
|
||||
|
||||
#ifndef RT_SIGNAL_LEASE
|
||||
#define RT_SIGNAL_LEASE 33
|
||||
#define RT_SIGNAL_LEASE (SIGRTMIN+1)
|
||||
#endif
|
||||
|
||||
#ifndef F_SETSIG
|
||||
@ -296,6 +296,9 @@ struct kernel_oplocks *linux_init_kernel_oplocks(void)
|
||||
koplocks.msg_waiting = linux_oplock_msg_waiting;
|
||||
koplocks.notification_fd = -1;
|
||||
|
||||
/* the signal can start off blocked due to a bug in bash */
|
||||
BlockSignals(False, RT_SIGNAL_LEASE);
|
||||
|
||||
DEBUG(3,("Linux kernel oplocks enabled\n"));
|
||||
|
||||
return &koplocks;
|
||||
|
Loading…
x
Reference in New Issue
Block a user