1 files changed, 75 insertions, 51 deletions
diff --git a/net/openldap20-server/files/slapd.sh b/net/openldap20-server/files/slapd.sh
index e7e385bbc625..8e25fb7d667f 100644
--- a/net/openldap20-server/files/slapd.sh
+++ b/net/openldap20-server/files/slapd.sh
@@ -1,59 +1,83 @@
 #!/bin/sh
 #
 # $FreeBSD$
+#
 
-slapd_program=%%PREFIX%%/libexec/slapd
-
-slapd_pidfile=%%LDAP_RUN_DIR%%/slapd.pid
-
-slapd_enable="YES"
-
-slapd_args=
+# PROVIDE: slapd
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD shutdown
 
+#
 # Add the following lines to /etc/rc.conf to enable slapd:
 #
 #slapd_enable="YES"
-#slapd_args='-h "ldapi://%2fvar%2frun%2fopenldap%2fldapi/ ldap://0.0.0.0/"'
-#
-# See sldap(8) for details
-#
-# Create a user 'ldap' and add '-u ldap -g ldap' to slapd_args
-# if you want to run slapd as a non-privileged user (recommended)
-#
-
-# Suck in the configuration variables.
-if [ -r /etc/defaults/rc.conf ]; then
-    . /etc/defaults/rc.conf
-    source_rc_confs
-elif [ -r /etc/rc.conf ]; then
-    . /etc/rc.conf
-fi
-
-case "$slapd_enable" in
-[Yy][Ee][Ss])
-    case "$1" in
-    start)
-        if [ -x ${slapd_program} ]; then
-            echo -n ' slapd'
-            eval ${slapd_program} ${slapd_args}
-        fi
-        ;;
-    stop)
-        if [ -f $slapd_pidfile ]; then
-            kill `cat $slapd_pidfile`
-            echo -n ' slapd'
-        else
-            echo ' slapd: not running'
-        fi
-        ;;
-    *)
-        echo "Usage: `basename $0` {start|stop}" >&2
-        exit 64
-        ;;
-    esac
-    ;;
-*)
-    ;;
-esac
-
-exit 0
+#slapd_flags='-h "ldapi://%2fvar%2frun%2fopenldap%2fldapi/ ldap://0.0.0.0/"'
+#slapd_sockets="/var/run/openldap/ldapi"
+#
+# See slapd(8) for more flags
+#
+# The `-u' and `-g' flags are automatically extracted from slapd_owner,
+# by default slapd runs under the non-privileged user id `ldap'. If you
+# want to run slapd as root, override this in /etc/rc.conf with
+#
+#slapd_owner=
+#
+
+. %%RC_SUBR%%
+
+name=slapd
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/libexec/slapd
+pidfile=%%LDAP_RUN_DIR%%/slapd.pid
+required_dirs=%%LDAP_RUN_DIR%%
+required_files=%%PREFIX%%/etc/openldap/slapd.conf
+
+start_precmd=start_precmd
+start_postcmd=start_postcmd
+
+start_precmd()
+{
+  if [ x"$slapd_owner" != x ]; then
+    chown "${slapd_owner}" "%%LDAP_RUN_DIR%%"
+    chown -RL "${slapd_owner}" "%%LOCALSTATEDIR%%/openldap-ldbm"
+    chown "${slapd_owner}" "%%PREFIX%%/etc/openldap/slapd.conf"
+
+    slapd_ownername=`expr //"$slapd_owner" : //'\([^:]*\)'`
+    slapd_groupname=`expr //"$slapd_owner" : //'.*:\([^:]*\)'`
+
+    if [ x"$slapd_ownername" != x ]; then
+      rc_flags="$rc_flags -u $slapd_ownername"
+    fi
+    if [ x"$slapd_groupname" != x ]; then
+      rc_flags="$rc_flags -g $slapd_groupname"
+    fi
+  fi
+}
+
+start_postcmd()
+{
+  for socket in ${slapd_sockets}; do
+    for seconds in 1 2 3 4 5; do
+      test -e ${socket} && break
+      sleep 1
+    done
+    if [ -S ${socket} ]; then
+      if [ x"$slapd_owner" != x ]; then
+        chown "${slapd_owner}" ${socket}
+      fi
+      chmod "${slapd_sockets_mode}" ${socket}
+    fi
+  done
+}
+
+slapd_enable="NO"
+slapd_flags=
+
+slapd_owner=ldap:ldap
+slapd_sockets=
+slapd_sockets_mode=666
+
+load_rc_config $name
+run_rc_command "$1"