Remove setproctitle() for the parent process. Because rc.d(8) uses process

titles (including flags) to distinguish between daemons, this makes it
possible to manage multiple copies of a daemon using the normal infrastructure
by symlinking rc.d scripts to a new name. ok jung@ ajacoutot@, smtpd ok gilles@

27 files changed, 27 insertions, 81 deletions

diff --git a/etc/rc.d/eigrpd b/etc/rc.d/eigrpd
index b0bbb1d5a81..f6e71c1aafd 100644
--- a/etc/rc.d/eigrpd
+++ b/etc/rc.d/eigrpd
@@ -1,11 +1,9 @@
 #!/bin/sh
 #
-# $OpenBSD: eigrpd,v 1.2 2015/10/21 11:28:02 gsoares Exp $
+# $OpenBSD: eigrpd,v 1.3 2016/02/02 17:51:11 sthen Exp $
 
 daemon="/usr/sbin/eigrpd"
 
 . /etc/rc.d/rc.subr
 
-pexp="eigrpd: parent.*"
-
 rc_cmd $1
diff --git a/etc/rc.d/httpd b/etc/rc.d/httpd
index 50be23675d5..3bfc63c1760 100644
--- a/etc/rc.d/httpd
+++ b/etc/rc.d/httpd
@@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: httpd,v 1.4 2015/12/19 13:45:12 ajacoutot Exp $
+# $OpenBSD: httpd,v 1.5 2016/02/02 17:51:11 sthen Exp $
 
 daemon="/usr/sbin/httpd"
 
 . /etc/rc.d/rc.subr
 
