summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2002-05-06 19:35:52 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2002-05-06 19:35:52 +0000
commit3e41099947c85973606c741265edbb7bc11e8f92 (patch)
treead2b255dc0f7536b09b30e49728c67a281f47722
parent54c12dea61d99793b79100510894cd8224fb680b (diff)
do not install a SIGSEGV handler
-rw-r--r--usr.sbin/httpd/src/main/http_main.c4
-rw-r--r--usr.sbin/pppd/main.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/usr.sbin/httpd/src/main/http_main.c b/usr.sbin/httpd/src/main/http_main.c
index 648db553e75..29be0125a4c 100644
--- a/usr.sbin/httpd/src/main/http_main.c
+++ b/usr.sbin/httpd/src/main/http_main.c
@@ -3309,8 +3309,10 @@ static void set_signals(void)
#elif defined(SA_RESETHAND)
sa.sa_flags = SA_RESETHAND;
#endif
+#ifdef SIGSEGV_CHECK
if (sigaction(SIGSEGV, &sa, NULL) < 0)
ap_log_error(APLOG_MARK, APLOG_WARNING, server_conf, "sigaction(SIGSEGV)");
+#endif /* SIGSEGV_CHECK */
#ifdef SIGBUS
if (sigaction(SIGBUS, &sa, NULL) < 0)
ap_log_error(APLOG_MARK, APLOG_WARNING, server_conf, "sigaction(SIGBUS)");
@@ -3362,7 +3364,9 @@ static void set_signals(void)
ap_log_error(APLOG_MARK, APLOG_WARNING, server_conf, "sigaction(SIGUSR1)");
#else
if (!one_process) {
+#ifdef SIGSEGV_CHECK
signal(SIGSEGV, sig_coredump);
+#endif /* SIGSEGV_CHECK */
#ifdef SIGBUS
signal(SIGBUS, sig_coredump);
#endif /* SIGBUS */
diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c
index 338df8ab558..32afc8dfb19 100644
--- a/usr.sbin/pppd/main.c
+++ b/usr.sbin/pppd/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.34 2002/02/19 19:39:40 millert Exp $ */
+/* $OpenBSD: main.c,v 1.35 2002/05/06 19:35:26 deraadt Exp $ */
/*
* main.c - Point-to-Point Protocol main module
@@ -23,7 +23,7 @@
#if 0
static char rcsid[] = "Id: main.c,v 1.49 1998/05/05 05:24:17 paulus Exp $";
#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.34 2002/02/19 19:39:40 millert Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.35 2002/05/06 19:35:26 deraadt Exp $";
#endif
#endif
@@ -331,7 +331,9 @@ main(argc, argv)
SIGNAL(SIGILL, bad_signal);
SIGNAL(SIGPIPE, bad_signal);
SIGNAL(SIGQUIT, bad_signal);
+#if 0
SIGNAL(SIGSEGV, bad_signal);
+#endif
#ifdef SIGBUS
SIGNAL(SIGBUS, bad_signal);
#endif