From: claudio <claudio@openbsd.org>
Date: Tue, 28 Jun 2022 18:46:00 +0000 (+0000)
Subject: Hook up bgplgd. Uses _bgplgd user with id 71:71 add a rc.d script and
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c2691defefcddbc45bf71cb193b9fd16242d0a9e;p=openbsd

Hook up bgplgd. Uses _bgplgd user with id 71:71 add a rc.d script and
all the other rc plumbing.
OK deraadt@
---

diff --git a/etc/Makefile b/etc/Makefile
index d2fe2ef148c..fe7d53a9d2b 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.485 2021/11/11 09:38:14 claudio Exp $
+#	$OpenBSD: Makefile,v 1.486 2022/06/28 18:46:00 claudio Exp $
 
 .include <bsd.own.mk>
 
@@ -58,10 +58,10 @@ EXAMPLES_600=bgpd.conf doas.conf dvmrpd.conf eigrpd.conf hostapd.conf \
 	snmpd.conf vm.conf ypldap.conf
 
 # -r-xr-xr-x
-RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcpleased dhcrelay dhcrelay6 \
-	dvmrpd eigrpd ftpd ftpproxy ftpproxy6 hostapd hotplugd httpd identd \
-	ifstated iked inetd isakmpd iscsid ldapd ldattach ldomd ldpd lockd \
-	lpd mopd mountd mrouted nfsd npppd nsd ntpd ospf6d ospfd \
+RCDAEMONS=amd apmd bgpd bgplgd bootparamd cron dhcpd dhcpleased dhcrelay \
+	dhcrelay6 dvmrpd eigrpd ftpd ftpproxy ftpproxy6 hostapd hotplugd \
+	httpd identd ifstated iked inetd isakmpd iscsid ldapd ldattach ldomd \
+	ldpd lockd lpd mopd mountd mrouted nfsd npppd nsd ntpd ospf6d ospfd \
 	pflogd portmap rad radiusd rarpd rbootd relayd resolvd ripd route6d \
 	sasyncd sensorsd slowcgi slaacd smtpd sndiod snmpd spamd \
 	spamlogd sshd statd syslogd tftpd tftpproxy unbound \
diff --git a/etc/group b/etc/group
index 2fd963b7778..6280583f48b 100644
--- a/etc/group
+++ b/etc/group
@@ -39,6 +39,7 @@ www:*:67:
 _isakmpd:*:68:
 network:*:69:
 _rpki-client:*:70:
+_bgplgd:*:71
 authpf:*:72:
 _syslogd:*:73:
 _pflogd:*:74:
diff --git a/etc/mail/aliases b/etc/mail/aliases
index 85c2c73549d..db8821d33dc 100644
--- a/etc/mail/aliases
+++ b/etc/mail/aliases
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: aliases,v 1.69 2022/04/21 20:48:50 danj Exp $
+#	$OpenBSD: aliases,v 1.70 2022/06/28 18:46:01 claudio Exp $
 #
 #  Aliases in this file will NOT be expanded in the header from
 #  Mail, but WILL be visible over networks or from /usr/libexec/mail.local.
@@ -21,6 +21,7 @@ www:	root
 
 # Redirections for pseudo accounts that should not receive mail
 _bgpd: /dev/null
+_bgplgd: /dev/null
 _dhcp: /dev/null
 _dpb: /dev/null
 _dvmrpd: /dev/null
diff --git a/etc/master.passwd b/etc/master.passwd
index a997028ecb4..d31ef57706f 100644
--- a/etc/master.passwd
+++ b/etc/master.passwd
@@ -23,6 +23,7 @@ _spamd:*:62:62::0:0:Spam Daemon:/var/empty:/sbin/nologin
 www:*:67:67::0:0:HTTP Server:/var/www:/sbin/nologin
 _isakmpd:*:68:68::0:0:isakmpd privsep:/var/empty:/sbin/nologin
 _rpki-client:*:70:70::0:0:rpki-client user:/nonexistent:/sbin/nologin
+_bgplgd:*:71:71::0:0:bgplgd Daemon:/nonexistent:/sbin/nologin
 _syslogd:*:73:73::0:0:Syslog Daemon:/var/empty:/sbin/nologin
 _pflogd:*:74:74::0:0:pflogd privsep:/var/empty:/sbin/nologin
 _bgpd:*:75:75::0:0:BGP Daemon:/var/empty:/sbin/nologin
diff --git a/etc/rc b/etc/rc
index ac57a67676c..580a6bb40e0 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.558 2022/06/26 09:36:13 florian Exp $
+#	$OpenBSD: rc,v 1.559 2022/06/28 18:46:01 claudio Exp $
 
 # System startup script run by init on autoboot or after single-user.
 # Output and error are redirected to console by init, and the console is the
@@ -590,7 +590,7 @@ run_upgrade_script sysmerge
 echo -n 'starting network daemons:'
 start_daemon ldomd sshd snmpd ldpd ripd ospfd ospf6d bgpd ifstated
 start_daemon relayd dhcpd dhcrelay mrouted dvmrpd radiusd eigrpd route6d
-start_daemon rad hostapd lpd smtpd slowcgi httpd ftpd
+start_daemon rad hostapd lpd smtpd slowcgi bgplgd httpd ftpd
 start_daemon ftpproxy ftpproxy6 tftpd tftpproxy identd inetd rarpd bootparamd
 start_daemon rbootd mopd vmd spamd spamlogd sndiod
 echo '.'
diff --git a/etc/rc.conf b/etc/rc.conf
index c2ea765e1a0..30f9c0d8bc1 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.conf,v 1.225 2021/11/11 09:38:14 claudio Exp $
+#	$OpenBSD: rc.conf,v 1.226 2022/06/28 18:46:01 claudio Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -15,6 +15,7 @@
 # Otherwise, these variables override the default flags.
 apmd_flags=NO
 bgpd_flags=NO
+bgplgd_flags=NO
 bootparamd_flags=NO
 cron_flags=
 dhcpd_flags=NO
diff --git a/etc/rc.d/bgplgd b/etc/rc.d/bgplgd
new file mode 100644
index 00000000000..2b0cf505016
--- /dev/null
+++ b/etc/rc.d/bgplgd
@@ -0,0 +1,11 @@
+#!/bin/ksh
+#
+# $OpenBSD: bgplgd,v 1.1 2022/06/28 18:46:01 claudio Exp $
+
+daemon="/usr/sbin/bgplgd"
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+
+rc_cmd $1