Ignore SIGUSR1 and SIGUSR2 by default.

This stops users from accidentally killing their IRC server if they
forget to load the sslrehashsignal module.

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index b6c25210427d450168a98a6b95714bc9842e41b9..c5d958f8788b4cf59c350282e4dd4a9f8fc602e6 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -121,10 +121,11 @@ void InspIRCd::SetSignals()
 {
 #ifndef _WIN32
        signal(SIGALRM, SIG_IGN);
+       signal(SIGCHLD, SIG_IGN);
        signal(SIGHUP, InspIRCd::SetSignal);
        signal(SIGPIPE, SIG_IGN);
-       signal(SIGCHLD, SIG_IGN);
-       /* We want E2BIG not a signal! */
+       signal(SIGUSR1, SIG_IGN);
+       signal(SIGUSR2, SIG_IGN);
        signal(SIGXFSZ, SIG_IGN);
 #endif
        signal(SIGTERM, InspIRCd::SetSignal);

diff --git a/src/modules/extra/m_sslrehashsignal.cpp b/src/modules/extra/m_sslrehashsignal.cpp
index fea32326a29fe209406b32f247ee9a499acb297a..e8be17e23b0559a6b6ed8fa6d38d4feb34ba36bd 100644 (file)
--- a/src/modules/extra/m_sslrehashsignal.cpp
+++ b/src/modules/extra/m_sslrehashsignal.cpp
@@ -33,7 +33,7 @@ class ModuleSSLRehashSignal : public Module
  public:
        ~ModuleSSLRehashSignal()
        {
-               signal(SIGUSR1, SIG_DFL);
+               signal(SIGUSR1, SIG_IGN);
        }
 
        void init()