From: deraadt <deraadt@openbsd.org>
Date: Sun, 17 Jul 2022 03:17:37 +0000 (+0000)
Subject: /var/run/ypbind.lock doesn't need to be forcefully removed
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1b66252f4d1a13669de58136b6a367d18ea50631;p=openbsd

/var/run/ypbind.lock doesn't need to be forcefully removed
ok aja
---

diff --git a/etc/rc b/etc/rc
index ca1743b39a3..7d8021cc8d8 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.560 2022/07/11 18:19:47 tobhe Exp $
+#	$OpenBSD: rc,v 1.561 2022/07/17 03:17:37 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
@@ -499,7 +499,6 @@ fi
 
 echo -n 'starting RPC daemons:'
 start_daemon portmap ypldap
-rm -f /var/run/ypbind.lock
 if [[ -n $(domainname) ]]; then
 	start_daemon ypserv ypbind
 fi
diff --git a/etc/rc.d/ypbind b/etc/rc.d/ypbind
index d28b8d79d5c..4ed2e36ec86 100644
--- a/etc/rc.d/ypbind
+++ b/etc/rc.d/ypbind
@@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: ypbind,v 1.9 2018/01/11 21:09:26 rpe Exp $
+# $OpenBSD: ypbind,v 1.10 2022/07/17 03:17:37 deraadt Exp $
 
 daemon="/usr/sbin/ypbind"
 
@@ -13,8 +13,4 @@ rc_pre() {
 	[[ -n $(domainname) ]]
 }
 
-rc_post() {
-	rm -f /var/run/ypbind.lock
-}
-
 rc_cmd $1