diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-03 05:34:59 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-03 05:34:59 +0000 |
| commit | 36a5f1403a91d93db689e989ead3d9cf140c3cde (patch) | |
| tree | 278cc6e7860205b0d40a895b977a46ea09018eb2 /tests/scripts/conf.sh | |
| parent | Releasing progress-linux version 2.6.7+dfsg-1~exp1~progress7.99u1. (diff) | |
| download | openldap-36a5f1403a91d93db689e989ead3d9cf140c3cde.tar.xz openldap-36a5f1403a91d93db689e989ead3d9cf140c3cde.zip | |
Merging upstream version 2.6.8+dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/scripts/conf.sh')
| -rwxr-xr-x | tests/scripts/conf.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh index d166eba..c0a8940 100755 --- 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-2022 The OpenLDAP Foundation. +## Copyright 1998-2024 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -15,7 +15,7 @@ if [ x"$WITH_SASL" = x"yes" -a x"$USE_SASL" != x"no" ] ; then SASL="sasl" if [ x"$USE_SASL" = x"yes" ] ; then - USE_SASL=DIGEST-MD5 + USE_SASL=SCRAM-SHA-256 fi SASL_MECH="\"saslmech=$USE_SASL\"" else @@ -42,6 +42,7 @@ sed -e "s/@BACKEND@/${BACKEND}/" \ -e "s/^#${AC_dynlist}#//" \ -e "s/^#${AC_homedir}#//" \ -e "s/^#${AC_memberof}#//" \ + -e "s/^#${AC_nestgroup}#//" \ -e "s/^#${AC_pcache}#//" \ -e "s/^#${AC_ppolicy}#//" \ -e "s/^#${AC_refint}#//" \ |