summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2011-04-24 02:23:57 +0000
committerderaadt <deraadt@openbsd.org>2011-04-24 02:23:57 +0000
commite40f93f79606147207bf90956c8ab40643921148 (patch)
treeb3457f0e2eb9c5a5551a48c380a927fe68336119
parentNo point in attempting to open the 'c' partition on devices that have (diff)
downloadwireguard-openbsd-e40f93f79606147207bf90956c8ab40643921148.tar.xz
wireguard-openbsd-e40f93f79606147207bf90956c8ab40643921148.zip
delete a stupid SIGSEGV handler (not used)
-rw-r--r--usr.bin/rdist/common.c34
1 files changed, 6 insertions, 28 deletions
diff --git a/usr.bin/rdist/common.c b/usr.bin/rdist/common.c
index 261ee6b1788..0298754ea2d 100644
--- a/usr.bin/rdist/common.c
+++ b/usr.bin/rdist/common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: common.c,v 1.25 2011/04/18 12:29:59 krw Exp $ */
+/* $OpenBSD: common.c,v 1.26 2011/04/24 02:23:57 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -101,11 +101,6 @@ init(int argc, char **argv, char **envp)
{
int i;
-#ifdef SIGSEGV_CHECK
- if (!isserver)
- (void) signal(SIGSEGV, sighandler);
-#endif
-
/*
* Save a copy of our argc and argv before setargs() overwrites them
*/
@@ -200,22 +195,6 @@ lostconn(void)
finish();
}
-#ifdef SIGSEGV_CHECK
-/*
- * Do a core dump
- */
-void
-coredump(void)
-{
- error("Segmentation violation - dumping core [PID = %d, %s]",
- getpid(),
- (isserver) ? "isserver" : ((amchild) ? "amchild" : "parent"));
- abort();
- /*NOTREACHED*/
- fatalerr("Abort failed - no core dump. Exiting...");
-}
-#endif
-
/*
* General signal handler
*/
@@ -224,17 +203,20 @@ sighandler(int sig)
{
int save_errno = errno;
+ /* XXX signal race */
debugmsg(DM_CALL, "sighandler() received signal %d\n", sig);
switch (sig) {
case SIGALRM:
contimedout = TRUE;
+ /* XXX signal race */
checkhostname();
error("Response time out");
finish();
break;
case SIGPIPE:
+ /* XXX signal race */
lostconn();
break;
@@ -242,20 +224,16 @@ sighandler(int sig)
debug = !debug;
break;
-#ifdef SIGSEGV_CHECK
- case SIGSEGV:
- coredump();
- break;
-#endif
-
case SIGHUP:
case SIGINT:
case SIGQUIT:
case SIGTERM:
+ /* XXX signal race */
finish();
break;
default:
+ /* XXX signal race */
fatalerr("No signal handler defined for signal %d.", sig);
}
errno = save_errno;