From 567fcd81ed7e8cda0640d100f501083632b130f3 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 28 Mar 2003 01:07:05 +0000
Subject: merged real time signal fixes from head (This used to be commit
 03a5e62300f3cfb96d14570b73a758e6fa64c449)

---
 source3/include/includes.h   | 4 ++++
 source3/smbd/notify_kernel.c | 5 ++++-
 source3/smbd/oplock_linux.c  | 5 ++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index bdd8661f6f..168256fd56 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -864,6 +864,10 @@ struct printjob;
 #define SIGCLD SIGCHLD
 #endif
 
+#ifndef SIGRTMIN
+#define SIGRTMIN 32
+#endif
+
 #ifndef MAP_FILE
 #define MAP_FILE 0
 #endif
diff --git a/source3/smbd/notify_kernel.c b/source3/smbd/notify_kernel.c
index 8b7ff21ecb..efe93de5af 100644
--- a/source3/smbd/notify_kernel.c
+++ b/source3/smbd/notify_kernel.c
@@ -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;
 }
 
diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c
index deed0c5107..84083dffc9 100644
--- a/source3/smbd/oplock_linux.c
+++ b/source3/smbd/oplock_linux.c
@@ -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;
-- 
cgit