directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject [directory-fortress-core] branch master updated: FC-276 - Correct ant config processing of conditionals like enable ssl or rbac accelerator
Date Thu, 20 Feb 2020 19:14:40 GMT
This is an automated email from the ASF dual-hosted git repository.

smckinney pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-fortress-core.git


The following commit(s) were added to refs/heads/master by this push:
     new a82c10a  FC-276 - Correct ant config processing of conditionals like enable ssl or
rbac accelerator
a82c10a is described below

commit a82c10a60bc22912943e3d34124ef60e15c4e95b
Author: Shawn McKinney <smckinney@symas.com>
AuthorDate: Thu Feb 20 13:14:35 2020 -0600

    FC-276 - Correct ant config processing of conditionals like enable ssl or rbac accelerator
---
 build-config.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build-config.xml b/build-config.xml
index faf4ac8..270a24e 100644
--- a/build-config.xml
+++ b/build-config.xml
@@ -177,7 +177,7 @@
     <!-- =================================
           Enable the RBAC Accelerator Overlay
          ================================= -->
-    <target name="enable-rbac-accelerator" depends="init" if="rbac.accelerator">
+    <target name="enable-rbac-accelerator" depends="init" if="${rbac.accelerator}">
         <echo message="###############  Initialize the RBAC Accelerator Overlay"/>
         <replace file="${target.slapd.conf}" token="@RBAC_MODULE@" value="${rbac.module}"/>
         <replace file="${target.slapd.conf}" token="@DDS_MODULE@" value="${dds.module}"/>
@@ -216,7 +216,7 @@
     <!-- =================================
           Disable RBAC Accelerator Overlay
          ================================= -->
-    <target name="disable-rbac-accelerator" depends="init" unless="rbac.accelerator">
+    <target name="disable-rbac-accelerator" depends="init" unless="${rbac.accelerator}">
         <echo message="###############  Disable the RBAC Accelerator Overlay"/>
         <replace file="${target.slapd.conf}" token="@RBAC_MODULE@" value=""/>
         <replace file="${target.slapd.conf}" token="@DDS_MODULE@" value=""/>
@@ -235,7 +235,7 @@
     <!-- =================================
           Enable OpenLDAP SSL
          ================================= -->
-    <target name="enable-slapd-ssl" depends="init" if="enable.ldap.ssl">
+    <target name="enable-slapd-ssl" depends="init" if="${enable.ldap.ssl}">
         <echo message="###############  Enable OpenLDAP SSL"/>
         <antcall target="copy-ssl-keys"></antcall>
         <replace file="${target.slapd.conf}" token="@IS_SSL@" value=""/>
@@ -247,7 +247,7 @@
     <!-- =================================
           Disable OpenLDAP SSL
          ================================= -->
-    <target name="disable-slapd-ssl" depends="init" unless="enable.ldap.ssl">
+    <target name="disable-slapd-ssl" depends="init" unless="${enable.ldap.ssl}">
         <echo message="###############  Disable OpenLDAP SSL"/>
         <replace file="${target.slapd.conf}" token="@IS_SSL@" value="#"/>
     </target>


Mime
View raw message