From 8099edd27ba6dde73f8b848f03f3f23462d2265c Mon Sep 17 00:00:00 2001
From: Jan Zeleny <jzeleny@fedoraproject.org>
Date: Jun 09 2009 11:50:54 +0000
Subject: Added $SLAPD_URLS variable to init script and config file (#504504)


---

diff --git a/ldap.init b/ldap.init
index 289852d..b4929ff 100644
--- a/ldap.init
+++ b/ldap.init
@@ -30,6 +30,7 @@
 SLAPD_LDAP="yes"
 SLAPD_LDAPI="no"
 SLAPD_LDAPS="no"
+SLAPD_URLS=""
 SLAPD_SHUTDOWN_TIMEOUT=3
 # OPTIONS, SLAPD_OPTIONS and KTB5_KTNAME are not defined
 
@@ -166,9 +167,9 @@ function start() {
 	# Define a couple of local variables which we'll need. Maybe.
 	user=ldap
 	prog=`basename ${slapd}`
-	harg=""
+	harg="$SLAPD_URLS"
 	if test x$SLAPD_LDAP = xyes ; then
-	    harg="ldap:///"
+	    harg="$harg ldap:///"
 	fi
 	if test x$SLAPD_LDAPS = xyes ; then
 	    harg="$harg ldaps:///"
diff --git a/ldap.sysconfig b/ldap.sysconfig
index 7b11b83..6931936 100644
--- a/ldap.sysconfig
+++ b/ldap.sysconfig
@@ -19,5 +19,13 @@
 #   yes/no, default: no
 #SLAPD_LDAPS=no
 
+# Run slapd with -h "... $SLAPD_URLS ..."
+# This option could be used instead of previous three ones, but:
+# - it doesn't overwrite settings of $SLAPD_LDAP, $SLAPD_LDAPS and $SLAPD_LDAPI options
+# - it isn't overwritten by settings of $SLAPD_LDAP, $SLAPD_LDAPS and $SLAPD_LDAPI options
+# example: SLAPD_URLS="ldapi:///var/lib/ldap_root/ldapi ldapi:/// ldaps:///"
+# default: empty
+#SLAPD_URLS=""
+
 # Maximum allowed time to wait for slapd shutdown on 'service ldap stop' (in seconds)
 #SLAPD_SHUTDOWN_TIMEOUT=3
diff --git a/openldap.spec b/openldap.spec
index 3448946..25bcfc2 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -604,6 +604,9 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Tue Jun 09 2009 Jan Zeleny <jzeleny@redhat.com> 2.4.15-4
+- added $SLAPD_URLS variable to init script (#504504)
+
 * Thu Apr 09 2009 Jan Zeleny <jzeleny@redhat.com> 2.4.15-3
 - extended previous patch (#481310) to remove options cfMP
   from some client tools