From 747faa287567a0716ae1ed8dcfb654dbfcfdbbb5 Mon Sep 17 00:00:00 2001 From: Florian Obser Date: Sat, 1 May 2021 11:53:25 +0000 Subject: In singel user mode / is mounted ro. Just warn if we can't create the control socket instead of fatal(). OK deraadt --- sbin/slaacd/slaacd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'sbin/slaacd') diff --git a/sbin/slaacd/slaacd.c b/sbin/slaacd/slaacd.c index 9e1e9998b2f..44a754b421c 100644 --- a/sbin/slaacd/slaacd.c +++ b/sbin/slaacd/slaacd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: slaacd.c,v 1.59 2021/03/21 18:25:24 florian Exp $ */ +/* $OpenBSD: slaacd.c,v 1.60 2021/05/01 11:53:24 florian Exp $ */ /* * Copyright (c) 2017 Florian Obser @@ -263,7 +263,7 @@ main(int argc, char *argv[]) #ifndef SMALL if ((control_fd = control_init(csock)) == -1) - fatalx("control socket setup failed"); + warnx("control socket setup failed"); #endif /* SMALL */ if (pledge("stdio inet sendfd wroute", NULL) == -1) @@ -272,7 +272,8 @@ main(int argc, char *argv[]) main_imsg_compose_frontend(IMSG_ROUTESOCK, frontend_routesock, NULL, 0); #ifndef SMALL - main_imsg_compose_frontend(IMSG_CONTROLFD, control_fd, NULL, 0); + if (control_fd != -1) + main_imsg_compose_frontend(IMSG_CONTROLFD, control_fd, NULL, 0); #endif /* SMALL */ main_imsg_compose_frontend(IMSG_STARTUP, -1, NULL, 0); -- cgit v1.2.3