diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-03 05:34:56 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-03 05:34:56 +0000 |
| commit | 3102bdaf142acf3c952310cb620274258492a795 (patch) | |
| tree | 907e389a831fe1f9dc5d94479d8457584b352434 /tests/scripts | |
| parent | Adding debian version 2.6.7+dfsg-1~exp1. (diff) | |
| download | openldap-3102bdaf142acf3c952310cb620274258492a795.tar.xz openldap-3102bdaf142acf3c952310cb620274258492a795.zip | |
Merging upstream version 2.6.8+dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/scripts')
122 files changed, 856 insertions, 128 deletions
diff --git a/tests/scripts/all b/tests/scripts/all index c9528ee..50b722e 100755 --- a/tests/scripts/all +++ b/tests/scripts/all @@ -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 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}#//" \ diff --git a/tests/scripts/confdirsync.sh b/tests/scripts/confdirsync.sh index 25efb1e..a697ce6 100755 --- a/tests/scripts/confdirsync.sh +++ b/tests/scripts/confdirsync.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 diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh index 670dea3..df9e1ed 100755 --- a/tests/scripts/defines.sh +++ b/tests/scripts/defines.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 @@ -51,6 +51,7 @@ DEREF=${AC_deref-derefno} DYNLIST=${AC_dynlist-dynlistno} HOMEDIR=${AC_homedir-homedirno} MEMBEROF=${AC_memberof-memberofno} +NESTGROUP=${AC_nestgroup-nestgroupno} OTP=${AC_otp-otpno} PROXYCACHE=${AC_pcache-pcacheno} PPOLICY=${AC_ppolicy-ppolicyno} @@ -460,6 +461,8 @@ DDSOUT=$DATADIR/dds.out DEREFOUT=$DATADIR/deref.out MEMBEROFOUT=$DATADIR/memberof.out MEMBEROFREFINTOUT=$DATADIR/memberof-refint.out +NESTGROUPOUT1=$DATADIR/nestgroup.out.1 +NESTGROUPOUT2=$DATADIR/nestgroup.out.2 SHTOOL="$TOPSRCDIR/build/shtool" . $ABS_SRCDIR/scripts/functions.sh diff --git a/tests/scripts/functions.sh b/tests/scripts/functions.sh index 7e6615f..b08e518 100755 --- a/tests/scripts/functions.sh +++ b/tests/scripts/functions.sh @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software <http://www.openldap.org/>. ## -## Copyright 2022 The OpenLDAP Foundation. +## Copyright 2022-2024 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/tests/scripts/gdb.py b/tests/scripts/gdb.py index 50b5fa9..70eca3f 100644 --- a/tests/scripts/gdb.py +++ b/tests/scripts/gdb.py @@ -1,7 +1,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software <http://www.openldap.org/>. ## -## Copyright 2020-2022 The OpenLDAP Foundation. +## Copyright 2020-2024 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/tests/scripts/grandchild_wrapper.py b/tests/scripts/grandchild_wrapper.py index b5e7194..90e2f18 100755 --- a/tests/scripts/grandchild_wrapper.py +++ b/tests/scripts/grandchild_wrapper.py @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software <http://www.openldap.org/>. ## -## Copyright 2020-2022 The OpenLDAP Foundation. +## Copyright 2020-2024 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/tests/scripts/its-all b/tests/scripts/its-all index f92a373..85f77e3 100755 --- a/tests/scripts/its-all +++ b/tests/scripts/its-all @@ -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 diff --git a/tests/scripts/lloadd-all b/tests/scripts/lloadd-all index 34a2d87..a209fe0 100755 --- a/tests/scripts/lloadd-all +++ b/tests/scripts/lloadd-all @@ -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 diff --git a/tests/scripts/lloadd/test000-rootdse b/tests/scripts/lloadd/test000-rootdse index 9046b16..9bc8ee9 100755 --- a/tests/scripts/lloadd/test000-rootdse +++ b/tests/scripts/lloadd/test000-rootdse @@ -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 diff --git a/tests/scripts/lloadd/test001-backend-issues b/tests/scripts/lloadd/test001-backend-issues index b7f99fc..2a1e530 100755 --- a/tests/scripts/lloadd/test001-backend-issues +++ b/tests/scripts/lloadd/test001-backend-issues @@ -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 diff --git a/tests/scripts/lloadd/test002-load b/tests/scripts/lloadd/test002-load index 2de04d6..f860ffa 100755 --- a/tests/scripts/lloadd/test002-load +++ b/tests/scripts/lloadd/test002-load @@ -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 diff --git a/tests/scripts/lloadd/test003-cnconfig b/tests/scripts/lloadd/test003-cnconfig index 373b5bb..378c40c 100755 --- a/tests/scripts/lloadd/test003-cnconfig +++ b/tests/scripts/lloadd/test003-cnconfig @@ -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 diff --git a/tests/scripts/lloadd/test004-monitor b/tests/scripts/lloadd/test004-monitor index ef308b2..428891f 100755 --- a/tests/scripts/lloadd/test004-monitor +++ b/tests/scripts/lloadd/test004-monitor @@ -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 diff --git a/tests/scripts/lloadd/test005-tls b/tests/scripts/lloadd/test005-tls index 7d6f87c..c832513 100755 --- a/tests/scripts/lloadd/test005-tls +++ b/tests/scripts/lloadd/test005-tls @@ -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 diff --git a/tests/scripts/lloadd/test006-sasl b/tests/scripts/lloadd/test006-sasl index a49dbbb..bc101b7 100755 --- a/tests/scripts/lloadd/test006-sasl +++ b/tests/scripts/lloadd/test006-sasl @@ -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 @@ -22,7 +22,7 @@ if test $WITH_SASL = "yes" ; then exit 0 fi if test $USE_SASL = "yes" ; then - MECH="DIGEST-MD5" + MECH="SCRAM-SHA-256" else MECH="$USE_SASL" fi diff --git a/tests/scripts/lloadd/test007-coherence b/tests/scripts/lloadd/test007-coherence index cda6dea..30a061b 100755 --- a/tests/scripts/lloadd/test007-coherence +++ b/tests/scripts/lloadd/test007-coherence @@ -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 diff --git a/tests/scripts/monitor_data.sh b/tests/scripts/monitor_data.sh index 7d08eda..a848a77 100755 --- a/tests/scripts/monitor_data.sh +++ b/tests/scripts/monitor_data.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 diff --git a/tests/scripts/passwd-search b/tests/scripts/passwd-search index ecb07e9..48eb2b9 100755 --- a/tests/scripts/passwd-search +++ b/tests/scripts/passwd-search @@ -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 diff --git a/tests/scripts/relay b/tests/scripts/relay index c0e6181..ef0c02f 100755 --- a/tests/scripts/relay +++ b/tests/scripts/relay @@ -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 diff --git a/tests/scripts/setup_kdc.sh b/tests/scripts/setup_kdc.sh index 3402f45..074c70b 100755 --- a/tests/scripts/setup_kdc.sh +++ b/tests/scripts/setup_kdc.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 diff --git a/tests/scripts/sql-all b/tests/scripts/sql-all index c462c3c..85e804a 100755 --- a/tests/scripts/sql-all +++ b/tests/scripts/sql-all @@ -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 diff --git a/tests/scripts/sql-test000-read b/tests/scripts/sql-test000-read index 6d1d766..b90b787 100755 --- a/tests/scripts/sql-test000-read +++ b/tests/scripts/sql-test000-read @@ -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 diff --git a/tests/scripts/sql-test001-concurrency b/tests/scripts/sql-test001-concurrency index d474070..ed79e2a 100755 --- a/tests/scripts/sql-test001-concurrency +++ b/tests/scripts/sql-test001-concurrency @@ -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 diff --git a/tests/scripts/sql-test900-write b/tests/scripts/sql-test900-write index 983d350..ab977c5 100755 --- a/tests/scripts/sql-test900-write +++ b/tests/scripts/sql-test900-write @@ -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 diff --git a/tests/scripts/sql-test901-syncrepl b/tests/scripts/sql-test901-syncrepl index db94271..b6b3491 100755 --- a/tests/scripts/sql-test901-syncrepl +++ b/tests/scripts/sql-test901-syncrepl @@ -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 diff --git a/tests/scripts/start-server b/tests/scripts/start-server index aa8ea93..3f5423e 100755 --- a/tests/scripts/start-server +++ b/tests/scripts/start-server @@ -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 diff --git a/tests/scripts/start-server-nolog b/tests/scripts/start-server-nolog index a183d54..4ec835b 100755 --- a/tests/scripts/start-server-nolog +++ b/tests/scripts/start-server-nolog @@ -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 diff --git a/tests/scripts/start-server2 b/tests/scripts/start-server2 index 044ef8e..0b9a71a 100755 --- a/tests/scripts/start-server2 +++ b/tests/scripts/start-server2 @@ -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 diff --git a/tests/scripts/start-server2-nolog b/tests/scripts/start-server2-nolog index 965c2c4..741f76e 100755 --- a/tests/scripts/start-server2-nolog +++ b/tests/scripts/start-server2-nolog @@ -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 diff --git a/tests/scripts/startup_nis_ldap_server.sh b/tests/scripts/startup_nis_ldap_server.sh index 0830f20..dbbcc02 100755 --- a/tests/scripts/startup_nis_ldap_server.sh +++ b/tests/scripts/startup_nis_ldap_server.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 diff --git a/tests/scripts/test000-rootdse b/tests/scripts/test000-rootdse index e01d7ae..9b229be 100755 --- a/tests/scripts/test000-rootdse +++ b/tests/scripts/test000-rootdse @@ -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 diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd index fd5be88..691ab7f 100755 --- a/tests/scripts/test001-slapadd +++ b/tests/scripts/test001-slapadd @@ -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 diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate index 4ff45c7..fc84e47 100755 --- a/tests/scripts/test002-populate +++ b/tests/scripts/test002-populate @@ -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 diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search index 8ef54e5..b845917 100755 --- a/tests/scripts/test003-search +++ b/tests/scripts/test003-search @@ -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 diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify index 178346e..6c791b8 100755 --- a/tests/scripts/test004-modify +++ b/tests/scripts/test004-modify @@ -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 diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn index e05da81..3f4c0e7 100755 --- a/tests/scripts/test005-modrdn +++ b/tests/scripts/test005-modrdn @@ -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 diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls index 18afbd4..8fd239a 100755 --- a/tests/scripts/test006-acls +++ b/tests/scripts/test006-acls @@ -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 diff --git a/tests/scripts/test007-slapmodify b/tests/scripts/test007-slapmodify index 9acd579..891f2c3 100755 --- a/tests/scripts/test007-slapmodify +++ b/tests/scripts/test007-slapmodify @@ -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 diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency index 2d71e3a..08903aa 100755 --- a/tests/scripts/test008-concurrency +++ b/tests/scripts/test008-concurrency @@ -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 diff --git a/tests/scripts/test009-referral b/tests/scripts/test009-referral index b6f05fa..26c724e 100755 --- a/tests/scripts/test009-referral +++ b/tests/scripts/test009-referral @@ -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 diff --git a/tests/scripts/test010-passwd b/tests/scripts/test010-passwd index ac6fbb9..8210f28 100755 --- a/tests/scripts/test010-passwd +++ b/tests/scripts/test010-passwd @@ -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 diff --git a/tests/scripts/test011-glue-slapadd b/tests/scripts/test011-glue-slapadd index 710263d..f019d71 100755 --- a/tests/scripts/test011-glue-slapadd +++ b/tests/scripts/test011-glue-slapadd @@ -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 diff --git a/tests/scripts/test012-glue-populate b/tests/scripts/test012-glue-populate index 121aa7c..4cf9b3f 100755 --- a/tests/scripts/test012-glue-populate +++ b/tests/scripts/test012-glue-populate @@ -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 diff --git a/tests/scripts/test013-language b/tests/scripts/test013-language index aa69c62..281932d 100755 --- a/tests/scripts/test013-language +++ b/tests/scripts/test013-language @@ -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 diff --git a/tests/scripts/test014-whoami b/tests/scripts/test014-whoami index 0e2f359..b1488fc 100755 --- a/tests/scripts/test014-whoami +++ b/tests/scripts/test014-whoami @@ -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 diff --git a/tests/scripts/test015-xsearch b/tests/scripts/test015-xsearch index b24d4a4..8c4c934 100755 --- a/tests/scripts/test015-xsearch +++ b/tests/scripts/test015-xsearch @@ -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 diff --git a/tests/scripts/test016-subref b/tests/scripts/test016-subref index 851532f..484439b 100755 --- a/tests/scripts/test016-subref +++ b/tests/scripts/test016-subref @@ -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 diff --git a/tests/scripts/test017-syncreplication-refresh b/tests/scripts/test017-syncreplication-refresh index 7588203..b02ec0f 100755 --- a/tests/scripts/test017-syncreplication-refresh +++ b/tests/scripts/test017-syncreplication-refresh @@ -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 diff --git a/tests/scripts/test018-syncreplication-persist b/tests/scripts/test018-syncreplication-persist index 0d4a0b8..90684ef 100755 --- a/tests/scripts/test018-syncreplication-persist +++ b/tests/scripts/test018-syncreplication-persist @@ -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 diff --git a/tests/scripts/test019-syncreplication-cascade b/tests/scripts/test019-syncreplication-cascade index 1501823..3ecd5e1 100755 --- a/tests/scripts/test019-syncreplication-cascade +++ b/tests/scripts/test019-syncreplication-cascade @@ -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 diff --git a/tests/scripts/test020-proxycache b/tests/scripts/test020-proxycache index af4cc9e..7bd54f6 100755 --- a/tests/scripts/test020-proxycache +++ b/tests/scripts/test020-proxycache @@ -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 diff --git a/tests/scripts/test021-certificate b/tests/scripts/test021-certificate index 9be5c6a..1df8331 100755 --- a/tests/scripts/test021-certificate +++ b/tests/scripts/test021-certificate @@ -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 diff --git a/tests/scripts/test022-ppolicy b/tests/scripts/test022-ppolicy index 292a97c..8900325 100755 --- a/tests/scripts/test022-ppolicy +++ b/tests/scripts/test022-ppolicy @@ -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 diff --git a/tests/scripts/test023-refint b/tests/scripts/test023-refint index 6c10236..be17132 100755 --- a/tests/scripts/test023-refint +++ b/tests/scripts/test023-refint @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software <http://www.openldap.org/>. ## -## Copyright 2004-2022 The OpenLDAP Foundation. +## Copyright 2004-2024 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/tests/scripts/test024-unique b/tests/scripts/test024-unique index 01b2b99..6820a2e 100755 --- a/tests/scripts/test024-unique +++ b/tests/scripts/test024-unique @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software <http://www.openldap.org/>. ## -## Copyright 2004-2022 The OpenLDAP Foundation. +## Copyright 2004-2024 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/tests/scripts/test025-limits b/tests/scripts/test025-limits index 09f8bec..d15d2e6 100755 --- a/tests/scripts/test025-limits +++ b/tests/scripts/test025-limits @@ -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 diff --git a/tests/scripts/test026-dn b/tests/scripts/test026-dn index 3676139..16282b2 100755 --- a/tests/scripts/test026-dn +++ b/tests/scripts/test026-dn @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software <http://www.openldap.org/>. ## -## Copyright 2004-2022 The OpenLDAP Foundation. +## Copyright 2004-2024 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/tests/scripts/test027-emptydn b/tests/scripts/test027-emptydn index a1f1512..6fc4b6e 100755 --- a/tests/scripts/test027-emptydn +++ b/tests/scripts/test027-emptydn @@ -1,7 +1,7 @@ #! /bin/sh ## This work is part of OpenLDAP Software <http://www.openldap.org/>. ## -## Copyright 2004-2022 The OpenLDAP Foundation. +## Copyright 2004-2024 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/tests/scripts/test028-idassert b/tests/scripts/test028-idassert index 76fb5c8..92ecb3e 100755 --- a/tests/scripts/test028-idassert +++ b/tests/scripts/test028-idassert @@ -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 @@ -20,7 +20,7 @@ echo "### This test requires the LDAP backend and the rwm overlay." echo "### If available, and explicitly requested, it can use SASL bind;" echo "### note that SASL must be properly set up, and the requested" echo "### mechanism must be available. Define SLAPD_USE_SASL={yes|<mech>}," -echo "### with \"yes\" defaulting to DIGEST-MD5 to enable SASL authc[/authz]." +echo "### with \"yes\" defaulting to SCRAM-SHA-256 to enable SASL authc[/authz]." if test $BACKLDAP = "ldapno" ; then echo "LDAP backend not available, test skipped" @@ -35,7 +35,7 @@ fi if test $WITH_SASL = "yes" ; then if test $USE_SASL != "no" ; then if test $USE_SASL = "yes" ; then - MECH="DIGEST-MD5" + MECH="SCRAM-SHA-256" else MECH="$USE_SASL" fi diff --git a/tests/scripts/test029-ldapglue b/tests/scripts/test029-ldapglue index f0ad581..89f3379 100755 --- a/tests/scripts/test029-ldapglue +++ b/tests/scripts/test029-ldapglue @@ -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 @@ -20,7 +20,7 @@ echo "### This test requires the ldap backend and glue overlay." echo "### If available, and explicitly requested, it can use SASL bind;" echo "### note that SASL must be properly set up, and the requested" echo "### mechanism must be available. Define SLAPD_USE_SASL={yes|<mech>}," -echo "### with \"yes\" defaulting to DIGEST-MD5 to enable SASL authc[/authz]." +echo "### with \"yes\" defaulting to SCRAM-SHA-256 to enable SASL authc[/authz]." if test $BACKLDAP = "ldapno" ; then echo "LDAP backend not available, test skipped" @@ -30,7 +30,7 @@ fi if test $WITH_SASL = "yes" ; then if test $USE_SASL != "no" ; then if test $USE_SASL = "yes" ; then - MECH="DIGEST-MD5" + MECH="SCRAM-SHA-256" else MECH="$USE_SASL" fi diff --git a/tests/scripts/test030-relay b/tests/scripts/test030-relay index 1ce5250..1346ab0 100755 --- a/tests/scripts/test030-relay +++ b/tests/scripts/test030-relay @@ -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 diff --git a/tests/scripts/test031-component-filter b/tests/scripts/test031-component-filter index b289054..25ca228 100755 --- a/tests/scripts/test031-component-filter +++ b/tests/scripts/test031-component-filter @@ -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 diff --git a/tests/scripts/test032-chain b/tests/scripts/test032-chain index 3da9a24..3bdb411 100755 --- a/tests/scripts/test032-chain +++ b/tests/scripts/test032-chain @@ -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 diff --git a/tests/scripts/test033-glue-syncrepl b/tests/scripts/test033-glue-syncrepl index 0becc30..ed9253d 100755 --- a/tests/scripts/test033-glue-syncrepl +++ b/tests/scripts/test033-glue-syncrepl @@ -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 diff --git a/tests/scripts/test034-translucent b/tests/scripts/test034-translucent index 8b834d9..6b00908 100755 --- a/tests/scripts/test034-translucent +++ b/tests/scripts/test034-translucent @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software <http://www.openldap.org/>. ## -## Copyright 2004-2022 The OpenLDAP Foundation. +## Copyright 2004-2024 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/tests/scripts/test035-meta b/tests/scripts/test035-meta index 44f72e3..3284a33 100755 --- a/tests/scripts/test035-meta +++ b/tests/scripts/test035-meta @@ -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 diff --git a/tests/scripts/test036-meta-concurrency b/tests/scripts/test036-meta-concurrency index 46f5cfb..d1866b6 100755 --- a/tests/scripts/test036-meta-concurrency +++ b/tests/scripts/test036-meta-concurrency @@ -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 diff --git a/tests/scripts/test037-manage b/tests/scripts/test037-manage index 9587593..d35b50a 100755 --- a/tests/scripts/test037-manage +++ b/tests/scripts/test037-manage @@ -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 diff --git a/tests/scripts/test038-retcode b/tests/scripts/test038-retcode index 1e0ecb2..a21bf59 100755 --- a/tests/scripts/test038-retcode +++ b/tests/scripts/test038-retcode @@ -2,7 +2,7 @@ # $Header$ ## 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 diff --git a/tests/scripts/test039-glue-ldap-concurrency b/tests/scripts/test039-glue-ldap-concurrency index 5b5580a..8e3e754 100755 --- a/tests/scripts/test039-glue-ldap-concurrency +++ b/tests/scripts/test039-glue-ldap-concurrency @@ -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 diff --git a/tests/scripts/test040-subtree-rename b/tests/scripts/test040-subtree-rename index 9554da3..a255427 100755 --- a/tests/scripts/test040-subtree-rename +++ b/tests/scripts/test040-subtree-rename @@ -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 diff --git a/tests/scripts/test041-aci b/tests/scripts/test041-aci index f3993b9..dcd0fc9 100755 --- a/tests/scripts/test041-aci +++ b/tests/scripts/test041-aci @@ -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 diff --git a/tests/scripts/test042-valsort b/tests/scripts/test042-valsort index 853381f..cee90ed 100755 --- a/tests/scripts/test042-valsort +++ b/tests/scripts/test042-valsort @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software <http://www.openldap.org/>. ## -## Copyright 2004-2022 The OpenLDAP Foundation. +## Copyright 2004-2024 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/tests/scripts/test043-delta-syncrepl b/tests/scripts/test043-delta-syncrepl index 0d30e72..982cfe6 100755 --- a/tests/scripts/test043-delta-syncrepl +++ b/tests/scripts/test043-delta-syncrepl @@ -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 diff --git a/tests/scripts/test044-dynlist b/tests/scripts/test044-dynlist index da70343..6d07cbf 100755 --- a/tests/scripts/test044-dynlist +++ b/tests/scripts/test044-dynlist @@ -1,7 +1,7 @@ #! /bin/sh ## 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 diff --git a/tests/scripts/test045-syncreplication-proxied b/tests/scripts/test045-syncreplication-proxied index 80c7019..16c85c2 100755 --- a/tests/scripts/test045-syncreplication-proxied +++ b/tests/scripts/test045-syncreplication-proxied @@ -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 diff --git a/tests/scripts/test046-dds b/tests/scripts/test046-dds index 0eaf29b..1f04b7e 100755 --- a/tests/scripts/test046-dds +++ b/tests/scripts/test046-dds @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software <http://www.openldap.org/>. ## -## Copyright 2005-2022 The OpenLDAP Foundation. +## Copyright 2005-2024 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/tests/scripts/test047-ldap b/tests/scripts/test047-ldap index 7397de6..6bdc99b 100755 --- a/tests/scripts/test047-ldap +++ b/tests/scripts/test047-ldap @@ -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 diff --git a/tests/scripts/test048-syncrepl-multiproxy b/tests/scripts/test048-syncrepl-multiproxy index fb231a2..ec38f89 100755 --- a/tests/scripts/test048-syncrepl-multiproxy +++ b/tests/scripts/test048-syncrepl-multiproxy @@ -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 diff --git a/tests/scripts/test049-sync-config b/tests/scripts/test049-sync-config index b05e041..ab7891e 100755 --- a/tests/scripts/test049-sync-config +++ b/tests/scripts/test049-sync-config @@ -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 diff --git a/tests/scripts/test050-syncrepl-multiprovider b/tests/scripts/test050-syncrepl-multiprovider index dcdf395..0cd90b4 100755 --- a/tests/scripts/test050-syncrepl-multiprovider +++ b/tests/scripts/test050-syncrepl-multiprovider @@ -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 diff --git a/tests/scripts/test051-config-undo b/tests/scripts/test051-config-undo index 56c5643..ba04888 100755 --- a/tests/scripts/test051-config-undo +++ b/tests/scripts/test051-config-undo @@ -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 diff --git a/tests/scripts/test052-memberof b/tests/scripts/test052-memberof index afa5eb9..04a5745 100755 --- a/tests/scripts/test052-memberof +++ b/tests/scripts/test052-memberof @@ -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 @@ -441,6 +441,61 @@ if test $RC != 0 ; then exit $RC fi +echo "Running ldapmodify to enable add checking..." +$LDAPMODIFY -H $URI1 -D 'cn=config' -w `cat $CONFIGPWF` \ + >> $TESTOUT 2>&1 <<EOF +dn: olcOverlay={0}memberof,olcDatabase={1}$BACKEND,cn=config +changetype: modify +replace: olcMemberOfAddCheck +olcMemberOfAddCheck: TRUE + +EOF +RC=$? +if test $RC != 0 ; then + echo "ldapmodify failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Adding group and users out of order..." +$LDAPADD -H $URI1 \ + -D "cn=Manager,$BASEDN" -w secret \ + >> $TESTOUT 2>&1 <<EOF +dn: cn=group3,ou=Groups,$BASEDN +objectclass: groupOfNames +cn: group3 +member: cn=New Person,ou=People,$BASEDN +member: cn=New Group,ou=Groups,$BASEDN + +dn: cn=New Group,ou=Groups,$BASEDN +objectclass: groupOfNames +cn: New Group +member: cn=New Person,ou=People,$BASEDN + +dn: cn=New Person,ou=People,$BASEDN +objectclass: person +cn: New Person +sn: Person + +EOF +RC=$? +if test $RC != 0 ; then + echo "ldapadd failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Re-search the entire database..." +echo "# Re-search the entire database after adding out-of-order groups/users..." >> $SEARCHOUT +$LDAPSEARCH -S "" -b "$BASEDN" -H $URI1 \ + '(objectClass=*)' '*' memberOf >> $SEARCHOUT 2>&1 +RC=$? +if test $RC != 0 ; then + echo "ldapsearch failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + test $KILLSERVERS != no && kill -HUP $KILLPIDS LDIF=$MEMBEROFOUT diff --git a/tests/scripts/test053-syncprov-glue b/tests/scripts/test053-syncprov-glue index 3caa0d4..4b93e6d 100755 --- a/tests/scripts/test053-syncprov-glue +++ b/tests/scripts/test053-syncprov-glue @@ -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 diff --git a/tests/scripts/test054-syncreplication-parallel-load b/tests/scripts/test054-syncreplication-parallel-load index 98644c9..7ef6955 100755 --- a/tests/scripts/test054-syncreplication-parallel-load +++ b/tests/scripts/test054-syncreplication-parallel-load @@ -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 diff --git a/tests/scripts/test055-valregex b/tests/scripts/test055-valregex index 326dee2..debe989 100755 --- a/tests/scripts/test055-valregex +++ b/tests/scripts/test055-valregex @@ -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 diff --git a/tests/scripts/test056-monitor b/tests/scripts/test056-monitor index 0c5241f..63a69af 100755 --- a/tests/scripts/test056-monitor +++ b/tests/scripts/test056-monitor @@ -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 diff --git a/tests/scripts/test057-memberof-refint b/tests/scripts/test057-memberof-refint index c30a4c1..0197fcf 100755 --- a/tests/scripts/test057-memberof-refint +++ b/tests/scripts/test057-memberof-refint @@ -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. ## Portions Copyright 2008 Red Hat, Inc. ## All rights reserved. ## diff --git a/tests/scripts/test058-syncrepl-asymmetric b/tests/scripts/test058-syncrepl-asymmetric index f950761..4b3dd91 100755 --- a/tests/scripts/test058-syncrepl-asymmetric +++ b/tests/scripts/test058-syncrepl-asymmetric @@ -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 diff --git a/tests/scripts/test059-consumer-config b/tests/scripts/test059-consumer-config index 30e87e4..424af67 100755 --- a/tests/scripts/test059-consumer-config +++ b/tests/scripts/test059-consumer-config @@ -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 diff --git a/tests/scripts/test060-mt-hot b/tests/scripts/test060-mt-hot index a571622..600b995 100755 --- a/tests/scripts/test060-mt-hot +++ b/tests/scripts/test060-mt-hot @@ -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 diff --git a/tests/scripts/test061-syncreplication-initiation b/tests/scripts/test061-syncreplication-initiation index 3e3b973..489ff12 100755 --- a/tests/scripts/test061-syncreplication-initiation +++ b/tests/scripts/test061-syncreplication-initiation @@ -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 diff --git a/tests/scripts/test062-config-delete b/tests/scripts/test062-config-delete index afb87c4..78ae493 100755 --- a/tests/scripts/test062-config-delete +++ b/tests/scripts/test062-config-delete @@ -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 diff --git a/tests/scripts/test063-delta-multiprovider b/tests/scripts/test063-delta-multiprovider index 8ce5906..73d7334 100755 --- a/tests/scripts/test063-delta-multiprovider +++ b/tests/scripts/test063-delta-multiprovider @@ -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 diff --git a/tests/scripts/test064-constraint b/tests/scripts/test064-constraint index 5519123..952370b 100755 --- a/tests/scripts/test064-constraint +++ b/tests/scripts/test064-constraint @@ -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 diff --git a/tests/scripts/test065-proxyauthz b/tests/scripts/test065-proxyauthz index e96c877..bd8860a 100755 --- a/tests/scripts/test065-proxyauthz +++ b/tests/scripts/test065-proxyauthz @@ -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 diff --git a/tests/scripts/test066-autoca b/tests/scripts/test066-autoca index dd8b502..57cf49f 100755 --- a/tests/scripts/test066-autoca +++ b/tests/scripts/test066-autoca @@ -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 diff --git a/tests/scripts/test067-tls b/tests/scripts/test067-tls index cd99fcf..1d2f215 100755 --- a/tests/scripts/test067-tls +++ b/tests/scripts/test067-tls @@ -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 diff --git a/tests/scripts/test068-sasl-tls-external b/tests/scripts/test068-sasl-tls-external index f79471b..020832b 100755 --- a/tests/scripts/test068-sasl-tls-external +++ b/tests/scripts/test068-sasl-tls-external @@ -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 diff --git a/tests/scripts/test069-delta-multiprovider-starttls b/tests/scripts/test069-delta-multiprovider-starttls index 277c0a7..2140ec1 100755 --- a/tests/scripts/test069-delta-multiprovider-starttls +++ b/tests/scripts/test069-delta-multiprovider-starttls @@ -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 diff --git a/tests/scripts/test070-delta-multiprovider-ldaps b/tests/scripts/test070-delta-multiprovider-ldaps index 3fb96cc..0537980 100755 --- a/tests/scripts/test070-delta-multiprovider-ldaps +++ b/tests/scripts/test070-delta-multiprovider-ldaps @@ -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 diff --git a/tests/scripts/test071-dirsync b/tests/scripts/test071-dirsync index 455629b..e1b7dd1 100755 --- a/tests/scripts/test071-dirsync +++ b/tests/scripts/test071-dirsync @@ -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 diff --git a/tests/scripts/test072-dsee-sync b/tests/scripts/test072-dsee-sync index bb3ba7a..1f5da71 100755 --- a/tests/scripts/test072-dsee-sync +++ b/tests/scripts/test072-dsee-sync @@ -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 diff --git a/tests/scripts/test073-asyncmeta b/tests/scripts/test073-asyncmeta index eabd4a3..9086166 100755 --- a/tests/scripts/test073-asyncmeta +++ b/tests/scripts/test073-asyncmeta @@ -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 diff --git a/tests/scripts/test074-asyncmeta-concurrency b/tests/scripts/test074-asyncmeta-concurrency index 09a14fd..c4f4d54 100755 --- a/tests/scripts/test074-asyncmeta-concurrency +++ b/tests/scripts/test074-asyncmeta-concurrency @@ -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 diff --git a/tests/scripts/test075-dsee-persist b/tests/scripts/test075-dsee-persist index fff63ee..58aefa7 100755 --- a/tests/scripts/test075-dsee-persist +++ b/tests/scripts/test075-dsee-persist @@ -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 diff --git a/tests/scripts/test076-authid-rewrite b/tests/scripts/test076-authid-rewrite index 383e4c3..b16cbba 100755 --- a/tests/scripts/test076-authid-rewrite +++ b/tests/scripts/test076-authid-rewrite @@ -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 @@ -21,8 +21,15 @@ if test $WITH_SASL = no; then exit 0 fi +case "$USE_SASL" in + ""|no|yes) + MECH="SCRAM-SHA-256";; + *) + MECH="$USE_SASL" +esac +echo "Using SASL authc[/authz] with mech=$MECH" + CONFDIR=$TESTDIR/slapd.d -MECH=DIGEST-MD5 mkdir -p $TESTDIR $CONFDIR $DBDIR1 diff --git a/tests/scripts/test077-sasl-gssapi b/tests/scripts/test077-sasl-gssapi index 4d4e260..bfe126a 100755 --- a/tests/scripts/test077-sasl-gssapi +++ b/tests/scripts/test077-sasl-gssapi @@ -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 diff --git a/tests/scripts/test078-persistent-sessionlog b/tests/scripts/test078-persistent-sessionlog index 8f3d07f..f1db0ea 100755 --- a/tests/scripts/test078-persistent-sessionlog +++ b/tests/scripts/test078-persistent-sessionlog @@ -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 diff --git a/tests/scripts/test079-proxy-timeout b/tests/scripts/test079-proxy-timeout index d64449b..ec2ab13 100755 --- a/tests/scripts/test079-proxy-timeout +++ b/tests/scripts/test079-proxy-timeout @@ -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 diff --git a/tests/scripts/test080-hotp b/tests/scripts/test080-hotp index 5bfd14a..8a3cf00 100755 --- a/tests/scripts/test080-hotp +++ b/tests/scripts/test080-hotp @@ -3,7 +3,7 @@ ## This work is part of OpenLDAP Software <http://www.openldap.org/>. ## ## Copyright 2016-2021 Ondřej Kuzník, Symas Corp. -## Copyright 2021-2022 The OpenLDAP Foundation. +## Copyright 2021-2024 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/tests/scripts/test081-totp b/tests/scripts/test081-totp index 052f0e6..708c656 100755 --- a/tests/scripts/test081-totp +++ b/tests/scripts/test081-totp @@ -3,7 +3,7 @@ ## This work is part of OpenLDAP Software <http://www.openldap.org/>. ## ## Copyright 2016-2021 Ondřej Kuzník, Symas Corp. -## Copyright 2021-2022 The OpenLDAP Foundation. +## Copyright 2021-2024 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/tests/scripts/test081-totp.py b/tests/scripts/test081-totp.py index aeedaf2..a13069a 100755 --- a/tests/scripts/test081-totp.py +++ b/tests/scripts/test081-totp.py @@ -3,7 +3,7 @@ ## This work is part of OpenLDAP Software <http://www.openldap.org/>. ## ## Copyright 2016-2021 Ondřej Kuzník, Symas Corp. -## Copyright 2021-2022 The OpenLDAP Foundation. +## Copyright 2021-2024 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/tests/scripts/test082-remoteauth b/tests/scripts/test082-remoteauth index b20a6f9..84039cf 100755 --- a/tests/scripts/test082-remoteauth +++ b/tests/scripts/test082-remoteauth @@ -3,7 +3,7 @@ ## This work is part of OpenLDAP Software <http://www.openldap.org/>. ## ## Copyright 2016-2021 Ondřej Kuzník, Symas Corp. -## 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 diff --git a/tests/scripts/test083-argon2 b/tests/scripts/test083-argon2 index 01803b3..554f677 100755 --- a/tests/scripts/test083-argon2 +++ b/tests/scripts/test083-argon2 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software <http://www.openldap.org/>. ## -## Copyright 2021-2022 The OpenLDAP Foundation. +## Copyright 2021-2024 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/tests/scripts/test084-deref b/tests/scripts/test084-deref index b176d8e..d57cec8 100755 --- a/tests/scripts/test084-deref +++ b/tests/scripts/test084-deref @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software <http://www.openldap.org/>. ## -## Copyright 2021-2022 The OpenLDAP Foundation. +## Copyright 2021-2024 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/tests/scripts/test085-homedir b/tests/scripts/test085-homedir index 3b98ca5..fea8e57 100755 --- a/tests/scripts/test085-homedir +++ b/tests/scripts/test085-homedir @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software <http://www.openldap.org/>. ## -## Copyright 2021-2022 The OpenLDAP Foundation. +## Copyright 2021-2024 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/tests/scripts/test086-delta-consumer-config b/tests/scripts/test086-delta-consumer-config index d89af3f..9a8d944 100755 --- a/tests/scripts/test086-delta-consumer-config +++ b/tests/scripts/test086-delta-consumer-config @@ -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 diff --git a/tests/scripts/test087-librewrite b/tests/scripts/test087-librewrite index 0dca1f5..93dab1e 100755 --- a/tests/scripts/test087-librewrite +++ b/tests/scripts/test087-librewrite @@ -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 diff --git a/tests/scripts/test088-syncprov-glue-rwm b/tests/scripts/test088-syncprov-glue-rwm index 307e05c..66218e0 100755 --- a/tests/scripts/test088-syncprov-glue-rwm +++ b/tests/scripts/test088-syncprov-glue-rwm @@ -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 diff --git a/tests/scripts/test089-nestgroup b/tests/scripts/test089-nestgroup new file mode 100755 index 0000000..0c8d7dd --- /dev/null +++ b/tests/scripts/test089-nestgroup @@ -0,0 +1,662 @@ +#! /bin/sh +# $OpenLDAP$ +## This work is part of OpenLDAP Software <http://www.openldap.org/>. +## +## Copyright 1998-2024 The OpenLDAP Foundation. +## All rights reserved. +## +## Redistribution and use in source and binary forms, with or without +## modification, are permitted only as authorized by the OpenLDAP +## Public License. +## +## A copy of this license is available in the file LICENSE in the +## top-level directory of the distribution or, alternatively, at +## <http://www.OpenLDAP.org/license.html>. + +echo "running defines.sh" +. $SRCDIR/scripts/defines.sh + +if test $NESTGROUP = nestgroupno; then + echo "Nestgroup overlay not available, test skipped" + exit 0 +fi +if test $MEMBEROF = memberofno; then + echo "Memberof overlay not available, memberof testing disabled" +fi + +mkdir -p $TESTDIR $DBDIR1 $TESTDIR/confdir + +$SLAPPASSWD -g -n >$CONFIGPWF +echo "rootpw `$SLAPPASSWD -T $CONFIGPWF`" >$TESTDIR/configpw.conf + +echo "Starting slapd on TCP/IP port $PORT1..." +. $CONFFILTER $BACKEND < $NAKEDCONF > $CONF1 +$SLAPD -f $CONF1 -F $TESTDIR/confdir -h $URI1 -d $LVL > $LOG1 2>&1 & +PID=$! +if test $WAIT != 0 ; then + echo PID $PID + read foo +fi +KILLPIDS="$PID" + +sleep 1 +for i in 0 1 2 3 4 5; do + $LDAPSEARCH -s base -b "$MONITOR" -H $URI1 \ + 'objectclass=*' > /dev/null 2>&1 + RC=$? + if test $RC = 0 ; then + break + fi + echo "Waiting 5 seconds for slapd to start..." + sleep 5 +done +if test $RC != 0 ; then + echo "ldapsearch failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +cat /dev/null > $TESTOUT + +if [ "$NESTGROUP" = nestgroupmod ]; then + echo "Inserting nestgroup overlay on provider..." + $LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <<EOF > $TESTOUT 2>&1 +dn: cn=module,cn=config +objectClass: olcModuleList +cn: module +olcModulePath: ../servers/slapd/overlays +olcModuleLoad: nestgroup.la +EOF + RC=$? + if test $RC != 0 ; then + echo "ldapadd failed for moduleLoad ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC + fi +fi + +indexInclude="" mainInclude="" nullExclude="" +test $INDEXDB = indexdb || indexInclude="# " +test $MAINDB = maindb || mainInclude="# " +case $BACKEND in +null) nullExclude="# " ;; +esac + +echo "Running ldapadd to build slapd config database..." +$LDAPADD -H $URI1 -D 'cn=config' -w `cat $CONFIGPWF` \ + >> $TESTOUT 2>&1 <<EOF +dn: olcDatabase={1}$BACKEND,cn=config +objectClass: olcDatabaseConfig +${nullExclude}objectClass: olc${BACKEND}Config +olcDatabase: {1}$BACKEND +olcSuffix: $BASEDN +olcRootDN: cn=Manager,$BASEDN +olcRootPW:: c2VjcmV0 +olcMonitoring: TRUE +${nullExclude}olcDbDirectory: $TESTDIR/db.1.a/ +${indexInclude}olcDbIndex: objectClass eq +${indexInclude}olcDbIndex: cn pres,eq,sub +${indexInclude}olcDbIndex: uid pres,eq,sub +${indexInclude}olcDbIndex: sn pres,eq,sub +${indexInclude}olcDbIndex: member,memberOf eq +${mainInclude}olcDbMode: 384" + +dn: olcOverlay={0}nestgroup,olcDatabase={1}$BACKEND,cn=config +objectClass: olcOverlayConfig +objectClass: olcNestGroupConfig +olcOverlay: {0}nestgroup +olcNestgroupMember: member +olcNestgroupMemberOf: memberOf +olcNestgroupBase: ou=Groups,$BASEDN + +EOF +RC=$? +if test $RC != 0 ; then + echo "ldapadd failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Running ldapadd to build slapd database..." +$LDAPADD -H $URI1 \ + -D "cn=Manager,$BASEDN" -w secret \ + >> $TESTOUT 2>&1 << EOF +dn: $BASEDN +objectClass: organization +objectClass: dcObject +o: Example, Inc. +dc: example + +dn: ou=People,$BASEDN +objectClass: organizationalUnit +ou: People + +dn: ou=Groups,$BASEDN +objectClass: organizationalUnit +ou: Groups + +dn: cn=Roger Rabbit,ou=People,$BASEDN +objectClass: inetOrgPerson +cn: Roger Rabbit +sn: Rabbit + +dn: cn=Baby Herman,ou=People,$BASEDN +objectClass: inetOrgPerson +cn: Baby Herman +sn: Herman + +dn: cn=Jessica Rabbit,ou=People,$BASEDN +objectClass: inetOrgPerson +cn: Jessica Rabbit +sn: Rabbit + +dn: cn=Bugs Bunny,ou=People,$BASEDN +objectClass: inetOrgPerson +cn: Bugs Bunny +sn: Bunny + +dn: cn=Daffy Duck,ou=People,$BASEDN +objectClass: inetOrgPerson +cn: Daffy Duck +sn: Duck + +dn: cn=Elmer Fudd,ou=People,$BASEDN +objectClass: inetOrgPerson +cn: Elmer Fudd +sn: Fudd + +dn: cn=Yosemite Sam,ou=People,$BASEDN +objectClass: inetOrgPerson +cn: Yosemite Sam +sn: Sam + +dn: cn=Foghorn Leghorn,ou=People,$BASEDN +objectClass: inetOrgPerson +cn: Foghorn Leghorn +sn: Leghorn + +dn: cn=Wile E. Coyote,ou=People,$BASEDN +objectClass: inetOrgPerson +cn: Wile E. Coyote +sn: Coyote + +dn: cn=Road Runner,ou=People,$BASEDN +objectClass: inetOrgPerson +cn: Road Runner +sn: Runner + +dn: cn=Tweety Bird,ou=People,$BASEDN +objectClass: inetOrgPerson +cn: Tweety Bird +sn: Bird + +dn: cn=Porky Pig,ou=People,$BASEDN +objectClass: inetOrgPerson +cn: Porky Pig +sn: Pig + +dn: cn=Rabbits,ou=Groups,$BASEDN +objectClass: groupOfNames +cn: Rabbits +member: cn=Roger Rabbit,ou=People,$BASEDN +member: cn=Jessica Rabbit,ou=People,$BASEDN + +dn: cn=Leporidae,ou=Groups,$BASEDN +objectClass: groupOfNames +cn: Leporidae +member: cn=Bugs Bunny,ou=People,$BASEDN +member: cn=Rabbits,ou=Groups,$BASEDN + +dn: cn=A-M,ou=Groups,$BASEDN +objectClass: groupOfNames +cn: A-M +member: cn=Baby Herman,ou=People,$BASEDN +member: cn=Bugs Bunny,ou=People,$BASEDN +member: cn=Daffy Duck,ou=People,$BASEDN +member: cn=Elmer Fudd,ou=People,$BASEDN +member: cn=Foghorn Leghorn,ou=People,$BASEDN +member: cn=Jessica Rabbit,ou=People,$BASEDN + +dn: cn=N-Z,ou=Groups,$BASEDN +objectClass: groupOfNames +cn: N-Z +member: cn=Porky Pig,ou=People,$BASEDN +member: cn=Road Runner,ou=People,$BASEDN +member: cn=Roger Rabbit,ou=People,$BASEDN +member: cn=Tweety Bird,ou=People,$BASEDN +member: cn=Wile E. Coyote,ou=People,$BASEDN +member: cn=Yosemite Sam,ou=People,$BASEDN + +dn: cn=Humans,ou=Groups,$BASEDN +objectClass: groupOfNames +cn: Humans +member: cn=Elmer Fudd,ou=People,$BASEDN +member: cn=Yosemite Sam,ou=People,$BASEDN + +dn: cn=Looney Tunes,ou=Groups,$BASEDN +objectClass: groupOfNames +cn: Looney Tunes +member: cn=Porky Pig,ou=People,$BASEDN +member: cn=Daffy Duck,ou=People,$BASEDN +member: cn=Elmer Fudd,ou=People,$BASEDN +member: cn=Bugs Bunny,ou=People,$BASEDN +member: cn=Tweety Bird,ou=People,$BASEDN + +dn: cn=Desert Foes,ou=Groups,$BASEDN +objectClass: groupOfNames +cn: Desert Foes +member: cn=Road Runner,ou=People,$BASEDN +member: cn=Wile E. Coyote,ou=People,$BASEDN + +dn: cn=Mixer1,ou=Groups,$BASEDN +objectClass: groupOfNames +cn: Mixer1 +member: cn=Leporidae,ou=Groups,$BASEDN +member: cn=Desert Foes,ou=Groups,$BASEDN +member: cn=Foghorn Leghorn,ou=People,$BASEDN + +dn: cn=Mixer2,ou=Groups,$BASEDN +objectClass: groupOfNames +cn: Mixer2 +member: cn=Humans,ou=Groups,$BASEDN +member: cn=Baby Herman,ou=People,$BASEDN + +dn: cn=Mixer3,ou=Groups,$BASEDN +objectClass: groupOfNames +cn: Mixer3 +member: cn=Desert Foes,ou=Groups,$BASEDN +member: cn=Porky Pig,ou=People,$BASEDN + +dn: cn=Mixer4,ou=Groups,$BASEDN +objectClass: groupOfNames +cn: Mixer4 +member: cn=Mixer1,ou=Groups,$BASEDN +member: cn=Mixer2,ou=Groups,$BASEDN +member: cn=Foghorn Leghorn,ou=People,$BASEDN + +dn: cn=Mixer5,ou=Groups,$BASEDN +objectClass: groupOfNames +cn: Mixer5 +member: cn=Mixer2,ou=Groups,$BASEDN +member: cn=Mixer3,ou=Groups,$BASEDN +member: cn=A-M,ou=Groups,$BASEDN + +dn: cn=Endless Loop,ou=Groups,$BASEDN +objectClass: groupOfNames +cn: Endless Loop +member: cn=Road Runner,ou=People,$BASEDN +member: cn=Loop\, Endless,ou=Groups,$BASEDN + +dn: cn=Loop\, Endless,ou=Groups,$BASEDN +objectClass: groupOfNames +cn: Loop, Endless +member: cn=Wile E. Coyote,ou=People,$BASEDN +member: cn=Endless Loop,ou=Groups,$BASEDN + +EOF +RC=$? +if test $RC != 0 ; then + echo "ldapadd failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Search the entire database..." +echo "# Search the entire database..." > $SEARCHOUT +$LDAPSEARCH -S "" -b "$BASEDN" -H $URI1 \ + '(objectClass=*)' '*' >> $SEARCHOUT 2>&1 +RC=$? +if test $RC != 0 ; then + echo "ldapsearch failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Search for member=cn=Bugs Bunny..." +echo "# Search for member=cn=Bugs Bunny..." >> $SEARCHOUT +$LDAPSEARCH -S "" -b "$BASEDN" -H $URI1 \ + "(member=cn=Bugs Bunny,ou=People,$BASEDN)" '*' memberof >> $SEARCHOUT 2>&1 +RC=$? +if test $RC != 0 ; then + echo "ldapsearch failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Running ldapmodify to enable nested member filter..." +$LDAPMODIFY -H $URI1 -D 'cn=config' -w `cat $CONFIGPWF` \ + >> $TESTOUT 2>&1 <<EOF +dn: olcOverlay={0}nestgroup,olcDatabase={1}$BACKEND,cn=config +changetype: modify +replace: olcNestgroupFlags +olcNestgroupFlags: member-filter + +EOF +RC=$? +if test $RC != 0 ; then + echo "ldapmodify failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Re-search for nested member=cn=Bugs Bunny..." +echo "# Re-search for nested member=cn=Bugs Bunny..." >> $SEARCHOUT +$LDAPSEARCH -S "" -b "$BASEDN" -H $URI1 \ + "(member=cn=Bugs Bunny,ou=People,$BASEDN)" '*' memberof >> $SEARCHOUT 2>&1 +RC=$? +if test $RC != 0 ; then + echo "ldapsearch failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Running ldapmodify to enable nested member values..." +$LDAPMODIFY -H $URI1 -D 'cn=config' -w `cat $CONFIGPWF` \ + >> $TESTOUT 2>&1 <<EOF +dn: olcOverlay={0}nestgroup,olcDatabase={1}$BACKEND,cn=config +changetype: modify +replace: olcNestgroupFlags +olcNestgroupFlags: member-values + +EOF +RC=$? +if test $RC != 0 ; then + echo "ldapmodify failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Search the expanded groups..." +echo "# Search the expanded groups..." >> $SEARCHOUT +$LDAPSEARCH -S "" -b "ou=Groups,$BASEDN" -H $URI1 \ + '(objectClass=*)' '*' memberof >> $SEARCHOUT 2>&1 +RC=$? +if test $RC != 0 ; then + echo "ldapsearch failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +LDIF=$NESTGROUPOUT1 + +echo "Filtering ldapsearch results..." +$LDIFFILTER < $SEARCHOUT > $SEARCHFLT +echo "Filtering original ldif used to create database..." +$LDIFFILTER < $LDIF > $LDIFFLT +echo "Comparing filter output..." +$CMP $SEARCHFLT $LDIFFLT > $CMPOUT + +if test $? != 0 ; then + echo "Comparison failed" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit 1 +fi + +echo ">>>>> Test succeeded (first half)" + +if [ "$MEMBEROF" = memberofno ]; then + test $KILLSERVERS != no && kill -HUP $KILLPIDS + + test $KILLSERVERS != no && wait + + exit 0 +fi + +echo "Adding memberof overlay to database configuration..." + +if [ "$MEMBEROF" = memberofmod ]; then + echo "Inserting memberof module on provider..." + $LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <<EOF > $TESTOUT 2>&1 +dn: cn=module,cn=config +objectClass: olcModuleList +cn: module +olcModulePath: ../servers/slapd/overlays +olcModuleLoad: memberof.la +EOF + RC=$? + if test $RC != 0 ; then + echo "ldapadd failed for moduleLoad ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC + fi +fi + +$LDAPADD -H $URI1 -D 'cn=config' -w `cat $CONFIGPWF` \ + >> $TESTOUT 2>&1 <<EOF +dn: olcOverlay={1}memberof,olcDatabase={1}$BACKEND,cn=config +objectClass: olcOverlayConfig +objectClass: olcMemberofConfig +olcOverlay: {1}memberof +olcMemberOfGroupOC: groupOfNames +olcMemberOfMemberAD: member +olcMemberOfMemberOfAD: memberOf + +EOF +RC=$? +if test $RC != 0 ; then + echo "ldapadd failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Recreating group entries to set memberof values..." +$LDAPMODIFY -H $URI1 \ + -D "cn=Manager,$BASEDN" -w secret \ + >> $TESTOUT 2>&1 <<EOF +dn: cn=Rabbits,ou=Groups,$BASEDN +changetype: modify +replace: member +member: cn=Roger Rabbit,ou=People,$BASEDN +member: cn=Jessica Rabbit,ou=People,$BASEDN + +dn: cn=Leporidae,ou=Groups,$BASEDN +changetype: modify +replace: member +member: cn=Bugs Bunny,ou=People,$BASEDN +member: cn=Rabbits,ou=Groups,$BASEDN + +dn: cn=A-M,ou=Groups,$BASEDN +changetype: modify +replace: member +member: cn=Baby Herman,ou=People,$BASEDN +member: cn=Bugs Bunny,ou=People,$BASEDN +member: cn=Daffy Duck,ou=People,$BASEDN +member: cn=Elmer Fudd,ou=People,$BASEDN +member: cn=Foghorn Leghorn,ou=People,$BASEDN +member: cn=Jessica Rabbit,ou=People,$BASEDN + +dn: cn=N-Z,ou=Groups,$BASEDN +changetype: modify +replace: member +member: cn=Porky Pig,ou=People,$BASEDN +member: cn=Road Runner,ou=People,$BASEDN +member: cn=Roger Rabbit,ou=People,$BASEDN +member: cn=Tweety Bird,ou=People,$BASEDN +member: cn=Wile E. Coyote,ou=People,$BASEDN +member: cn=Yosemite Sam,ou=People,$BASEDN + +dn: cn=Humans,ou=Groups,$BASEDN +changetype: modify +replace: member +member: cn=Elmer Fudd,ou=People,$BASEDN +member: cn=Yosemite Sam,ou=People,$BASEDN + +dn: cn=Looney Tunes,ou=Groups,$BASEDN +changetype: modify +replace: member +member: cn=Porky Pig,ou=People,$BASEDN +member: cn=Daffy Duck,ou=People,$BASEDN +member: cn=Elmer Fudd,ou=People,$BASEDN +member: cn=Bugs Bunny,ou=People,$BASEDN +member: cn=Tweety Bird,ou=People,$BASEDN + +dn: cn=Desert Foes,ou=Groups,$BASEDN +changetype: modify +replace: member +member: cn=Road Runner,ou=People,$BASEDN +member: cn=Wile E. Coyote,ou=People,$BASEDN + +dn: cn=Mixer1,ou=Groups,$BASEDN +changetype: modify +replace: member +member: cn=Leporidae,ou=Groups,$BASEDN +member: cn=Desert Foes,ou=Groups,$BASEDN +member: cn=Foghorn Leghorn,ou=People,$BASEDN + +dn: cn=Mixer2,ou=Groups,$BASEDN +changetype: modify +replace: member +member: cn=Humans,ou=Groups,$BASEDN +member: cn=Baby Herman,ou=People,$BASEDN + +dn: cn=Mixer3,ou=Groups,$BASEDN +changetype: modify +replace: member +member: cn=Desert Foes,ou=Groups,$BASEDN +member: cn=Porky Pig,ou=People,$BASEDN + +dn: cn=Mixer4,ou=Groups,$BASEDN +changetype: modify +replace: member +member: cn=Mixer1,ou=Groups,$BASEDN +member: cn=Mixer2,ou=Groups,$BASEDN +member: cn=Foghorn Leghorn,ou=People,$BASEDN + +dn: cn=Mixer5,ou=Groups,$BASEDN +changetype: modify +replace: member +member: cn=Mixer2,ou=Groups,$BASEDN +member: cn=Mixer3,ou=Groups,$BASEDN +member: cn=A-M,ou=Groups,$BASEDN + +dn: cn=Endless Loop,ou=Groups,$BASEDN +changetype: modify +replace: member +member: cn=Road Runner,ou=People,$BASEDN +member: cn=Loop\, Endless,ou=Groups,$BASEDN + +dn: cn=Loop\, Endless,ou=Groups,$BASEDN +changetype: modify +replace: member +member: cn=Wile E. Coyote,ou=People,$BASEDN +member: cn=Endless Loop,ou=Groups,$BASEDN + +EOF +RC=$? +if test $RC != 0 ; then + echo "ldapmodify failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Moving previous results to $SEARCHOUT.0" +mv $SEARCHOUT $SEARCHOUT.0 + +echo "Re-search the entire database..." +echo "# Re-search the entire database after adding memberof configuration..." >> $SEARCHOUT +$LDAPSEARCH -S "" -b "$BASEDN" -H $URI1 \ + '(objectClass=*)' '*' memberOf >> $SEARCHOUT 2>&1 +RC=$? +if test $RC != 0 ; then + echo "ldapsearch failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Search for memberOf=cn=Mixer3..." +echo "# Search for memberOf=cn=Mixer3..." >> $SEARCHOUT +$LDAPSEARCH -S "" -b "$BASEDN" -H $URI1 \ + "(memberOf=cn=Mixer3,ou=Groups,$BASEDN)" '*' memberof >> $SEARCHOUT 2>&1 +RC=$? +if test $RC != 0 ; then + echo "ldapsearch failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Running ldapmodify to enable nested memberOf filter..." +$LDAPMODIFY -H $URI1 -D 'cn=config' -w `cat $CONFIGPWF` \ + >> $TESTOUT 2>&1 <<EOF +dn: olcOverlay={0}nestgroup,olcDatabase={1}$BACKEND,cn=config +changetype: modify +replace: olcNestgroupFlags +olcNestgroupFlags: memberof-filter + +EOF +RC=$? +if test $RC != 0 ; then + echo "ldapmodify failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Re-search for memberOf=cn=Mixer3 with filter nesting..." +echo "# Re-search for memberOf=cn=Mixer3 with filter nesting..." >> $SEARCHOUT +$LDAPSEARCH -S "" -b "$BASEDN" -H $URI1 \ + "(memberOf=cn=Mixer3,ou=Groups,$BASEDN)" '*' memberof >> $SEARCHOUT 2>&1 +RC=$? +if test $RC != 0 ; then + echo "ldapsearch failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Running ldapmodify to also enable nested memberOf values..." +$LDAPMODIFY -H $URI1 -D 'cn=config' -w `cat $CONFIGPWF` \ + >> $TESTOUT 2>&1 <<EOF +dn: olcOverlay={0}nestgroup,olcDatabase={1}$BACKEND,cn=config +changetype: modify +add: olcNestgroupFlags +olcNestgroupFlags: memberof-values + +EOF +RC=$? +if test $RC != 0 ; then + echo "ldapmodify failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Re-search for memberOf=cn=Mixer3 with filter and value nesting..." +echo "# Re-search for memberOf=cn=Mixer3 with filter and value nesting..." >> $SEARCHOUT +$LDAPSEARCH -S "" -b "$BASEDN" -H $URI1 \ + "(memberOf=cn=Mixer3,ou=Groups,$BASEDN)" '*' memberof >> $SEARCHOUT 2>&1 +RC=$? +if test $RC != 0 ; then + echo "ldapsearch failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +echo "Re-search the entire database with memberof value nesting..." +echo "# Re-search the entire database with memberof value nesting..." >> $SEARCHOUT +$LDAPSEARCH -S "" -b "$BASEDN" -H $URI1 \ + '(objectClass=*)' '*' memberOf >> $SEARCHOUT 2>&1 +RC=$? +if test $RC != 0 ; then + echo "ldapsearch failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + +test $KILLSERVERS != no && kill -HUP $KILLPIDS + +LDIF=$NESTGROUPOUT2 + +echo "Filtering ldapsearch results..." +$LDIFFILTER < $SEARCHOUT > $SEARCHFLT +echo "Filtering original ldif used to create database..." +$LDIFFILTER < $LDIF > $LDIFFLT +echo "Comparing filter output..." +$CMP $SEARCHFLT $LDIFFLT > $CMPOUT + +if test $? != 0 ; then + echo "Comparison failed" + exit 1 +fi + +echo ">>>>> Test succeeded" + +test $KILLSERVERS != no && wait + +exit 0 |