From: florian <florian@openbsd.org>
Date: Sat, 1 May 2021 11:53:24 +0000 (+0000)
Subject: In singel user mode / is mounted ro. Just warn if we can't create
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=2eeed627ae03cf6b5605ce489ecf007d3ea6be6b;p=openbsd

In singel user mode / is mounted ro. Just warn if we can't create
the control socket instead of fatal().
OK deraadt
---

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 <florian@openbsd.org>
@@ -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);