From: W. Michael Petullo <mike@flyn.org>
Date: Fri, 23 Jan 2015 15:14:28 +0000 (-0500)
Subject: openldap: remove --without-tls and start SSL-protected server by default
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=01c785a75027f39f889b8175d36eaaed1d37c131;p=feed%2Fpackages.git

openldap: remove --without-tls and start SSL-protected server by default

Signed-off-by: W. Michael Petullo <mike@flyn.org>
---

diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile
index 5344080da8..dcc9d988a7 100644
--- a/libs/openldap/Makefile
+++ b/libs/openldap/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openldap
 PKG_VERSION:=2.4.39
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
@@ -97,7 +97,6 @@ CONFIGURE_ARGS += \
 	--with-yielding_select="yes" \
 	--without-cyrus-sasl \
 	--without-threads \
-	--without-tls \
 	--enable-null \
 	--disable-bdb \
 	--disable-hdb \
diff --git a/libs/openldap/files/ldap.init b/libs/openldap/files/ldap.init
index b30bbf1953..2209e76b48 100644
--- a/libs/openldap/files/ldap.init
+++ b/libs/openldap/files/ldap.init
@@ -7,7 +7,7 @@ SERVICE_USE_PID=1
 
 start() {
 	mkdir -m 0755 -p /var/openldap-data
-	service_start /usr/sbin/slapd
+	service_start /usr/sbin/slapd -h "ldap://localhost/ ldaps:///"
 }
 
 stop() {