Set the signal handlers before creating the thread. This is so it inherits

the parent's signal mask.  Once daemon() forked, signals would be ignored
in the child thread.  While I'm here, check the return value of daemon().
This fixes termination in the daemon case (bug introduced in last commit).

Noticed by:	Frederik Lindberg

1 files changed, 15 insertions, 4 deletions

diff --git a/usr.sbin/powerd/powerd.c b/usr.sbin/powerd/powerd.c
index 123e649..301ca53 100644
--- a/usr.sbin/powerd/powerd.c
+++ b/usr.sbin/powerd/powerd.c
@@ -479,6 +479,15 @@ main(int argc, char * argv[])
 	if (read_freqs(&numfreqs, &freqs, &mwatts))
 		err(1, "error reading supported CPU frequencies");
 
+	/*
+	 * Exit cleanly on signals; devd may send a SIGPIPE if it dies.  We
+	 * do this before acline_init() since it may create a thread and we
+	 * want it to inherit our signal mask.
+	 */
+	signal(SIGINT, handle_sigs);
+	signal(SIGTERM, handle_sigs);
+	signal(SIGPIPE, SIG_IGN);
+
 	/* Decide whether to use ACPI or APM to read the AC line status. */
 	acline_init();
 
@@ -494,12 +503,14 @@ main(int argc, char * argv[])
 			}
 			warn("cannot open pid file");
 		}
-		daemon(0, 0);
+		if (daemon(0, 0) != 0) {
+			warn("cannot enter daemon mode, exiting");
+			pidfile_remove(pfh);
+			exit(EXIT_FAILURE);
+
+		}
 		pidfile_write(pfh);
 	}
-	signal(SIGINT, handle_sigs);
-	signal(SIGTERM, handle_sigs);
-	signal(SIGPIPE, SIG_IGN);
 
 	/* Main loop. */
 	for (;;) {