-pexp="httpd: parent.*"
-
 # child will not return a config parsing error to the parent
 rc_pre() {
 	${daemon} -n ${daemon_flags}
diff --git a/etc/rc.d/ldpd b/etc/rc.d/ldpd
index 9ea10b42864..b043b1c3f85 100644
--- a/etc/rc.d/ldpd
+++ b/etc/rc.d/ldpd
@@ -1,11 +1,9 @@
 #!/bin/sh
 #
-# $OpenBSD: ldpd,v 1.1 2011/07/06 18:55:36 robert Exp $
+# $OpenBSD: ldpd,v 1.2 2016/02/02 17:51:11 sthen Exp $
 
 daemon="/usr/sbin/ldpd"
 
 . /etc/rc.d/rc.subr
 
-pexp="ldpd: parent.*"
-
 rc_cmd $1
diff --git a/etc/rc.d/npppd b/etc/rc.d/npppd
index fb8ffd1d344..f364d314069 100644
--- a/etc/rc.d/npppd
+++ b/etc/rc.d/npppd
@@ -1,11 +1,9 @@
 #!/bin/sh
 #
-# $OpenBSD: npppd,v 1.1 2012/09/20 12:51:43 yasuoka Exp $
+# $OpenBSD: npppd,v 1.2 2016/02/02 17:51:11 sthen Exp $
 
 daemon="/usr/sbin/npppd"
 
 . /etc/rc.d/rc.subr
 
-pexp="npppd: main"
-
 rc_cmd $1
diff --git a/etc/rc.d/ntpd b/etc/rc.d/ntpd
index b706a605bc6..5b95bc1460d 100644
--- a/etc/rc.d/ntpd
+++ b/etc/rc.d/ntpd
@@ -1,12 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: ntpd,v 1.2 2011/09/14 02:36:09 william Exp $
+# $OpenBSD: ntpd,v 1.3 2016/02/02 17:51:11 sthen Exp $
 
 daemon="/usr/sbin/ntpd"
 
 . /etc/rc.d/rc.subr
 
-pexp="ntpd: \[priv\]"
 rc_reload=NO
 
 rc_cmd $1
diff --git a/etc/rc.d/ospf6d b/etc/rc.d/ospf6d
index aee5c402303..c21a881b7f9 100644
--- a/etc/rc.d/ospf6d
+++ b/etc/rc.d/ospf6d
@@ -1,11 +1,9 @@
 #!/bin/sh
 #
-# $OpenBSD: ospf6d,v 1.1 2011/07/17 00:25:58 david Exp $
+# $OpenBSD: ospf6d,v 1.2 2016/02/02 17:51:11 sthen Exp $
 
 daemon="/usr/sbin/ospf6d"
 
 . /etc/rc.d/rc.subr
 
-pexp="ospf6d: parent.*"
-
 rc_cmd $1
diff --git a/etc/rc.d/ospfd b/etc/rc.d/ospfd
index 2120468e4e1..a867d35b995 100644
--- a/etc/rc.d/ospfd
+++ b/etc/rc.d/ospfd
@@ -1,11 +1,9 @@
 #!/bin/sh
 #
-# $OpenBSD: ospfd,v 1.1 2011/07/08 22:20:07 deraadt Exp $
+# $OpenBSD: ospfd,v 1.2 2016/02/02 17:51:11 sthen Exp $
 
 daemon="/usr/sbin/ospfd"
 
 . /etc/rc.d/rc.subr
 
-pexp="ospfd: parent.*"
-
 rc_cmd $1
diff --git a/etc/rc.d/relayd b/etc/rc.d/relayd
index 07b7971ee14..883775a9d64 100644
--- a/etc/rc.d/relayd
+++ b/etc/rc.d/relayd
@@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: relayd,v 1.2 2015/12/19 13:45:12 ajacoutot Exp $
+# $OpenBSD: relayd,v 1.3 2016/02/02 17:51:11 sthen Exp $
 
 daemon="/usr/sbin/relayd"
 
 . /etc/rc.d/rc.subr
 
-pexp="relayd: parent.*"
-
 # child will not return a config parsing error to the parent
 rc_pre() {
 	${daemon} -n ${daemon_flags}
diff --git a/etc/rc.d/ripd b/etc/rc.d/ripd
index 8eec73703d4..83ff7802319 100644
--- a/etc/rc.d/ripd
+++ b/etc/rc.d/ripd
@@ -1,11 +1,9 @@
 #!/bin/sh
 #
-# $OpenBSD: ripd,v 1.1 2011/07/06 18:55:36 robert Exp $
+# $OpenBSD: ripd,v 1.2 2016/02/02 17:51:11 sthen Exp $
 
 daemon="/usr/sbin/ripd"
 
 . /etc/rc.d/rc.subr
 
-pexp="ripd: parent.*"
-
 rc_cmd $1
diff --git a/etc/rc.d/smtpd b/etc/rc.d/smtpd
index 2696455e87e..e8d0325f349 100644
--- a/etc/rc.d/smtpd
+++ b/etc/rc.d/smtpd
@@ -1,12 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: smtpd,v 1.5 2015/12/26 09:55:15 ajacoutot Exp $
+# $OpenBSD: smtpd,v 1.6 2016/02/02 17:51:11 sthen Exp $
 
 daemon="/usr/sbin/smtpd"
 
 . /etc/rc.d/rc.subr
 
-pexp="smtpd: \[priv\]"
 rc_reload=NO
 
 rc_cmd $1
diff --git a/etc/rc.d/snmpd b/etc/rc.d/snmpd
index ae8f1a3973b..aba68612e0d 100644
--- a/etc/rc.d/snmpd
+++ b/etc/rc.d/snmpd
@@ -1,12 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: snmpd,v 1.2 2014/08/25 12:08:55 halex Exp $
+# $OpenBSD: snmpd,v 1.3 2016/02/02 17:51:11 sthen Exp $
 
 daemon="/usr/sbin/snmpd"
 
 . /etc/rc.d/rc.subr
 
-pexp="snmpd: parent.*"
 rc_reload=NO
 
 rc_cmd $1
diff --git a/etc/rc.d/vmd b/etc/rc.d/vmd
index a86631a4c06..4d0b0a0242a 100644
--- a/etc/rc.d/vmd
+++ b/etc/rc.d/vmd
@@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: vmd,v 1.3 2015/12/19 13:45:12 ajacoutot Exp $
+# $OpenBSD: vmd,v 1.4 2016/02/02 17:51:11 sthen Exp $
 
 daemon="/usr/sbin/vmd"
 
 . /etc/rc.d/rc.subr
 
-pexp="vmd: parent.*"
-
 # child will not return a config parsing error to the parent
 rc_pre() {
 	${daemon} -n ${daemon_flags}
diff --git a/usr.sbin/bgpd/bgpd.c b/usr.sbin/bgpd/bgpd.c
index a6270d976f5..8e0031e7f22 100644
--- a/usr.sbin/bgpd/bgpd.c
+++ b/usr.sbin/bgpd/bgpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bgpd.c,v 1.183 2015/11/27 21:41:30 claudio Exp $ */
+/*	$OpenBSD: bgpd.c,v 1.184 2016/02/02 17:51:11 sthen Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -214,8 +214,6 @@ main(int argc, char *argv[])
 	io_pid = start_child(PROC_SE, saved_argv0, pipe_m2s[1], debug,
 	    cmd_opts & BGPD_OPT_VERBOSE);
 
-	setproctitle("parent");
-
 	signal(SIGTERM, sighdlr);
 	signal(SIGINT, sighdlr);
 	signal(SIGCHLD, sighdlr);
diff --git a/usr.sbin/dvmrpd/dvmrpd.c b/usr.sbin/dvmrpd/dvmrpd.c
index b3852e234b5..2c173001453 100644
--- a/usr.sbin/dvmrpd/dvmrpd.c
+++ b/usr.sbin/dvmrpd/dvmrpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dvmrpd.c,v 1.20 2015/12/05 13:11:00 claudio Exp $ */
+/*	$OpenBSD: dvmrpd.c,v 1.21 2016/02/02 17:51:11 sthen Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -231,9 +231,6 @@ main(int argc, char *argv[])
 	if (mrt_init(conf->mroute_socket))
 		fatal("multicast routing not enabled in kernel");
 
-	/* show who we are */
-	setproctitle("parent");
-
 	event_init();
 
 	/* setup signal handler */
diff --git a/usr.sbin/eigrpd/eigrpd.c b/usr.sbin/eigrpd/eigrpd.c
index 62f8ffd5871..ddbfb593a2c 100644
--- a/usr.sbin/eigrpd/eigrpd.c
+++ b/usr.sbin/eigrpd/eigrpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eigrpd.c,v 1.4 2015/12/05 15:49:01 claudio Exp $ */
+/*	$OpenBSD: eigrpd.c,v 1.5 2016/02/02 17:51:11 sthen Exp $ */
 
 /*
  * Copyright (c) 2015 Renato Westphal <renato@openbsd.org>
@@ -227,9 +227,6 @@ main(int argc, char *argv[])
 	eigrpe_pid = eigrpe(eigrpd_conf, pipe_parent2eigrpe, pipe_eigrpe2rde,
 	    pipe_parent2rde);
 
-	/* show who we are */
-	setproctitle("parent");
-
 	event_init();
 
 	/* setup signal handler */
diff --git a/usr.sbin/hostapd/privsep.c b/usr.sbin/hostapd/privsep.c
index c4675587e71..f115f7c7190 100644
--- a/usr.sbin/hostapd/privsep.c
+++ b/usr.sbin/hostapd/privsep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: privsep.c,v 1.24 2015/01/16 06:40:17 deraadt Exp $	*/
+/*	$OpenBSD: privsep.c,v 1.25 2016/02/02 17:51:11 sthen Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
@@ -170,8 +170,6 @@ hostapd_priv_init(struct hostapd_config *cfg)
 
 	hostapd_roaming_init(cfg);
 
-	setproctitle("[priv]");
-
 	/* Start a new event listener */
 	event_set(&cfg->c_priv_ev, socks[0], EV_READ, hostapd_priv, cfg);
 	if (event_add(&cfg->c_priv_ev, NULL) == -1)
diff --git a/usr.sbin/httpd/httpd.c b/usr.sbin/httpd/httpd.c
index 0dc9409f6d7..797133d972b 100644
--- a/usr.sbin/httpd/httpd.c
+++ b/usr.sbin/httpd/httpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: httpd.c,v 1.53 2015/12/03 11:46:25 reyk Exp $	*/
+/*	$OpenBSD: httpd.c,v 1.54 2016/02/02 17:51:11 sthen Exp $	*/
 
 /*
  * Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org>
@@ -247,8 +247,6 @@ main(int argc, char *argv[])
 	}
 
 	proc_init(ps, procs, nitems(procs));
-
-	setproctitle("parent");
 	log_procinit("parent");
 
 	if (pledge("stdio rpath wpath cpath inet dns proc ioctl sendfd",
diff --git a/usr.sbin/ldpd/ldpd.c b/usr.sbin/ldpd/ldpd.c
index c25910363af..8e8396e1ddc 100644
--- a/usr.sbin/ldpd/ldpd.c
+++ b/usr.sbin/ldpd/ldpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldpd.c,v 1.27 2015/12/05 13:11:48 claudio Exp $ */
+/*	$OpenBSD: ldpd.c,v 1.28 2016/02/02 17:51:11 sthen Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -206,9 +206,6 @@ main(int argc, char *argv[])
 	ldpe_pid = ldpe(ldpd_conf, pipe_parent2ldpe, pipe_ldpe2lde,
 	    pipe_parent2lde);
 
-	/* show who we are */
-	setproctitle("parent");
-
 	event_init();
 
 	/* setup signal handler */
diff --git a/usr.sbin/npppd/npppd/privsep.c b/usr.sbin/npppd/npppd/privsep.c
index 91c769d4fb0..765dead5017 100644
--- a/usr.sbin/npppd/npppd/privsep.c
+++ b/usr.sbin/npppd/npppd/privsep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: privsep.c,v 1.20 2015/12/05 18:43:36 mmcc Exp $ */
+/*	$OpenBSD: privsep.c,v 1.21 2016/02/02 17:51:11 sthen Exp $ */
 
 /*
  * Copyright (c) 2010 Yasuoka Masahiko <yasuoka@openbsd.org>
@@ -188,7 +188,6 @@ privsep_init(void)
 		_exit(0);
 		/* NOTREACHED */
 	}
-	setproctitle("main");
 	close(pairsock[0]);
 	privsep_sock = pairsock[1];
 	privsep_pid = pid;
diff --git a/usr.sbin/ntpd/ntpd.c b/usr.sbin/ntpd/ntpd.c
index fe79f6d9bc6..914027d8446 100644
--- a/usr.sbin/ntpd/ntpd.c
+++ b/usr.sbin/ntpd/ntpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntpd.c,v 1.105 2016/01/27 21:48:34 reyk Exp $ */
+/*	$OpenBSD: ntpd.c,v 1.106 2016/02/02 17:51:11 sthen Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -210,7 +210,6 @@ main(int argc, char *argv[])
 	/* fork child process */
 	chld_pid = ntp_main(pipe_chld, fd_ctl, &lconf, pw);
 
-	setproctitle("[priv]");
 	log_procinit("[priv]");
 	readfreq();
 
diff --git a/usr.sbin/ospf6d/ospf6d.c b/usr.sbin/ospf6d/ospf6d.c
index d833792f8e0..b3da18b1932 100644
--- a/usr.sbin/ospf6d/ospf6d.c
+++ b/usr.sbin/ospf6d/ospf6d.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ospf6d.c,v 1.29 2015/12/05 13:12:41 claudio Exp $ */
+/*	$OpenBSD: ospf6d.c,v 1.30 2016/02/02 17:51:11 sthen Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -240,9 +240,6 @@ main(int argc, char *argv[])
 	ospfe_pid = ospfe(ospfd_conf, pipe_parent2ospfe, pipe_ospfe2rde,
 	    pipe_parent2rde);
 
-	/* show who we are */
-	setproctitle("parent");
-
 	event_init();
 
 	/* setup signal handler */
diff --git a/usr.sbin/ospfd/ospfd.c b/usr.sbin/ospfd/ospfd.c
index 358a8e6ac58..932efb726bd 100644
--- a/usr.sbin/ospfd/ospfd.c
+++ b/usr.sbin/ospfd/ospfd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ospfd.c,v 1.88 2015/12/05 12:20:13 claudio Exp $ */
+/*	$OpenBSD: ospfd.c,v 1.89 2016/02/02 17:51:11 sthen Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -243,9 +243,6 @@ main(int argc, char *argv[])
 	ospfe_pid = ospfe(ospfd_conf, pipe_parent2ospfe, pipe_ospfe2rde,
 	    pipe_parent2rde);
 
-	/* show who we are */
-	setproctitle("parent");
-
 	event_init();
 
 	/* setup signal handler */
diff --git a/usr.sbin/relayd/relayd.c b/usr.sbin/relayd/relayd.c
index 53cab773edb..8fdedcbfbfa 100644
--- a/usr.sbin/relayd/relayd.c
+++ b/usr.sbin/relayd/relayd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relayd.c,v 1.152 2015/12/30 16:00:57 benno Exp $	*/
+/*	$OpenBSD: relayd.c,v 1.153 2016/02/02 17:51:11 sthen Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -244,8 +244,6 @@ main(int argc, char *argv[])
 	ps->ps_ninstances = env->sc_prefork_relay;
 
 	proc_init(ps, procs, nitems(procs));
-
-	setproctitle("parent");
 	log_procinit("parent");
 
 	event_init();
diff --git a/usr.sbin/ripd/ripd.c b/usr.sbin/ripd/ripd.c
index a3d69366359..da0d8f3f702 100644
--- a/usr.sbin/ripd/ripd.c
+++ b/usr.sbin/ripd/ripd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ripd.c,v 1.26 2015/12/05 13:13:47 claudio Exp $ */
+/*	$OpenBSD: ripd.c,v 1.27 2016/02/02 17:51:11 sthen Exp $ */
 
 /*
  * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
@@ -221,9 +221,6 @@ main(int argc, char *argv[])
 	rde_pid = rde(conf, pipe_parent2rde, pipe_ripe2rde, pipe_parent2ripe);
 	ripe_pid = ripe(conf, pipe_parent2ripe, pipe_ripe2rde, pipe_parent2rde);
 
-	/* show who we are */
-	setproctitle("parent");
-
 	event_init();
 
 	/* setup signal handler */
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c
index e9c6f43c78b..fba23f1fd0b 100644
--- a/usr.sbin/smtpd/smtpd.c
+++ b/usr.sbin/smtpd/smtpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpd.c,v 1.272 2016/01/27 12:46:03 sunil Exp $	*/
+/*	$OpenBSD: smtpd.c,v 1.273 2016/02/02 17:51:11 sthen Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -667,8 +667,6 @@ main(int argc, char *argv[])
 
 	fork_peers();
 
-	config_process(PROC_PARENT);
-
 	imsg_callback = parent_imsg;
 	event_init();
 
diff --git a/usr.sbin/snmpd/snmpd.c b/usr.sbin/snmpd/snmpd.c
index 9f9eda56bf5..fa9018df10f 100644
--- a/usr.sbin/snmpd/snmpd.c
+++ b/usr.sbin/snmpd/snmpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: snmpd.c,v 1.31 2015/11/23 19:31:52 reyk Exp $	*/
+/*	$OpenBSD: snmpd.c,v 1.32 2016/02/02 17:51:11 sthen Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008, 2012 Reyk Floeter <reyk@openbsd.org>
@@ -217,9 +217,7 @@ main(int argc, char *argv[])
 	ps->ps_ninstances = 1;
 	proc_init(ps, procs, nitems(procs));
 
-	setproctitle("parent");
 	log_procinit("parent");
-
 	log_info("startup");
 
 	event_init();
diff --git a/usr.sbin/vmd/vmd.c b/usr.sbin/vmd/vmd.c
index a852fa74e6c..3504b18d105 100644
--- a/usr.sbin/vmd/vmd.c
+++ b/usr.sbin/vmd/vmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmd.c,v 1.25 2015/12/11 10:16:53 reyk Exp $	*/
+/*	$OpenBSD: vmd.c,v 1.26 2016/02/02 17:51:11 sthen Exp $	*/
 
 /*
  * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -369,7 +369,6 @@ main(int argc, char **argv)
 	if (!env->vmd_debug && daemon(0, 0) == -1)
 		fatal("can't daemonize");
 
-	setproctitle("parent");
 	log_procinit("parent");
 
 	ps->ps_ninstances = 1;