]> err.no Git - systemd/commitdiff
execute: fix typo
authorLennart Poettering <lennart@poettering.net>
Sat, 22 May 2010 02:39:16 +0000 (04:39 +0200)
committerLennart Poettering <lennart@poettering.net>
Sat, 22 May 2010 02:39:16 +0000 (04:39 +0200)
src/execute.c
src/execute.h
src/main.c

index ead6c0fa423fd2c322bbedd37686a0ca4c2d7b28..1b37f2efe45c122b0b7a7c9aecb515318f2ca998 100644 (file)
@@ -783,10 +783,12 @@ int exec_spawn(ExecCommand *command,
 
                 /* child */
 
-                /* We reset exactly these two signals, since they are
-                 * the only ones we set to SIG_IGN in the main
-                 * daemon. All others */
-                default_signals(SIGNALS_CRASH_HANLDER,
+                /* We reset exactly these signals, since they are the
+                 * only ones we set to SIG_IGN in the main daemon. All
+                 * others we leave untouched because we set them to
+                 * SIG_DFL or a valid handler initially, both of which
+                 * will be demoted to SIG_DFL. */
+                default_signals(SIGNALS_CRASH_HANDLER,
                                 SIGNALS_IGNORE, -1);
 
                 if (sigemptyset(&ss) < 0 ||
index 045d4620d78b742af5ad7964c1db2bfb476067cb..4585fe43a70b64c204f645af05b2fa916a123fb6 100644 (file)
@@ -42,7 +42,7 @@ struct CGroupBonding;
 #define LOGGER_SOCKET "/org/freedesktop/systemd1/logger"
 
 /* This doesn't really belong here, but I couldn't find a better place to put this. */
-#define SIGNALS_CRASH_HANLDER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT
+#define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT
 #define SIGNALS_IGNORE SIGKILL,SIGPIPE
 
 typedef enum ExecInput {
index 5c2af042d9a73937ef310fe271532ba43a9dc7e2..3b9719fb568d45013da523a42d2d90e2cf8108d3 100644 (file)
@@ -165,7 +165,7 @@ static void install_crash_handler(void) {
         sa.sa_handler = crash;
         sa.sa_flags = SA_NODEFER;
 
-        sigaction_many(&sa, SIGNALS_CRASH_HANLDER, -1);
+        sigaction_many(&sa, SIGNALS_CRASH_HANDLER, -1);
 }
 
 static int make_null_stdio(void) {