diff options
| author |   florian <florian@openbsd.org> | 2019-01-14 16:50:56 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2019-01-14 16:50:56 +0000 |
| commit | 0347b6987fe15cb27121f52b16876b6773b4f3fa (patch) | |
| tree | 3b6396fe6ea6d8898c93e8585f68a37a2bf5eae2 | |
| parent | backout previous; crashes near mountpoints it seems (diff) | |
| download | wireguard-openbsd-0347b6987fe15cb27121f52b16876b6773b4f3fa.tar.xz wireguard-openbsd-0347b6987fe15cb27121f52b16876b6773b4f3fa.zip | |
Improve error message when daemon is already running.
OK millert, deraadt, job
| -rw-r--r-- | usr.sbin/ospf6d/ospf6d.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ospfd/ospfd.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/ospf6d/ospf6d.c b/usr.sbin/ospf6d/ospf6d.c index db57f4bb406..1e66d32d4e5 100644 --- a/usr.sbin/ospf6d/ospf6d.c +++ b/usr.sbin/ospf6d/ospf6d.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ospf6d.c,v 1.41 2018/12/29 16:04:31 remi Exp $ */ +/* $OpenBSD: ospf6d.c,v 1.42 2019/01/14 16:50:56 florian Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -211,7 +211,7 @@ main(int argc, char *argv[]) log_setverbose(ospfd_conf->opts & OSPFD_OPT_VERBOSE); if ((control_check(ospfd_conf->csock)) == -1) - fatalx("control socket check failed"); + fatalx("ospf6d already running"); if (!debug) daemon(1, 0); diff --git a/usr.sbin/ospfd/ospfd.c b/usr.sbin/ospfd/ospfd.c index eeb7ff8f1f5..1aa7cde3248 100644 --- a/usr.sbin/ospfd/ospfd.c +++ b/usr.sbin/ospfd/ospfd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ospfd.c,v 1.103 2019/01/02 18:47:59 remi Exp $ */ +/* $OpenBSD: ospfd.c,v 1.104 2019/01/14 16:50:56 florian Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -215,7 +215,7 @@ main(int argc, char *argv[]) log_setverbose(ospfd_conf->opts & OSPFD_OPT_VERBOSE); if ((control_check(ospfd_conf->csock)) == -1) - fatalx("control socket check failed"); + fatalx("ospfd already running"); if (!debug) daemon(1, 0); |