From b316432d57dff1ce90f9474904ed965c341952ae Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@cvs.openbsd.org>
Date: Fri, 17 Feb 2017 16:46:18 +0000
Subject: ypbind(8) is not started automatically at boot time by /etc/rc if
 domainname is set and the directory var/yp/binding exists.

ok deraadt@
---
 usr.sbin/ypbind/ypbind.8 | 9 ++-------
 usr.sbin/ypbind/ypbind.c | 5 +----
 2 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'usr.sbin/ypbind')

diff --git a/usr.sbin/ypbind/ypbind.8 b/usr.sbin/ypbind/ypbind.8
index 467f36373d0..2af496605ce 100644
--- a/usr.sbin/ypbind/ypbind.8
+++ b/usr.sbin/ypbind/ypbind.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ypbind.8,v 1.24 2014/09/08 01:27:56 schwarze Exp $
+.\"	$OpenBSD: ypbind.8,v 1.25 2017/02/17 16:46:17 ajacoutot Exp $
 .\"	$NetBSD: ypbind.8,v 1.2 1996/02/28 01:21:00 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 8 2014 $
+.Dd $Mdocdate: February 17 2017 $
 .Dt YPBIND 8
 .Os
 .Sh NAME
@@ -107,11 +107,6 @@ is recommended.
 The file should contain a list of valid YP server hostnames,
 with one hostname per line.
 The comment character is #.
-.Pp
-If the directory
-.Pa /var/yp/binding
-exists, YP is started automatically at boot time by
-.Pa /etc/rc .
 .Sh FILES
 .Pa /var/yp/binding/DOMAINNAME.version
 - binding file for domainname
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index 518997409d2..34bb8f9a43a 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypbind.c,v 1.68 2016/07/08 19:32:26 millert Exp $ */
+/*	$OpenBSD: ypbind.c,v 1.69 2017/02/17 16:46:17 ajacoutot Exp $ */
 
 /*
  * Copyright (c) 1992, 1993, 1996, 1997, 1998 Theo de Raadt <deraadt@openbsd.org>
@@ -375,9 +375,6 @@ main(int argc, char *argv[])
 		}
 		closedir(dirp);
 	} else {
-		printf("Enabling yp client subsystem.\n");
-		printf("To disable: kill ypbind and remove %s\n",
-		    BINDINGDIR);
 		(void)mkdir(BINDINGDIR, 0755);
 	}
 
-- 
cgit v1.2.3