From: tedu <tedu@openbsd.org>
Date: Thu, 24 Apr 2014 15:05:10 +0000 (+0000)
Subject: rm rwhod tentacles
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f6e3d988b7409b63e29f0ba8848ba363d7f3b86e;p=openbsd

rm rwhod tentacles
---

diff --git a/etc/Makefile b/etc/Makefile
index 0fe0b33ae0d..c51e770362d 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.355 2014/04/23 09:56:56 ajacoutot Exp $
+#	$OpenBSD: Makefile,v 1.356 2014/04/24 15:05:10 tedu Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -52,7 +52,7 @@ RCDAEMONS=	amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd \
 		ftpd ftpproxy hostapd hotplugd identd ifstated iked \
 		inetd isakmpd ldapd npppd ldattach ldpd lpd mopd mrouted \
 		named nginx nsd ntpd ospfd ospf6d portmap pflogd rarpd rbootd \
-		relayd ripd route6d rtadvd rtsold rwhod sasyncd sendmail \
+		relayd ripd route6d rtadvd rtsold sasyncd sendmail \
 		sensorsd slowcgi smtpd snmpd spamd sshd syslogd watchdogd \
 		wsmoused xdm ypbind ypldap yppasswdd ypserv nfsd mountd lockd \
 		statd spamlogd sndiod tftpd tftpproxy ldomd unbound
diff --git a/etc/daily b/etc/daily
index ca6cd591431..15f272b6012 100644
--- a/etc/daily
+++ b/etc/daily
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: daily,v 1.78 2013/12/12 22:02:43 brad Exp $
+#	$OpenBSD: daily,v 1.79 2014/04/24 15:05:10 tedu Exp $
 #	From: @(#)daily	8.2 (Berkeley) 1/25/94
 #
 # For local additions, create the file /etc/daily.local.
@@ -75,11 +75,6 @@ fi
 #	    >/dev/null 2>&1; }
 #fi
 
-if [ -d /var/rwho -a ! -L /var/rwho ] ; then
-	cd /var/rwho && {
-	find . ! -name . -mtime +7 -execdir rm -f -- {} \; ; }
-fi
-
 next_part "Purging accounting records:"
 if [ -f /var/account/acct ]; then
 	mv -f /var/account/acct.2 /var/account/acct.3
diff --git a/etc/rc b/etc/rc
index 16a9cf4be42..6f13b370a14 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.425 2014/04/23 09:56:56 ajacoutot Exp $
+#	$OpenBSD: rc,v 1.426 2014/04/24 15:05:10 tedu Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -499,7 +499,7 @@ if ifconfig lo0 inet6 >/dev/null 2>&1; then
 	fi
 fi
 
-start_daemon hostapd rwhod lpd sendmail smtpd slowcgi nginx ftpd
+start_daemon hostapd lpd sendmail smtpd slowcgi nginx ftpd
 start_daemon ftpproxy tftpd tftpproxy identd inetd rarpd bootparamd
 start_daemon rbootd mopd spamd spamlogd sndiod
 echo '.'
diff --git a/etc/rc.conf b/etc/rc.conf
index e4c828d8016..4a40d55bf57 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.188 2014/04/23 09:56:56 ajacoutot Exp $
+#	$OpenBSD: rc.conf,v 1.189 2014/04/24 15:05:10 tedu Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -59,7 +59,6 @@ sndiod_flags=""		# for normal use: ""
 ldapd_flags=NO		# for normal use: ""
 npppd_flags=NO		# for normal use: ""
 inetd_flags=NO		# for normal use: ""
-rwhod_flags=NO		# for normal use: ""
 portmap_flags=NO	# for normal use: ""
 			# Note: inetd(8) rpc services need portmap too
 amd_flags=NO		# for normal use: "" and see amd_master below
diff --git a/etc/rc.d/rwhod b/etc/rc.d/rwhod
deleted file mode 100644
index b6f246c9bb8..00000000000
--- a/etc/rc.d/rwhod
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: rwhod,v 1.1 2011/07/06 18:55:36 robert Exp $
-
-daemon="/usr/sbin/rwhod"
-
-. /etc/rc.d/rc.subr
-
-rc_cmd $1