5 files changed, 195 insertions, 0 deletions
diff --git a/net-nds/389-ds-base/files/389-ds-base-1.2.11-fix-mozldap.patch b/net-nds/389-ds-base/files/389-ds-base-1.2.11-fix-mozldap.patch
new file mode 100644
index 000000000000..7c99085e3d3b
--- /dev/null
+++ b/net-nds/389-ds-base/files/389-ds-base-1.2.11-fix-mozldap.patch
@@ -0,0 +1,28 @@
+commit f5bd0ed47523b39aedb6bcc1f9c0754371159a77
+Author: Rich Megginson <rmeggins at redhat.com>
+Date:   Fri Sep 14 09:20:18 2012 -0600
+
+    Ticket #461 - fix build problem with mozldap c sdk
+    
+    https://fedorahosted.org/389/ticket/461
+    Reviewed by: rmeggins
+    Fixed by: cgrzemba
+    Branch: master
+    Fix Description: mozldap does not define LDAP_MOD_OP so define it
+    Platforms tested: RHEL6 x86_64
+    Flag Day: no
+    Doc impact: no
+
+diff --git a/ldap/servers/slapd/pw.c b/ldap/servers/slapd/pw.c
+index bfd48b1..4736e82 100644
+--- a/ldap/servers/slapd/pw.c
++++ b/ldap/servers/slapd/pw.c
+@@ -61,6 +61,9 @@
+ #if defined( _WIN32 )
+ #undef LDAPDebug
+ #endif	/*  _WIN32 */
++#if defined( USE_MOZLDAP )
++#define LDAP_MOD_OP (0x0007)
++#endif /* USE_MOZLDAP */
+ 
+ #include "slap.h"
diff --git a/net-nds/389-ds-base/files/389-ds-snmp.initd b/net-nds/389-ds-base/files/389-ds-snmp.initd
new file mode 100644
index 000000000000..0e56f8b9cff8
--- /dev/null
+++ b/net-nds/389-ds-base/files/389-ds-snmp.initd
@@ -0,0 +1,45 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+PIDFILE="/var/run/ldap-agent.pid"
+CONFIGFILE="/etc/dirsrv/config/ldap-agent.conf"
+
+# instance support in progress
+
+depend() {
+	need net
+	use logger snmpd
+}
+
+start() {
+	ebegin "Starting 389 Directory Server ldap-snmp agent"
+	start-stop-daemon --start --quiet -b \
+		--pidfile ${PIDFILE} --exec /usr/sbin/ldap-agent -- ${CONFIGFILE}
+	eend ${?}
+	if [ "${?}" != "0" ]; then
+		local entries=/etc/dirsrv/slapd-*
+		if [ -n "${entries}" ]; then
+			ewarn "Please make sure that ${CONFIGFILE} contains at least"
+			ewarn "one of the following entries:"
+			for entry in ${entries}; do
+				entry=$(basename ${entry})
+				ewarn "server ${entry}"
+			done
+		fi
+	fi
+}
+
+stop() {
+	ebegin "Stopping 389 Directory Server ldap-snmp agent"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+	eend ${?}
+	
+}
+
+restart() {
+	svc_stop
+	sleep 2
+	svc_start
+}
diff --git a/net-nds/389-ds-base/files/389-ds.initd b/net-nds/389-ds-base/files/389-ds.initd
new file mode 100644
index 000000000000..5afe506086c9
--- /dev/null
+++ b/net-nds/389-ds-base/files/389-ds.initd
@@ -0,0 +1,78 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DIRSRV_EXEC="/usr/sbin/ns-slapd"
+PID_DIRECTORY="/var/run/dirsrv"
+DIRSRV_CONF_DIR="/etc/dirsrv"
+DS_INSTANCES=${DIRSRV_CONF_DIR}/slapd-*
+F389DS_INSTANCES=""
+
+depend() {
+	need net logger
+	use dns
+	provide dirsvr ldap
+}
+
+checkconfig() {
+	if [ -z "${DS_INSTANCES}" ]; then
+		eerror "389 Directory Server has not been configured."
+		eend 1
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	for instance in ${DS_INSTANCES}; do
+		instance=$(basename ${instance})
+		# skip .removed instances, bug #338133
+		if [ "${instance%%.removed}" != "${instance}" ]; then
+			continue
+		fi
+		ebegin "Starting 389 Directory Server: instance ${instance}"
+		start-stop-daemon --start --quiet -m \
+			--pidfile ${PID_DIRECTORY}/${instance}.startpid \
+			--exec ${DIRSRV_EXEC} -- -D ${DIRSRV_CONF_DIR}/${instance} \
+			-i ${PID_DIRECTORY}/${instance}.pid \
+			-w ${PID_DIRECTORY}/${instance}.startpid
+		sts=${?}
+		eend ${sts}
+		if [ "${sts}" != "0" ]; then
+			return 1
+		fi
+	done
+}
+
+
+
+stop() {
+	checkconfig || return 1
+
+	for instance in ${DS_INSTANCES}; do
+		instance=$(basename ${instance})
+		ebegin "Stopping 389 Directory Server: instance ${instance}"
+		start-stop-daemon --stop --quiet \
+			--pidfile ${PID_DIRECTORY}/${instance}.pid \
+			--exec ${DIRSRV_EXEC}
+		eend ${?}
+	done
+}
+
+status() {
+	for instance in ${DS_INSTANCES}; do
+		instance=$(basename ${instance})
+		if [ -e ${PID_DIRECTORY}/${instance}.pid ]; then
+			pid=$(cat ${PID_DIRECTORY}/${instance}.pid)
+			if [ $(echo "$pid" | grep -c $pid) -ge 1 ]; then
+				einfo "389 Directory Server: instance ${instance} (pid $pid) running."
+			else
+				ewarn "389 Directory Server: instance ${instance} (pid $pid) NOT running."
+			fi
+		else
+			eerror "389 Directory Server: instance ${instance} is NOT running."
+		fi
+	done
+}
diff --git a/net-nds/389-ds-base/files/restart-dirsrv b/net-nds/389-ds-base/files/restart-dirsrv
new file mode 100644
index 000000000000..90654eca170a
--- /dev/null
+++ b/net-nds/389-ds-base/files/restart-dirsrv
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+# Script that restarts the ns-slapd server.
+# Exit status can be:
+#       0: Server restarted successfully
+#       1: Server could not be started
+#       2: Server started successfully (was not running)
+#       3: Server could not be stopped
+
+sleep_time=8
+/etc/init.d/389-ds status &> /dev/null
+running="${?}"
+
+rc-config stop 389-ds
+if [ "${?}" = "1" ]; then
+	sleep ${sleep_time}
+	exit 3
+fi
+rc-config start 389-ds
+if [ "${?}" = "1" ]; then
+	sleep ${sleep_time}
+	exit 1
+fi
+if [ "${running}" = "0" ]; then
+	sleep ${sleep_time}
+	exit 0
+else
+	sleep ${sleep_time}
+	exit 2
+fi
diff --git a/net-nds/389-ds-base/files/start-dirsrv b/net-nds/389-ds-base/files/start-dirsrv
new file mode 100644
index 000000000000..45c2a6c2c7d4
--- /dev/null
+++ b/net-nds/389-ds-base/files/start-dirsrv
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# Script that starts the ns-slapd server.
+# Exit status can be:
+#       0: Server started successfully
+#       1: Server could not be started
+#       2: Server already running
+
+rc-config stop 389-ds
+rc-config start 389-ds
+rc="${?}"
+# give the daemon a chance to start
+sleep 8
+exit "${rc:-1}"