Happy New Year

[openldap] / tests / scripts / conf.sh

diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh
index 114069b5bd7868ea3adc23efe231b35c5dbae387..fe5e60509e21b06aa9fab70843664b6ecac4f174 100755 (executable)
--- a/tests/scripts/conf.sh
+++ b/tests/scripts/conf.sh
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2015 The OpenLDAP Foundation.
+## Copyright 1998-2018 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,7 @@ sed -e "s/@BACKEND@/${BACKEND}/"                      \
        -e "s/^#${AC_sql}#//"                           \
                -e "s/^#${RDBMS}#//"                    \
        -e "s/^#${AC_accesslog}#//"                     \
+       -e "s/^#${AC_autoca}#//"                        \
        -e "s/^#${AC_dds}#//"                           \
        -e "s/^#${AC_dynlist}#//"                       \
        -e "s/^#${AC_memberof}#//"                      \
@@ -76,5 +77,7 @@ sed -e "s/@BACKEND@/${BACKEND}/"                      \
        -e "s;@PORT6@;${PORT6};"                        \
        -e "s/@SASL_MECH@/${SASL_MECH}/"                \
        -e "s;@TESTDIR@;${TESTDIR};"                    \
+       -e "s;@TESTWD@;${TESTWD};"                      \
        -e "s;@DATADIR@;${DATADIR};"                    \
-       -e "s;@SCHEMADIR@;${SCHEMADIR};"
+       -e "s;@SCHEMADIR@;${SCHEMADIR};"                \
+       -e "/^#/d"