Browse Source

Add switchd

OK deraadt@
OPENBSD_6_1
reyk 8 years ago
parent
commit
9e0f589208
7 changed files with 25 additions and 7 deletions
  1. +2
    -2
      src/etc/Makefile
  2. +2
    -1
      src/etc/changelist
  3. +2
    -1
      src/etc/mail/aliases
  4. +1
    -0
      src/etc/master.passwd
  5. +2
    -2
      src/etc/rc
  6. +2
    -1
      src/etc/rc.conf
  7. +14
    -0
      src/etc/rc.d/switchd

+ 2
- 2
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.439 2016/10/06 18:56:17 natano Exp $
# $OpenBSD: Makefile,v 1.440 2016/10/06 20:20:41 reyk Exp $
TZDIR= /usr/share/zoneinfo TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain LOCALTIME= Canada/Mountain
@ -54,7 +54,7 @@ RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd eigrpd ftpd \
lpd mopd mountd mrouted nfsd npppd nsd ntpd ospf6d ospfd \ lpd mopd mountd mrouted nfsd npppd nsd ntpd ospf6d ospfd \
pflogd portmap radiusd rarpd rbootd rebound relayd ripd route6d \ pflogd portmap radiusd rarpd rbootd rebound relayd ripd route6d \
rtadvd sasyncd sensorsd slowcgi smtpd sndiod snmpd spamd \ rtadvd sasyncd sensorsd slowcgi smtpd sndiod snmpd spamd \
spamlogd sshd statd syslogd tftpd tftpproxy unbound \
spamlogd sshd statd switchd syslogd tftpd tftpproxy unbound \
vmd watchdogd wsmoused xdm ypbind ypldap ypserv vmd watchdogd wsmoused xdm ypbind ypldap ypserv
MISETS= base${OSrev}.tgz comp${OSrev}.tgz man${OSrev}.tgz game${OSrev}.tgz MISETS= base${OSrev}.tgz comp${OSrev}.tgz man${OSrev}.tgz game${OSrev}.tgz


+ 2
- 1
src/etc/changelist View File

@ -1,4 +1,4 @@
# $OpenBSD: changelist,v 1.113 2016/09/26 06:51:23 ajacoutot Exp $
# $OpenBSD: changelist,v 1.114 2016/10/06 20:20:41 reyk Exp $
# #
# List of files which the security script backs up and checks # List of files which the security script backs up and checks
# for modifications. # for modifications.
@ -132,6 +132,7 @@
/etc/suid_profile /etc/suid_profile
/etc/sysctl.conf /etc/sysctl.conf
/etc/syslog.conf /etc/syslog.conf
/etc/switchd.conf
/etc/sysmerge.ignore /etc/sysmerge.ignore
/etc/ttys /etc/ttys
/etc/usermgmt.conf /etc/usermgmt.conf


+ 2
- 1
src/etc/mail/aliases View File

@ -1,5 +1,5 @@
# #
# $OpenBSD: aliases,v 1.59 2016/09/27 05:31:37 florian Exp $
# $OpenBSD: aliases,v 1.60 2016/10/06 20:20:41 reyk Exp $
# #
# Aliases in this file will NOT be expanded in the header from # 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. # Mail, but WILL be visible over networks or from /usr/libexec/mail.local.
@ -63,6 +63,7 @@ _smtpq: /dev/null
_sndio: /dev/null _sndio: /dev/null
_snmpd: /dev/null _snmpd: /dev/null
_spamd: /dev/null _spamd: /dev/null
_switchd: /dev/null
_syslogd: /dev/null _syslogd: /dev/null
_tcpdump: /dev/null _tcpdump: /dev/null
_traceroute: /dev/null _traceroute: /dev/null


+ 1
- 0
src/etc/master.passwd View File

@ -58,4 +58,5 @@ _vmd:*:107:107::0:0:VM Daemon:/var/empty:/sbin/nologin
_tftp_proxy:*:108:108::0:0:tftp proxy daemon:/nonexistent:/sbin/nologin _tftp_proxy:*:108:108::0:0:tftp proxy daemon:/nonexistent:/sbin/nologin
_ftp_proxy:*:109:109::0:0:ftp proxy daemon:/nonexistent:/sbin/nologin _ftp_proxy:*:109:109::0:0:ftp proxy daemon:/nonexistent:/sbin/nologin
_sndiop:*:110:110::0:0:sndio privileged user:/var/empty:/sbin/nologin _sndiop:*:110:110::0:0:sndio privileged user:/var/empty:/sbin/nologin
_switchd:*:111:111::0:0:Switch Daemon:/var/empty:/sbin/nologin
nobody:*:32767:32767::0:0:Unprivileged user:/nonexistent:/sbin/nologin nobody:*:32767:32767::0:0:Unprivileged user:/nonexistent:/sbin/nologin

+ 2
- 2
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.488 2016/10/06 19:32:23 reyk Exp $
# $OpenBSD: rc,v 1.489 2016/10/06 20:20:41 reyk Exp $
# System startup script run by init on autoboot or after single-user. # 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 # Output and error are redirected to console by init, and the console is the
@ -527,7 +527,7 @@ echo 'preserving editor files.'; /usr/libexec/vi.recover
run_upgrade_script sysmerge run_upgrade_script sysmerge
echo -n 'starting network daemons:' echo -n 'starting network daemons:'
start_daemon ldomd sshd snmpd ldpd ripd ospfd ospf6d bgpd ifstated
start_daemon ldomd sshd switchd snmpd ldpd ripd ospfd ospf6d bgpd ifstated
start_daemon relayd dhcpd dhcrelay mrouted dvmrpd radiusd eigrpd start_daemon relayd dhcpd dhcrelay mrouted dvmrpd radiusd eigrpd
if ifconfig lo0 inet6 >/dev/null 2>&1; then if ifconfig lo0 inet6 >/dev/null 2>&1; then


+ 2
- 1
src/etc/rc.conf View File

@ -1,4 +1,4 @@
# $OpenBSD: rc.conf,v 1.211 2015/12/06 13:51:41 rpe Exp $
# $OpenBSD: rc.conf,v 1.212 2016/10/06 20:20:41 reyk Exp $
# DO NOT EDIT THIS FILE!! # DO NOT EDIT THIS FILE!!
# #
@ -64,6 +64,7 @@ snmpd_flags=NO
spamd_flags=NO # also see spamd_black below spamd_flags=NO # also see spamd_black below
spamlogd_flags= # use eg. "-i interface" and see spamlogd(8) spamlogd_flags= # use eg. "-i interface" and see spamlogd(8)
sshd_flags= sshd_flags=
switchd_flags=NO
syslogd_flags= # add more flags, e.g. "-u -a /chroot/dev/log" syslogd_flags= # add more flags, e.g. "-u -a /chroot/dev/log"
tftpd_flags=NO tftpd_flags=NO
tftpproxy_flags=NO tftpproxy_flags=NO


+ 14
- 0
src/etc/rc.d/switchd View File

@ -0,0 +1,14 @@
#!/bin/sh
#
# $OpenBSD: switchd,v 1.1 2016/10/06 20:20:41 reyk Exp $
daemon="/usr/sbin/switchd"
. /etc/rc.d/rc.subr
# child will not return a config loading error to the parent
rc_pre() {
${daemon} -n ${daemon_flags}
}
rc_cmd $1

Loading…
Cancel
Save