diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-11-27 03:53:29 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-11-27 03:53:29 +0000 |
| commit | f1f3675c411338fa5f1340961533a89eb935e3a5 (patch) | |
| tree | 1aaf8d7dc34bcf422706aa2d5678103c816cefc1 | |
| parent | 9495fd6565758e8d98acf4123244bc52859b09f4 (diff) | |
yppasswd went away
| -rw-r--r-- | etc/Makefile | 4 | ||||
| -rw-r--r-- | etc/rc | 4 | ||||
| -rw-r--r-- | etc/rc.conf | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/etc/Makefile b/etc/Makefile index 2a49f911755..5971b999239 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.413 2015/11/10 04:33:02 jsg Exp $ +# $OpenBSD: Makefile,v 1.414 2015/11/27 03:53:28 deraadt Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -59,7 +59,7 @@ RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd eigrpd ftpd \ pflogd portmap radiusd rarpd rbootd relayd ripd route6d \ rtadvd sasyncd sensorsd slowcgi smtpd sndiod snmpd spamd \ spamlogd sshd statd syslogd tftpd tftpproxy unbound \ - watchdogd wsmoused xdm ypbind ypldap yppasswdd ypserv + watchdogd wsmoused xdm ypbind ypldap ypserv MISETS= base${OSrev}.tgz comp${OSrev}.tgz man${OSrev}.tgz game${OSrev}.tgz @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.469 2015/11/10 20:34:58 tim Exp $ +# $OpenBSD: rc,v 1.470 2015/11/27 03:53:28 deraadt 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 @@ -365,7 +365,7 @@ echo -n 'starting RPC daemons:' start_daemon portmap ypldap rm -f /var/run/ypbind.lock if [[ -n $(domainname) ]]; then - start_daemon ypserv ypbind yppasswdd + start_daemon ypserv ypbind fi start_daemon mountd nfsd lockd statd amd echo '.' diff --git a/etc/rc.conf b/etc/rc.conf index b85ab43a361..ed7a00bc42d 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,4 +1,4 @@ -# $OpenBSD: rc.conf,v 1.206 2015/10/03 18:57:11 renato Exp $ +# $OpenBSD: rc.conf,v 1.207 2015/11/27 03:53:28 deraadt Exp $ # DO NOT EDIT THIS FILE!! # @@ -82,7 +82,6 @@ portmap_flags=NO # note: inetd(8) rpc services need portmap too statd_flags=NO ypbind_flags=NO ypldap_flags=NO -yppasswdd_flags=NO # "-d /etc/yp" if passwd files are in /etc/yp ypserv_flags=NO # set the following to "YES" to turn them on |