Merge remote-tracking branch 'origin/master' into devel-11

5 files changed, 33 insertions, 2 deletions

diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf
index eeadae5..825e62e 100644
--- a/etc/defaults/periodic.conf
+++ b/etc/defaults/periodic.conf
@@ -135,9 +135,8 @@ daily_status_mail_rejects_logs=3			# How many logs to check
 daily_status_mail_rejects_shorten="NO"			# Shorten output
 
 # 480.leapfile-ntpd
-daily_ntpd_leapfile_enable="NO"				# Fetch NTP leapfile
+daily_ntpd_leapfile_enable="YES"			# Fetch NTP leapfile
 daily_ntpd_avoid_congestion="YES"			# Avoid congesting
-							# leapfile sources
 
 # 480.status-ntpd
 daily_status_ntpd_enable="NO"				# Check NTP status
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 8a5c07e..e8ce8a9 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -392,6 +392,8 @@ nis_ypxfrd_enable="NO"		# Run rpc.ypxfrd at boot time (or NO).
 nis_ypxfrd_flags=""		# Flags to rpc.ypxfrd (if enabled).
 nis_yppasswdd_enable="NO"	# Run rpc.yppasswdd at boot time (or NO).
 nis_yppasswdd_flags=""		# Flags to rpc.yppasswdd (if enabled).
+nis_ypldap_enable="NO"		# Run ypldap at boot time (or NO).
+nis_ypldap_flags=""		# Flags to ypldap (if enabled).
 
 ### SNMP daemon ###
 # Be sure to understand the security implications of running SNMP v1/v2
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 2a9282c..973c7c3 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -425,6 +425,8 @@
             ..
             uefisign
             ..
+            ypldap
+            ..
         ..
         firmware
         ..
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 2d195f1..9737adc 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -120,6 +120,7 @@ FILES=	DAEMON \
 	var \
 	watchdogd \
 	ypbind \
+	ypldap \
 	yppasswdd \
 	ypserv \
 	ypset \
diff --git a/etc/rc.d/ypldap b/etc/rc.d/ypldap
new file mode 100755
index 0000000..d5972dc
--- /dev/null
+++ b/etc/rc.d/ypldap
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: ypldap
+# REQUIRE: ypserv
+# BEFORE: DAEMON
+# KEYWORD: shutdown
+
+. /etc/rc.subr
+
+name="ypldap"
+rcvar="nis_ypldap_enable"
+
+load_rc_config $name
+
+command="/usr/sbin/${name}"
+command_args="${nis_ypldap_flags}"
+
+start_precmd="ypldap_precmd"
+
+ypldap_precmd()
+{
+	force_depend ypserv nis_server || return 1
+}
+run_rc_command "$1"