From: florian <florian@openbsd.org>
Date: Sat, 4 Aug 2018 09:37:17 +0000 (+0000)
Subject: Leave the control socket behind on shutdown. It doesn't hurt anyone.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1258db737c3fbca31589b8d71c917f93a340b8ba;p=openbsd

Leave the control socket behind on shutdown. It doesn't hurt anyone.
On the other hand it is much more powerful to get rid of cpath; rad is
no longer allowed to change anything on the filesystem.
Triggered by mestre@'s work to fix unlinking in other daemons and a
question from deraadt@
OK mestre
---

diff --git a/usr.sbin/rad/control.c b/usr.sbin/rad/control.c
index bc3bd7e450d..65d69f97a72 100644
--- a/usr.sbin/rad/control.c
+++ b/usr.sbin/rad/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.3 2018/07/13 08:32:10 florian Exp $	*/
+/*	$OpenBSD: control.c,v 1.4 2018/08/04 09:37:17 florian Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -103,16 +103,6 @@ control_listen(void)
 	return (0);
 }
 
-void
-control_cleanup(char *path)
-{
-	if (path == NULL)
-		return;
-	event_del(&control_state.ev);
-	event_del(&control_state.evt);
-	unlink(path);
-}
-
 void
 control_accept(int listenfd, short event, void *bula)
 {
diff --git a/usr.sbin/rad/control.h b/usr.sbin/rad/control.h
index 7ac69527f11..8ce9b1f22d7 100644
--- a/usr.sbin/rad/control.h
+++ b/usr.sbin/rad/control.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.h,v 1.1 2018/07/10 16:39:54 florian Exp $	*/
+/*	$OpenBSD: control.h,v 1.2 2018/08/04 09:37:17 florian Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -32,4 +32,3 @@ int	control_listen(void);
 void	control_accept(int, short, void *);
 void	control_dispatch_imsg(int, short, void *);
 int	control_imsg_relay(struct imsg *);
-void	control_cleanup(char *);
diff --git a/usr.sbin/rad/rad.c b/usr.sbin/rad/rad.c
index 4c82b429e2f..81265d93736 100644
--- a/usr.sbin/rad/rad.c
+++ b/usr.sbin/rad/rad.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rad.c,v 1.13 2018/08/03 13:14:46 florian Exp $	*/
+/*	$OpenBSD: rad.c,v 1.14 2018/08/04 09:37:17 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -56,7 +56,7 @@ __dead void	main_shutdown(void);
 
 void	main_sig_handler(int, short, void *);
 
-static pid_t	start_child(int, char *, int, int, int, char *);
+static pid_t	start_child(int, char *, int, int, int);
 
 void	main_dispatch_frontend(int, short, void *);
 void	main_dispatch_engine(int, short, void *);
@@ -73,7 +73,6 @@ struct rad_conf	*main_conf;
 struct imsgev		*iev_frontend;
 struct imsgev		*iev_engine;
 char			*conffile;
-char			*csock;
 
 pid_t	 frontend_pid;
 pid_t	 engine_pid;
@@ -131,6 +130,7 @@ main(int argc, char *argv[])
 	int			 icmp6sock, on = 1, off = 0;
 	int			 frontend_routesock, rtfilter;
 	int			 control_fd;
+	char			*csock;
 
 	conffile = CONF_FILE;
 	csock = RAD_SOCKET;
@@ -220,9 +220,9 @@ main(int argc, char *argv[])
 
 	/* Start children. */
 	engine_pid = start_child(PROC_ENGINE, saved_argv0, pipe_main2engine[1],
-	    debug, cmd_opts & OPT_VERBOSE, NULL);
+	    debug, cmd_opts & OPT_VERBOSE);
 	frontend_pid = start_child(PROC_FRONTEND, saved_argv0,
-	    pipe_main2frontend[1], debug, cmd_opts & OPT_VERBOSE, csock);
+	    pipe_main2frontend[1], debug, cmd_opts & OPT_VERBOSE);
 
 	rad_process = PROC_MAIN;
 	log_procinit(log_procnames[rad_process]);
@@ -304,7 +304,7 @@ main(int argc, char *argv[])
 	main_imsg_compose_frontend_fd(IMSG_CONTROLFD, 0, control_fd);
 	main_imsg_send_config(main_conf);
 
-	if (pledge("stdio rpath cpath sendfd", NULL) == -1)
+	if (pledge("stdio rpath sendfd", NULL) == -1)
 		fatal("pledge");
 
 	main_imsg_compose_frontend(IMSG_STARTUP, 0, NULL, 0);
@@ -344,14 +344,12 @@ main_shutdown(void)
 	free(iev_frontend);
 	free(iev_engine);
 
-	control_cleanup(csock);
-
 	log_info("terminating");
 	exit(0);
 }
 
 static pid_t
-start_child(int p, char *argv0, int fd, int debug, int verbose, char *sockname)
+start_child(int p, char *argv0, int fd, int debug, int verbose)
 {
 	char	*argv[7];
 	int	 argc = 0;
@@ -385,10 +383,6 @@ start_child(int p, char *argv0, int fd, int debug, int verbose, char *sockname)
 		argv[argc++] = "-d";
 	if (verbose)
 		argv[argc++] = "-v";
-	if (sockname) {
-		argv[argc++] = "-s";
-		argv[argc++] = sockname;
-	}
 	argv[argc++] = NULL;
 
 	execvp(argv0, argv);
@@ -427,7 +421,7 @@ main_dispatch_frontend(int fd, short event, void *bula)
 
 		switch (imsg.hdr.type) {
 		case IMSG_STARTUP_DONE:
-			if (pledge("stdio rpath cpath", NULL) == -1)
+			if (pledge("stdio rpath", NULL) == -1)
 				fatal("pledge");
 			break;
 		case IMSG_CTL_RELOAD: