From 3102bdaf142acf3c952310cb620274258492a795 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 3 Jun 2024 07:34:56 +0200 Subject: Merging upstream version 2.6.8+dfsg. Signed-off-by: Daniel Baumann --- tests/Makefile.in | 2 +- tests/data/ditcontentrules.conf | 2 +- tests/data/lloadd-anon.conf | 2 +- tests/data/lloadd-backend-issues.conf | 2 +- tests/data/lloadd-empty.conf | 2 +- tests/data/lloadd-sasl.conf | 2 +- tests/data/lloadd-tls.conf | 2 +- tests/data/lloadd.conf | 2 +- tests/data/memberof.out | 64 ++ tests/data/nestgroup.out.1 | 389 ++++++++++++ tests/data/nestgroup.out.2 | 606 +++++++++++++++++++ tests/data/regressions/its4184/its4184 | 2 +- tests/data/regressions/its4326/its4326 | 2 +- tests/data/regressions/its4326/slapd.conf | 2 +- tests/data/regressions/its4336/its4336 | 2 +- tests/data/regressions/its4336/slapd.conf | 2 +- tests/data/regressions/its4448/its4448 | 2 +- tests/data/regressions/its4448/slapd-meta.conf | 2 +- tests/data/regressions/its6794/its6794 | 2 +- tests/data/regressions/its6794/slapd-glue.conf | 2 +- tests/data/regressions/its7573/its7573 | 2 +- tests/data/regressions/its8427/its8427 | 2 +- tests/data/regressions/its8427/its8427-2 | 2 +- tests/data/regressions/its8427/slapd.conf | 2 +- tests/data/regressions/its8444/its8444 | 2 +- tests/data/regressions/its8521/its8521 | 2 +- tests/data/regressions/its8616/its8616 | 2 +- tests/data/regressions/its8663/its8663 | 2 +- tests/data/regressions/its8667/its8667 | 2 +- tests/data/regressions/its8721/its8721 | 2 +- tests/data/regressions/its8721/slapd-backend.conf | 2 +- tests/data/regressions/its8721/slapd-proxy.conf | 2 +- tests/data/regressions/its8752/its8752 | 2 +- tests/data/regressions/its8752/slapd.conf | 2 +- tests/data/regressions/its8752/slapd.conf.mpr | 2 +- tests/data/regressions/its8800/its8800 | 2 +- tests/data/regressions/its9051/its9051 | 2 +- tests/data/regressions/its9282/its9282 | 2 +- tests/data/regressions/its9288/its9288 | 2 +- tests/data/regressions/its9288/slapd-proxy.conf | 2 +- tests/data/regressions/its9338/its9338 | 2 +- tests/data/regressions/its9400/its9400 | 2 +- .../regressions/its9400/slapd-proxy-idassert.conf | 2 +- tests/data/regressions/its9468/its9468 | 2 +- tests/data/regressions/its9468/slapd-proxy.conf | 2 +- tests/data/regressions/its9468/slapd-remote.conf | 2 +- tests/data/regressions/its9863/its9863 | 2 +- tests/data/retcode.conf | 2 +- tests/data/slapd-2db.conf | 2 +- tests/data/slapd-aci.conf | 2 +- tests/data/slapd-acl.conf | 2 +- tests/data/slapd-asyncmeta.conf | 2 +- tests/data/slapd-cache-provider-proxyauthz.conf | 2 +- tests/data/slapd-cache-provider.conf | 2 +- tests/data/slapd-chain1.conf | 2 +- tests/data/slapd-chain2.conf | 2 +- tests/data/slapd-component.conf | 2 +- tests/data/slapd-dds.conf | 2 +- tests/data/slapd-deltasync-consumer.conf | 2 +- tests/data/slapd-deltasync-provider.conf | 2 +- tests/data/slapd-deref.conf | 2 +- tests/data/slapd-dirsync1.conf | 2 +- tests/data/slapd-dn.conf | 2 +- tests/data/slapd-dnssrv.conf | 2 +- tests/data/slapd-dsee-consumer1.conf | 2 +- tests/data/slapd-dsee-consumer2.conf | 2 +- tests/data/slapd-dynlist.conf | 2 +- tests/data/slapd-emptydn.conf | 2 +- tests/data/slapd-glue-ldap.conf | 2 +- tests/data/slapd-glue-syncrepl1.conf | 2 +- tests/data/slapd-glue-syncrepl2.conf | 2 +- tests/data/slapd-glue.conf | 2 +- tests/data/slapd-homedir.conf | 2 +- tests/data/slapd-idassert.conf | 2 +- tests/data/slapd-ldapglue.conf | 2 +- tests/data/slapd-ldapgluegroups.conf | 2 +- tests/data/slapd-ldapgluepeople.conf | 2 +- tests/data/slapd-limits.conf | 2 +- tests/data/slapd-lload.conf | 2 +- tests/data/slapd-meta-target1.conf | 2 +- tests/data/slapd-meta-target2.conf | 2 +- tests/data/slapd-meta.conf | 2 +- tests/data/slapd-nis-provider.conf | 2 +- tests/data/slapd-passwd.conf | 2 +- tests/data/slapd-ppolicy.conf | 2 +- tests/data/slapd-provider.conf | 2 +- tests/data/slapd-proxyauthz.conf | 2 +- tests/data/slapd-proxycache.conf | 2 +- tests/data/slapd-proxytimeout.conf | 2 +- tests/data/slapd-pw.conf | 2 +- tests/data/slapd-ref-consumer.conf | 2 +- tests/data/slapd-referrals.conf | 2 +- tests/data/slapd-refint.conf | 2 +- tests/data/slapd-relay.conf | 2 +- tests/data/slapd-repl-consumer-remote.conf | 2 +- tests/data/slapd-retcode.conf | 2 +- tests/data/slapd-schema.conf | 2 +- tests/data/slapd-sql-syncrepl-provider.conf | 2 +- tests/data/slapd-sql.conf | 2 +- .../data/slapd-syncrepl-consumer-persist-ldap.conf | 2 +- tests/data/slapd-syncrepl-consumer-persist1.conf | 2 +- tests/data/slapd-syncrepl-consumer-persist3.conf | 2 +- tests/data/slapd-syncrepl-consumer-refresh1.conf | 2 +- tests/data/slapd-syncrepl-consumer-refresh2.conf | 2 +- tests/data/slapd-syncrepl-multiproxy.conf | 2 +- tests/data/slapd-syncrepl-provider.conf | 2 +- tests/data/slapd-tls-sasl.conf | 2 +- tests/data/slapd-tls.conf | 2 +- tests/data/slapd-translucent-local.conf | 2 +- tests/data/slapd-translucent-remote.conf | 2 +- tests/data/slapd-unique.conf | 2 +- tests/data/slapd-valregex.conf | 2 +- tests/data/slapd-valsort.conf | 2 +- tests/data/slapd-whoami.conf | 2 +- tests/data/slapd.conf | 2 +- tests/data/slapd2.conf | 2 +- tests/data/test.schema | 2 +- tests/progs/Makefile.in | 2 +- tests/progs/ldif-filter.c | 2 +- tests/progs/slapd-addel.c | 2 +- tests/progs/slapd-auth.c | 2 +- tests/progs/slapd-bind.c | 2 +- tests/progs/slapd-common.c | 2 +- tests/progs/slapd-common.h | 2 +- tests/progs/slapd-modify.c | 2 +- tests/progs/slapd-modrdn.c | 2 +- tests/progs/slapd-mtread.c | 2 +- tests/progs/slapd-read.c | 2 +- tests/progs/slapd-search.c | 2 +- tests/progs/slapd-tester.c | 2 +- tests/progs/slapd-watcher.c | 2 +- tests/run.in | 5 +- tests/scripts/all | 2 +- tests/scripts/conf.sh | 5 +- tests/scripts/confdirsync.sh | 2 +- tests/scripts/defines.sh | 5 +- tests/scripts/functions.sh | 2 +- tests/scripts/gdb.py | 2 +- tests/scripts/grandchild_wrapper.py | 2 +- tests/scripts/its-all | 2 +- tests/scripts/lloadd-all | 2 +- tests/scripts/lloadd/test000-rootdse | 2 +- tests/scripts/lloadd/test001-backend-issues | 2 +- tests/scripts/lloadd/test002-load | 2 +- tests/scripts/lloadd/test003-cnconfig | 2 +- tests/scripts/lloadd/test004-monitor | 2 +- tests/scripts/lloadd/test005-tls | 2 +- tests/scripts/lloadd/test006-sasl | 4 +- tests/scripts/lloadd/test007-coherence | 2 +- tests/scripts/monitor_data.sh | 2 +- tests/scripts/passwd-search | 2 +- tests/scripts/relay | 2 +- tests/scripts/setup_kdc.sh | 2 +- tests/scripts/sql-all | 2 +- tests/scripts/sql-test000-read | 2 +- tests/scripts/sql-test001-concurrency | 2 +- tests/scripts/sql-test900-write | 2 +- tests/scripts/sql-test901-syncrepl | 2 +- tests/scripts/start-server | 2 +- tests/scripts/start-server-nolog | 2 +- tests/scripts/start-server2 | 2 +- tests/scripts/start-server2-nolog | 2 +- tests/scripts/startup_nis_ldap_server.sh | 2 +- tests/scripts/test000-rootdse | 2 +- tests/scripts/test001-slapadd | 2 +- tests/scripts/test002-populate | 2 +- tests/scripts/test003-search | 2 +- tests/scripts/test004-modify | 2 +- tests/scripts/test005-modrdn | 2 +- tests/scripts/test006-acls | 2 +- tests/scripts/test007-slapmodify | 2 +- tests/scripts/test008-concurrency | 2 +- tests/scripts/test009-referral | 2 +- tests/scripts/test010-passwd | 2 +- tests/scripts/test011-glue-slapadd | 2 +- tests/scripts/test012-glue-populate | 2 +- tests/scripts/test013-language | 2 +- tests/scripts/test014-whoami | 2 +- tests/scripts/test015-xsearch | 2 +- tests/scripts/test016-subref | 2 +- tests/scripts/test017-syncreplication-refresh | 2 +- tests/scripts/test018-syncreplication-persist | 2 +- tests/scripts/test019-syncreplication-cascade | 2 +- tests/scripts/test020-proxycache | 2 +- tests/scripts/test021-certificate | 2 +- tests/scripts/test022-ppolicy | 2 +- tests/scripts/test023-refint | 2 +- tests/scripts/test024-unique | 2 +- tests/scripts/test025-limits | 2 +- tests/scripts/test026-dn | 2 +- tests/scripts/test027-emptydn | 2 +- tests/scripts/test028-idassert | 6 +- tests/scripts/test029-ldapglue | 6 +- tests/scripts/test030-relay | 2 +- tests/scripts/test031-component-filter | 2 +- tests/scripts/test032-chain | 2 +- tests/scripts/test033-glue-syncrepl | 2 +- tests/scripts/test034-translucent | 2 +- tests/scripts/test035-meta | 2 +- tests/scripts/test036-meta-concurrency | 2 +- tests/scripts/test037-manage | 2 +- tests/scripts/test038-retcode | 2 +- tests/scripts/test039-glue-ldap-concurrency | 2 +- tests/scripts/test040-subtree-rename | 2 +- tests/scripts/test041-aci | 2 +- tests/scripts/test042-valsort | 2 +- tests/scripts/test043-delta-syncrepl | 2 +- tests/scripts/test044-dynlist | 2 +- tests/scripts/test045-syncreplication-proxied | 2 +- tests/scripts/test046-dds | 2 +- tests/scripts/test047-ldap | 2 +- tests/scripts/test048-syncrepl-multiproxy | 2 +- tests/scripts/test049-sync-config | 2 +- tests/scripts/test050-syncrepl-multiprovider | 2 +- tests/scripts/test051-config-undo | 2 +- tests/scripts/test052-memberof | 57 +- tests/scripts/test053-syncprov-glue | 2 +- .../scripts/test054-syncreplication-parallel-load | 2 +- tests/scripts/test055-valregex | 2 +- tests/scripts/test056-monitor | 2 +- tests/scripts/test057-memberof-refint | 2 +- tests/scripts/test058-syncrepl-asymmetric | 2 +- tests/scripts/test059-consumer-config | 2 +- tests/scripts/test060-mt-hot | 2 +- tests/scripts/test061-syncreplication-initiation | 2 +- tests/scripts/test062-config-delete | 2 +- tests/scripts/test063-delta-multiprovider | 2 +- tests/scripts/test064-constraint | 2 +- tests/scripts/test065-proxyauthz | 2 +- tests/scripts/test066-autoca | 2 +- tests/scripts/test067-tls | 2 +- tests/scripts/test068-sasl-tls-external | 2 +- tests/scripts/test069-delta-multiprovider-starttls | 2 +- tests/scripts/test070-delta-multiprovider-ldaps | 2 +- tests/scripts/test071-dirsync | 2 +- tests/scripts/test072-dsee-sync | 2 +- tests/scripts/test073-asyncmeta | 2 +- tests/scripts/test074-asyncmeta-concurrency | 2 +- tests/scripts/test075-dsee-persist | 2 +- tests/scripts/test076-authid-rewrite | 11 +- tests/scripts/test077-sasl-gssapi | 2 +- tests/scripts/test078-persistent-sessionlog | 2 +- tests/scripts/test079-proxy-timeout | 2 +- tests/scripts/test080-hotp | 2 +- tests/scripts/test081-totp | 2 +- tests/scripts/test081-totp.py | 2 +- tests/scripts/test082-remoteauth | 2 +- tests/scripts/test083-argon2 | 2 +- tests/scripts/test084-deref | 2 +- tests/scripts/test085-homedir | 2 +- tests/scripts/test086-delta-consumer-config | 2 +- tests/scripts/test087-librewrite | 2 +- tests/scripts/test088-syncprov-glue-rwm | 2 +- tests/scripts/test089-nestgroup | 662 +++++++++++++++++++++ 254 files changed, 2046 insertions(+), 258 deletions(-) create mode 100644 tests/data/nestgroup.out.1 create mode 100644 tests/data/nestgroup.out.2 create mode 100755 tests/scripts/test089-nestgroup (limited to 'tests') diff --git a/tests/Makefile.in b/tests/Makefile.in index 3589760..defae8c 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/ditcontentrules.conf b/tests/data/ditcontentrules.conf index 22d80cd..0b23177 100644 --- a/tests/data/ditcontentrules.conf +++ b/tests/data/ditcontentrules.conf @@ -1,7 +1,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/lloadd-anon.conf b/tests/data/lloadd-anon.conf index 11d54d4..5806274 100644 --- a/tests/data/lloadd-anon.conf +++ b/tests/data/lloadd-anon.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/lloadd-backend-issues.conf b/tests/data/lloadd-backend-issues.conf index b2d78ef..2fcb7b7 100644 --- a/tests/data/lloadd-backend-issues.conf +++ b/tests/data/lloadd-backend-issues.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/lloadd-empty.conf b/tests/data/lloadd-empty.conf index a5b0ac6..e9d6ae8 100644 --- a/tests/data/lloadd-empty.conf +++ b/tests/data/lloadd-empty.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/lloadd-sasl.conf b/tests/data/lloadd-sasl.conf index 556cf7c..dfcd42a 100644 --- a/tests/data/lloadd-sasl.conf +++ b/tests/data/lloadd-sasl.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/lloadd-tls.conf b/tests/data/lloadd-tls.conf index 4ce489e..a046ef8 100644 --- a/tests/data/lloadd-tls.conf +++ b/tests/data/lloadd-tls.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/lloadd.conf b/tests/data/lloadd.conf index 2f3818e..2643e58 100644 --- a/tests/data/lloadd.conf +++ b/tests/data/lloadd.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/memberof.out b/tests/data/memberof.out index 82fb924..987fd23 100644 --- a/tests/data/memberof.out +++ b/tests/data/memberof.out @@ -339,3 +339,67 @@ sn: person2 memberOfB: cn=group2,ou=Groups,dc=example,dc=com memberOfC: cn=group1,ou=Groups,dc=example,dc=com +# Re-search the entire database after adding out-of-order groups/users... +dn: dc=example,dc=com +objectClass: organization +objectClass: dcObject +o: Example, Inc. +dc: example + +dn: cn=group1,ou=Groups,dc=example,dc=com +objectClass: groupA +cn: group1 +memberA: cn=person1,ou=People,dc=example,dc=com +memberA: cn=person2,ou=People,dc=example,dc=com + +dn: cn=group2,ou=Groups,dc=example,dc=com +objectClass: groupB +cn: group2 +memberB: cn=person1,ou=People,dc=example,dc=com +memberB: cn=person2,ou=People,dc=example,dc=com + +dn: cn=group3,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: group3 +member: cn=New Person,ou=People,dc=example,dc=com +member: cn=New Group,ou=Groups,dc=example,dc=com + +dn: ou=Groups,dc=example,dc=com +objectClass: organizationalUnit +ou: Groups + +dn: cn=New Group,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: New Group +member: cn=New Person,ou=People,dc=example,dc=com +memberOf: cn=group3,ou=Groups,dc=example,dc=com + +dn: cn=New Person,ou=People,dc=example,dc=com +objectClass: person +cn: New Person +sn: Person +memberOf: cn=group3,ou=Groups,dc=example,dc=com +memberOf: cn=New Group,ou=Groups,dc=example,dc=com + +dn: ou=People,dc=example,dc=com +objectClass: organizationalUnit +ou: People + +dn: cn=person1,ou=People,dc=example,dc=com +objectClass: person +objectClass: groupMemberA +objectClass: groupMemberB +cn: person1 +sn: person1 +memberOfB: cn=group2,ou=Groups,dc=example,dc=com +memberOfC: cn=group1,ou=Groups,dc=example,dc=com + +dn: cn=person2,ou=People,dc=example,dc=com +objectClass: person +objectClass: groupMemberA +objectClass: groupMemberB +cn: person2 +sn: person2 +memberOfB: cn=group2,ou=Groups,dc=example,dc=com +memberOfC: cn=group1,ou=Groups,dc=example,dc=com + diff --git a/tests/data/nestgroup.out.1 b/tests/data/nestgroup.out.1 new file mode 100644 index 0000000..93716ac --- /dev/null +++ b/tests/data/nestgroup.out.1 @@ -0,0 +1,389 @@ +# Search the entire database... +dn: cn=A-M,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: A-M +member: cn=Baby Herman,ou=People,dc=example,dc=com +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Daffy Duck,ou=People,dc=example,dc=com +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Foghorn Leghorn,ou=People,dc=example,dc=com +member: cn=Jessica Rabbit,ou=People,dc=example,dc=com + +dn: cn=Baby Herman,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Baby Herman +sn: Herman + +dn: cn=Bugs Bunny,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Bugs Bunny +sn: Bunny + +dn: cn=Daffy Duck,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Daffy Duck +sn: Duck + +dn: cn=Desert Foes,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Desert Foes +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com + +dn: cn=Elmer Fudd,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Elmer Fudd +sn: Fudd + +dn: cn=Endless Loop,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Endless Loop +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Loop\2C Endless,ou=Groups,dc=example,dc=com + +dn: dc=example,dc=com +objectClass: organization +objectClass: dcObject +o: Example, Inc. +dc: example + +dn: cn=Foghorn Leghorn,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Foghorn Leghorn +sn: Leghorn + +dn: ou=Groups,dc=example,dc=com +objectClass: organizationalUnit +ou: Groups + +dn: cn=Humans,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Humans +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Yosemite Sam,ou=People,dc=example,dc=com + +dn: cn=Jessica Rabbit,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Jessica Rabbit +sn: Rabbit + +dn: cn=Leporidae,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Leporidae +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Rabbits,ou=Groups,dc=example,dc=com + +dn: cn=Looney Tunes,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Looney Tunes +member: cn=Porky Pig,ou=People,dc=example,dc=com +member: cn=Daffy Duck,ou=People,dc=example,dc=com +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Tweety Bird,ou=People,dc=example,dc=com + +dn: cn=Loop\2C Endless,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Loop, Endless +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com +member: cn=Endless Loop,ou=Groups,dc=example,dc=com + +dn: cn=Mixer1,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer1 +member: cn=Leporidae,ou=Groups,dc=example,dc=com +member: cn=Desert Foes,ou=Groups,dc=example,dc=com +member: cn=Foghorn Leghorn,ou=People,dc=example,dc=com + +dn: cn=Mixer2,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer2 +member: cn=Humans,ou=Groups,dc=example,dc=com +member: cn=Baby Herman,ou=People,dc=example,dc=com + +dn: cn=Mixer3,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer3 +member: cn=Desert Foes,ou=Groups,dc=example,dc=com +member: cn=Porky Pig,ou=People,dc=example,dc=com + +dn: cn=Mixer4,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer4 +member: cn=Mixer1,ou=Groups,dc=example,dc=com +member: cn=Mixer2,ou=Groups,dc=example,dc=com +member: cn=Foghorn Leghorn,ou=People,dc=example,dc=com + +dn: cn=Mixer5,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer5 +member: cn=Mixer2,ou=Groups,dc=example,dc=com +member: cn=Mixer3,ou=Groups,dc=example,dc=com +member: cn=A-M,ou=Groups,dc=example,dc=com + +dn: cn=N-Z,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: N-Z +member: cn=Porky Pig,ou=People,dc=example,dc=com +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Roger Rabbit,ou=People,dc=example,dc=com +member: cn=Tweety Bird,ou=People,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com +member: cn=Yosemite Sam,ou=People,dc=example,dc=com + +dn: ou=People,dc=example,dc=com +objectClass: organizationalUnit +ou: People + +dn: cn=Porky Pig,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Porky Pig +sn: Pig + +dn: cn=Rabbits,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Rabbits +member: cn=Roger Rabbit,ou=People,dc=example,dc=com +member: cn=Jessica Rabbit,ou=People,dc=example,dc=com + +dn: cn=Road Runner,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Road Runner +sn: Runner + +dn: cn=Roger Rabbit,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Roger Rabbit +sn: Rabbit + +dn: cn=Tweety Bird,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Tweety Bird +sn: Bird + +dn: cn=Wile E. Coyote,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Wile E. Coyote +sn: Coyote + +dn: cn=Yosemite Sam,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Yosemite Sam +sn: Sam + +# Search for member=cn=Bugs Bunny... +dn: cn=A-M,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: A-M +member: cn=Baby Herman,ou=People,dc=example,dc=com +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Daffy Duck,ou=People,dc=example,dc=com +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Foghorn Leghorn,ou=People,dc=example,dc=com +member: cn=Jessica Rabbit,ou=People,dc=example,dc=com + +dn: cn=Leporidae,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Leporidae +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Rabbits,ou=Groups,dc=example,dc=com + +dn: cn=Looney Tunes,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Looney Tunes +member: cn=Porky Pig,ou=People,dc=example,dc=com +member: cn=Daffy Duck,ou=People,dc=example,dc=com +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Tweety Bird,ou=People,dc=example,dc=com + +# Re-search for nested member=cn=Bugs Bunny... +dn: cn=A-M,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: A-M +member: cn=Baby Herman,ou=People,dc=example,dc=com +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Daffy Duck,ou=People,dc=example,dc=com +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Foghorn Leghorn,ou=People,dc=example,dc=com +member: cn=Jessica Rabbit,ou=People,dc=example,dc=com + +dn: cn=Leporidae,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Leporidae +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Rabbits,ou=Groups,dc=example,dc=com + +dn: cn=Looney Tunes,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Looney Tunes +member: cn=Porky Pig,ou=People,dc=example,dc=com +member: cn=Daffy Duck,ou=People,dc=example,dc=com +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Tweety Bird,ou=People,dc=example,dc=com + +dn: cn=Mixer1,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer1 +member: cn=Leporidae,ou=Groups,dc=example,dc=com +member: cn=Desert Foes,ou=Groups,dc=example,dc=com +member: cn=Foghorn Leghorn,ou=People,dc=example,dc=com + +dn: cn=Mixer4,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer4 +member: cn=Mixer1,ou=Groups,dc=example,dc=com +member: cn=Mixer2,ou=Groups,dc=example,dc=com +member: cn=Foghorn Leghorn,ou=People,dc=example,dc=com + +dn: cn=Mixer5,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer5 +member: cn=Mixer2,ou=Groups,dc=example,dc=com +member: cn=Mixer3,ou=Groups,dc=example,dc=com +member: cn=A-M,ou=Groups,dc=example,dc=com + +# Search the expanded groups... +dn: cn=A-M,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: A-M +member: cn=Baby Herman,ou=People,dc=example,dc=com +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Daffy Duck,ou=People,dc=example,dc=com +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Foghorn Leghorn,ou=People,dc=example,dc=com +member: cn=Jessica Rabbit,ou=People,dc=example,dc=com + +dn: cn=Desert Foes,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Desert Foes +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com + +dn: cn=Endless Loop,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Endless Loop +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Loop\2C Endless,ou=Groups,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com +member: cn=Endless Loop,ou=Groups,dc=example,dc=com + +dn: ou=Groups,dc=example,dc=com +objectClass: organizationalUnit +ou: Groups + +dn: cn=Humans,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Humans +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Yosemite Sam,ou=People,dc=example,dc=com + +dn: cn=Leporidae,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Leporidae +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Rabbits,ou=Groups,dc=example,dc=com +member: cn=Roger Rabbit,ou=People,dc=example,dc=com +member: cn=Jessica Rabbit,ou=People,dc=example,dc=com + +dn: cn=Looney Tunes,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Looney Tunes +member: cn=Porky Pig,ou=People,dc=example,dc=com +member: cn=Daffy Duck,ou=People,dc=example,dc=com +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Tweety Bird,ou=People,dc=example,dc=com + +dn: cn=Loop\2C Endless,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Loop, Endless +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com +member: cn=Endless Loop,ou=Groups,dc=example,dc=com +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Loop\2C Endless,ou=Groups,dc=example,dc=com + +dn: cn=Mixer1,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer1 +member: cn=Leporidae,ou=Groups,dc=example,dc=com +member: cn=Desert Foes,ou=Groups,dc=example,dc=com +member: cn=Foghorn Leghorn,ou=People,dc=example,dc=com +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Rabbits,ou=Groups,dc=example,dc=com +member: cn=Roger Rabbit,ou=People,dc=example,dc=com +member: cn=Jessica Rabbit,ou=People,dc=example,dc=com +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com + +dn: cn=Mixer2,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer2 +member: cn=Humans,ou=Groups,dc=example,dc=com +member: cn=Baby Herman,ou=People,dc=example,dc=com +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Yosemite Sam,ou=People,dc=example,dc=com + +dn: cn=Mixer3,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer3 +member: cn=Desert Foes,ou=Groups,dc=example,dc=com +member: cn=Porky Pig,ou=People,dc=example,dc=com +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com + +dn: cn=Mixer4,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer4 +member: cn=Mixer1,ou=Groups,dc=example,dc=com +member: cn=Mixer2,ou=Groups,dc=example,dc=com +member: cn=Foghorn Leghorn,ou=People,dc=example,dc=com +member: cn=Leporidae,ou=Groups,dc=example,dc=com +member: cn=Desert Foes,ou=Groups,dc=example,dc=com +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Rabbits,ou=Groups,dc=example,dc=com +member: cn=Roger Rabbit,ou=People,dc=example,dc=com +member: cn=Jessica Rabbit,ou=People,dc=example,dc=com +member: cn=Humans,ou=Groups,dc=example,dc=com +member: cn=Baby Herman,ou=People,dc=example,dc=com +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Yosemite Sam,ou=People,dc=example,dc=com + +dn: cn=Mixer5,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer5 +member: cn=Mixer2,ou=Groups,dc=example,dc=com +member: cn=Mixer3,ou=Groups,dc=example,dc=com +member: cn=A-M,ou=Groups,dc=example,dc=com +member: cn=Humans,ou=Groups,dc=example,dc=com +member: cn=Baby Herman,ou=People,dc=example,dc=com +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Yosemite Sam,ou=People,dc=example,dc=com +member: cn=Desert Foes,ou=Groups,dc=example,dc=com +member: cn=Porky Pig,ou=People,dc=example,dc=com +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Daffy Duck,ou=People,dc=example,dc=com +member: cn=Foghorn Leghorn,ou=People,dc=example,dc=com +member: cn=Jessica Rabbit,ou=People,dc=example,dc=com + +dn: cn=N-Z,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: N-Z +member: cn=Porky Pig,ou=People,dc=example,dc=com +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Roger Rabbit,ou=People,dc=example,dc=com +member: cn=Tweety Bird,ou=People,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com +member: cn=Yosemite Sam,ou=People,dc=example,dc=com + +dn: cn=Rabbits,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Rabbits +member: cn=Roger Rabbit,ou=People,dc=example,dc=com +member: cn=Jessica Rabbit,ou=People,dc=example,dc=com + diff --git a/tests/data/nestgroup.out.2 b/tests/data/nestgroup.out.2 new file mode 100644 index 0000000..3269c81 --- /dev/null +++ b/tests/data/nestgroup.out.2 @@ -0,0 +1,606 @@ +# Re-search the entire database after adding memberof configuration... +dn: cn=A-M,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: A-M +member: cn=Baby Herman,ou=People,dc=example,dc=com +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Daffy Duck,ou=People,dc=example,dc=com +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Foghorn Leghorn,ou=People,dc=example,dc=com +member: cn=Jessica Rabbit,ou=People,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com + +dn: cn=Baby Herman,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Baby Herman +sn: Herman +memberOf: cn=A-M,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer2,ou=Groups,dc=example,dc=com + +dn: cn=Bugs Bunny,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Bugs Bunny +sn: Bunny +memberOf: cn=Leporidae,ou=Groups,dc=example,dc=com +memberOf: cn=A-M,ou=Groups,dc=example,dc=com +memberOf: cn=Looney Tunes,ou=Groups,dc=example,dc=com + +dn: cn=Daffy Duck,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Daffy Duck +sn: Duck +memberOf: cn=A-M,ou=Groups,dc=example,dc=com +memberOf: cn=Looney Tunes,ou=Groups,dc=example,dc=com + +dn: cn=Desert Foes,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Desert Foes +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com +memberOf: cn=Mixer1,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer3,ou=Groups,dc=example,dc=com + +dn: cn=Elmer Fudd,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Elmer Fudd +sn: Fudd +memberOf: cn=A-M,ou=Groups,dc=example,dc=com +memberOf: cn=Humans,ou=Groups,dc=example,dc=com +memberOf: cn=Looney Tunes,ou=Groups,dc=example,dc=com + +dn: cn=Endless Loop,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Endless Loop +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Loop\2C Endless,ou=Groups,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com +member: cn=Endless Loop,ou=Groups,dc=example,dc=com +memberOf: cn=Loop\2C Endless,ou=Groups,dc=example,dc=com + +dn: dc=example,dc=com +objectClass: organization +objectClass: dcObject +o: Example, Inc. +dc: example + +dn: cn=Foghorn Leghorn,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Foghorn Leghorn +sn: Leghorn +memberOf: cn=A-M,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer1,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer4,ou=Groups,dc=example,dc=com + +dn: ou=Groups,dc=example,dc=com +objectClass: organizationalUnit +ou: Groups + +dn: cn=Humans,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Humans +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Yosemite Sam,ou=People,dc=example,dc=com +memberOf: cn=Mixer2,ou=Groups,dc=example,dc=com + +dn: cn=Jessica Rabbit,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Jessica Rabbit +sn: Rabbit +memberOf: cn=Rabbits,ou=Groups,dc=example,dc=com +memberOf: cn=A-M,ou=Groups,dc=example,dc=com + +dn: cn=Leporidae,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Leporidae +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Rabbits,ou=Groups,dc=example,dc=com +member: cn=Roger Rabbit,ou=People,dc=example,dc=com +member: cn=Jessica Rabbit,ou=People,dc=example,dc=com +memberOf: cn=Mixer1,ou=Groups,dc=example,dc=com + +dn: cn=Looney Tunes,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Looney Tunes +member: cn=Porky Pig,ou=People,dc=example,dc=com +member: cn=Daffy Duck,ou=People,dc=example,dc=com +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Tweety Bird,ou=People,dc=example,dc=com + +dn: cn=Loop\2C Endless,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Loop, Endless +memberOf: cn=Endless Loop,ou=Groups,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com +member: cn=Endless Loop,ou=Groups,dc=example,dc=com +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Loop\2C Endless,ou=Groups,dc=example,dc=com + +dn: cn=Mixer1,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer1 +member: cn=Leporidae,ou=Groups,dc=example,dc=com +member: cn=Desert Foes,ou=Groups,dc=example,dc=com +member: cn=Foghorn Leghorn,ou=People,dc=example,dc=com +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Rabbits,ou=Groups,dc=example,dc=com +member: cn=Roger Rabbit,ou=People,dc=example,dc=com +member: cn=Jessica Rabbit,ou=People,dc=example,dc=com +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com +memberOf: cn=Mixer4,ou=Groups,dc=example,dc=com + +dn: cn=Mixer2,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer2 +member: cn=Humans,ou=Groups,dc=example,dc=com +member: cn=Baby Herman,ou=People,dc=example,dc=com +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Yosemite Sam,ou=People,dc=example,dc=com +memberOf: cn=Mixer4,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com + +dn: cn=Mixer3,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer3 +member: cn=Desert Foes,ou=Groups,dc=example,dc=com +member: cn=Porky Pig,ou=People,dc=example,dc=com +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com + +dn: cn=Mixer4,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer4 +member: cn=Mixer1,ou=Groups,dc=example,dc=com +member: cn=Mixer2,ou=Groups,dc=example,dc=com +member: cn=Foghorn Leghorn,ou=People,dc=example,dc=com +member: cn=Leporidae,ou=Groups,dc=example,dc=com +member: cn=Desert Foes,ou=Groups,dc=example,dc=com +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Rabbits,ou=Groups,dc=example,dc=com +member: cn=Roger Rabbit,ou=People,dc=example,dc=com +member: cn=Jessica Rabbit,ou=People,dc=example,dc=com +member: cn=Humans,ou=Groups,dc=example,dc=com +member: cn=Baby Herman,ou=People,dc=example,dc=com +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Yosemite Sam,ou=People,dc=example,dc=com + +dn: cn=Mixer5,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer5 +member: cn=Mixer2,ou=Groups,dc=example,dc=com +member: cn=Mixer3,ou=Groups,dc=example,dc=com +member: cn=A-M,ou=Groups,dc=example,dc=com +member: cn=Humans,ou=Groups,dc=example,dc=com +member: cn=Baby Herman,ou=People,dc=example,dc=com +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Yosemite Sam,ou=People,dc=example,dc=com +member: cn=Desert Foes,ou=Groups,dc=example,dc=com +member: cn=Porky Pig,ou=People,dc=example,dc=com +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Daffy Duck,ou=People,dc=example,dc=com +member: cn=Foghorn Leghorn,ou=People,dc=example,dc=com +member: cn=Jessica Rabbit,ou=People,dc=example,dc=com + +dn: cn=N-Z,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: N-Z +member: cn=Porky Pig,ou=People,dc=example,dc=com +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Roger Rabbit,ou=People,dc=example,dc=com +member: cn=Tweety Bird,ou=People,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com +member: cn=Yosemite Sam,ou=People,dc=example,dc=com + +dn: ou=People,dc=example,dc=com +objectClass: organizationalUnit +ou: People + +dn: cn=Porky Pig,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Porky Pig +sn: Pig +memberOf: cn=N-Z,ou=Groups,dc=example,dc=com +memberOf: cn=Looney Tunes,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer3,ou=Groups,dc=example,dc=com + +dn: cn=Rabbits,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Rabbits +member: cn=Roger Rabbit,ou=People,dc=example,dc=com +member: cn=Jessica Rabbit,ou=People,dc=example,dc=com +memberOf: cn=Leporidae,ou=Groups,dc=example,dc=com + +dn: cn=Road Runner,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Road Runner +sn: Runner +memberOf: cn=N-Z,ou=Groups,dc=example,dc=com +memberOf: cn=Desert Foes,ou=Groups,dc=example,dc=com +memberOf: cn=Endless Loop,ou=Groups,dc=example,dc=com + +dn: cn=Roger Rabbit,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Roger Rabbit +sn: Rabbit +memberOf: cn=Rabbits,ou=Groups,dc=example,dc=com +memberOf: cn=N-Z,ou=Groups,dc=example,dc=com + +dn: cn=Tweety Bird,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Tweety Bird +sn: Bird +memberOf: cn=N-Z,ou=Groups,dc=example,dc=com +memberOf: cn=Looney Tunes,ou=Groups,dc=example,dc=com + +dn: cn=Wile E. Coyote,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Wile E. Coyote +sn: Coyote +memberOf: cn=N-Z,ou=Groups,dc=example,dc=com +memberOf: cn=Desert Foes,ou=Groups,dc=example,dc=com +memberOf: cn=Loop\2C Endless,ou=Groups,dc=example,dc=com + +dn: cn=Yosemite Sam,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Yosemite Sam +sn: Sam +memberOf: cn=N-Z,ou=Groups,dc=example,dc=com +memberOf: cn=Humans,ou=Groups,dc=example,dc=com + +# Search for memberOf=cn=Mixer3... +dn: cn=Desert Foes,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Desert Foes +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com +memberOf: cn=Mixer1,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer3,ou=Groups,dc=example,dc=com + +dn: cn=Porky Pig,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Porky Pig +sn: Pig +memberOf: cn=N-Z,ou=Groups,dc=example,dc=com +memberOf: cn=Looney Tunes,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer3,ou=Groups,dc=example,dc=com + +# Re-search for memberOf=cn=Mixer3 with filter nesting... +dn: cn=Desert Foes,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Desert Foes +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com +memberOf: cn=Mixer1,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer3,ou=Groups,dc=example,dc=com + +dn: cn=Porky Pig,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Porky Pig +sn: Pig +memberOf: cn=N-Z,ou=Groups,dc=example,dc=com +memberOf: cn=Looney Tunes,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer3,ou=Groups,dc=example,dc=com + +dn: cn=Road Runner,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Road Runner +sn: Runner +memberOf: cn=N-Z,ou=Groups,dc=example,dc=com +memberOf: cn=Desert Foes,ou=Groups,dc=example,dc=com +memberOf: cn=Endless Loop,ou=Groups,dc=example,dc=com + +dn: cn=Wile E. Coyote,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Wile E. Coyote +sn: Coyote +memberOf: cn=N-Z,ou=Groups,dc=example,dc=com +memberOf: cn=Desert Foes,ou=Groups,dc=example,dc=com +memberOf: cn=Loop\2C Endless,ou=Groups,dc=example,dc=com + +# Re-search for memberOf=cn=Mixer3 with filter and value nesting... +dn: cn=Desert Foes,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Desert Foes +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com +memberOf: cn=Mixer1,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer3,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer4,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com + +dn: cn=Porky Pig,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Porky Pig +sn: Pig +memberOf: cn=N-Z,ou=Groups,dc=example,dc=com +memberOf: cn=Looney Tunes,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer3,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com + +dn: cn=Road Runner,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Road Runner +sn: Runner +memberOf: cn=N-Z,ou=Groups,dc=example,dc=com +memberOf: cn=Desert Foes,ou=Groups,dc=example,dc=com +memberOf: cn=Endless Loop,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer1,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer3,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer4,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com +memberOf: cn=Loop\2C Endless,ou=Groups,dc=example,dc=com + +dn: cn=Wile E. Coyote,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Wile E. Coyote +sn: Coyote +memberOf: cn=N-Z,ou=Groups,dc=example,dc=com +memberOf: cn=Desert Foes,ou=Groups,dc=example,dc=com +memberOf: cn=Loop\2C Endless,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer1,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer3,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer4,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com +memberOf: cn=Endless Loop,ou=Groups,dc=example,dc=com + +# Re-search the entire database with memberof value nesting... +dn: cn=A-M,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: A-M +member: cn=Baby Herman,ou=People,dc=example,dc=com +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Daffy Duck,ou=People,dc=example,dc=com +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Foghorn Leghorn,ou=People,dc=example,dc=com +member: cn=Jessica Rabbit,ou=People,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com + +dn: cn=Baby Herman,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Baby Herman +sn: Herman +memberOf: cn=A-M,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer2,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer4,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com + +dn: cn=Bugs Bunny,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Bugs Bunny +sn: Bunny +memberOf: cn=Leporidae,ou=Groups,dc=example,dc=com +memberOf: cn=A-M,ou=Groups,dc=example,dc=com +memberOf: cn=Looney Tunes,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer1,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer4,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com + +dn: cn=Daffy Duck,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Daffy Duck +sn: Duck +memberOf: cn=A-M,ou=Groups,dc=example,dc=com +memberOf: cn=Looney Tunes,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com + +dn: cn=Desert Foes,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Desert Foes +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com +memberOf: cn=Mixer1,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer3,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer4,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com + +dn: cn=Elmer Fudd,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Elmer Fudd +sn: Fudd +memberOf: cn=A-M,ou=Groups,dc=example,dc=com +memberOf: cn=Humans,ou=Groups,dc=example,dc=com +memberOf: cn=Looney Tunes,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer2,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer4,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com + +dn: cn=Endless Loop,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Endless Loop +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Loop\2C Endless,ou=Groups,dc=example,dc=com +memberOf: cn=Loop\2C Endless,ou=Groups,dc=example,dc=com +memberOf: cn=Endless Loop,ou=Groups,dc=example,dc=com + +dn: dc=example,dc=com +objectClass: organization +objectClass: dcObject +o: Example, Inc. +dc: example + +dn: cn=Foghorn Leghorn,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Foghorn Leghorn +sn: Leghorn +memberOf: cn=A-M,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer1,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer4,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com + +dn: ou=Groups,dc=example,dc=com +objectClass: organizationalUnit +ou: Groups + +dn: cn=Humans,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Humans +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Yosemite Sam,ou=People,dc=example,dc=com +memberOf: cn=Mixer2,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer4,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com + +dn: cn=Jessica Rabbit,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Jessica Rabbit +sn: Rabbit +memberOf: cn=Rabbits,ou=Groups,dc=example,dc=com +memberOf: cn=A-M,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer1,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer4,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com +memberOf: cn=Leporidae,ou=Groups,dc=example,dc=com + +dn: cn=Leporidae,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Leporidae +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Rabbits,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer1,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer4,ou=Groups,dc=example,dc=com + +dn: cn=Looney Tunes,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Looney Tunes +member: cn=Porky Pig,ou=People,dc=example,dc=com +member: cn=Daffy Duck,ou=People,dc=example,dc=com +member: cn=Elmer Fudd,ou=People,dc=example,dc=com +member: cn=Bugs Bunny,ou=People,dc=example,dc=com +member: cn=Tweety Bird,ou=People,dc=example,dc=com + +dn: cn=Loop\2C Endless,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Loop, Endless +memberOf: cn=Endless Loop,ou=Groups,dc=example,dc=com +memberOf: cn=Loop\2C Endless,ou=Groups,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com +member: cn=Endless Loop,ou=Groups,dc=example,dc=com + +dn: cn=Mixer1,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer1 +member: cn=Leporidae,ou=Groups,dc=example,dc=com +member: cn=Desert Foes,ou=Groups,dc=example,dc=com +member: cn=Foghorn Leghorn,ou=People,dc=example,dc=com +memberOf: cn=Mixer4,ou=Groups,dc=example,dc=com + +dn: cn=Mixer2,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer2 +member: cn=Humans,ou=Groups,dc=example,dc=com +member: cn=Baby Herman,ou=People,dc=example,dc=com +memberOf: cn=Mixer4,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com + +dn: cn=Mixer3,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer3 +member: cn=Desert Foes,ou=Groups,dc=example,dc=com +member: cn=Porky Pig,ou=People,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com + +dn: cn=Mixer4,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer4 +member: cn=Mixer1,ou=Groups,dc=example,dc=com +member: cn=Mixer2,ou=Groups,dc=example,dc=com +member: cn=Foghorn Leghorn,ou=People,dc=example,dc=com + +dn: cn=Mixer5,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Mixer5 +member: cn=Mixer2,ou=Groups,dc=example,dc=com +member: cn=Mixer3,ou=Groups,dc=example,dc=com +member: cn=A-M,ou=Groups,dc=example,dc=com + +dn: cn=N-Z,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: N-Z +member: cn=Porky Pig,ou=People,dc=example,dc=com +member: cn=Road Runner,ou=People,dc=example,dc=com +member: cn=Roger Rabbit,ou=People,dc=example,dc=com +member: cn=Tweety Bird,ou=People,dc=example,dc=com +member: cn=Wile E. Coyote,ou=People,dc=example,dc=com +member: cn=Yosemite Sam,ou=People,dc=example,dc=com + +dn: ou=People,dc=example,dc=com +objectClass: organizationalUnit +ou: People + +dn: cn=Porky Pig,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Porky Pig +sn: Pig +memberOf: cn=N-Z,ou=Groups,dc=example,dc=com +memberOf: cn=Looney Tunes,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer3,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com + +dn: cn=Rabbits,ou=Groups,dc=example,dc=com +objectClass: groupOfNames +cn: Rabbits +member: cn=Roger Rabbit,ou=People,dc=example,dc=com +member: cn=Jessica Rabbit,ou=People,dc=example,dc=com +memberOf: cn=Leporidae,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer1,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer4,ou=Groups,dc=example,dc=com + +dn: cn=Road Runner,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Road Runner +sn: Runner +memberOf: cn=N-Z,ou=Groups,dc=example,dc=com +memberOf: cn=Desert Foes,ou=Groups,dc=example,dc=com +memberOf: cn=Endless Loop,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer1,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer3,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer4,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com +memberOf: cn=Loop\2C Endless,ou=Groups,dc=example,dc=com + +dn: cn=Roger Rabbit,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Roger Rabbit +sn: Rabbit +memberOf: cn=Rabbits,ou=Groups,dc=example,dc=com +memberOf: cn=N-Z,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer1,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer4,ou=Groups,dc=example,dc=com +memberOf: cn=Leporidae,ou=Groups,dc=example,dc=com + +dn: cn=Tweety Bird,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Tweety Bird +sn: Bird +memberOf: cn=N-Z,ou=Groups,dc=example,dc=com +memberOf: cn=Looney Tunes,ou=Groups,dc=example,dc=com + +dn: cn=Wile E. Coyote,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Wile E. Coyote +sn: Coyote +memberOf: cn=N-Z,ou=Groups,dc=example,dc=com +memberOf: cn=Desert Foes,ou=Groups,dc=example,dc=com +memberOf: cn=Loop\2C Endless,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer1,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer3,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer4,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com +memberOf: cn=Endless Loop,ou=Groups,dc=example,dc=com + +dn: cn=Yosemite Sam,ou=People,dc=example,dc=com +objectClass: inetOrgPerson +cn: Yosemite Sam +sn: Sam +memberOf: cn=N-Z,ou=Groups,dc=example,dc=com +memberOf: cn=Humans,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer2,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer4,ou=Groups,dc=example,dc=com +memberOf: cn=Mixer5,ou=Groups,dc=example,dc=com + diff --git a/tests/data/regressions/its4184/its4184 b/tests/data/regressions/its4184/its4184 index 1b9e216..eb8c911 100755 --- a/tests/data/regressions/its4184/its4184 +++ b/tests/data/regressions/its4184/its4184 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its4326/its4326 b/tests/data/regressions/its4326/its4326 index a7c9025..fc7b00e 100755 --- a/tests/data/regressions/its4326/its4326 +++ b/tests/data/regressions/its4326/its4326 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its4326/slapd.conf b/tests/data/regressions/its4326/slapd.conf index cbdcb70..7f2cd78 100644 --- a/tests/data/regressions/its4326/slapd.conf +++ b/tests/data/regressions/its4326/slapd.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its4336/its4336 b/tests/data/regressions/its4336/its4336 index a3a0b12..6a4f51b 100755 --- a/tests/data/regressions/its4336/its4336 +++ b/tests/data/regressions/its4336/its4336 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its4336/slapd.conf b/tests/data/regressions/its4336/slapd.conf index 3d05cf3..bd46805 100644 --- a/tests/data/regressions/its4336/slapd.conf +++ b/tests/data/regressions/its4336/slapd.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its4448/its4448 b/tests/data/regressions/its4448/its4448 index 281bc95..d679c2d 100755 --- a/tests/data/regressions/its4448/its4448 +++ b/tests/data/regressions/its4448/its4448 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its4448/slapd-meta.conf b/tests/data/regressions/its4448/slapd-meta.conf index 918a970..157feb5 100644 --- a/tests/data/regressions/its4448/slapd-meta.conf +++ b/tests/data/regressions/its4448/slapd-meta.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its6794/its6794 b/tests/data/regressions/its6794/its6794 index 6188df6..761f491 100755 --- a/tests/data/regressions/its6794/its6794 +++ b/tests/data/regressions/its6794/its6794 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its6794/slapd-glue.conf b/tests/data/regressions/its6794/slapd-glue.conf index 9c27168..258f1a3 100644 --- a/tests/data/regressions/its6794/slapd-glue.conf +++ b/tests/data/regressions/its6794/slapd-glue.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its7573/its7573 b/tests/data/regressions/its7573/its7573 index fc4d1ed..a545eca 100755 --- a/tests/data/regressions/its7573/its7573 +++ b/tests/data/regressions/its7573/its7573 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its8427/its8427 b/tests/data/regressions/its8427/its8427 index 344c94d..01b60dc 100755 --- a/tests/data/regressions/its8427/its8427 +++ b/tests/data/regressions/its8427/its8427 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its8427/its8427-2 b/tests/data/regressions/its8427/its8427-2 index ca2ef7d..a0ffe6d 100755 --- a/tests/data/regressions/its8427/its8427-2 +++ b/tests/data/regressions/its8427/its8427-2 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its8427/slapd.conf b/tests/data/regressions/its8427/slapd.conf index 7af8ff8..0d4e1cd 100644 --- a/tests/data/regressions/its8427/slapd.conf +++ b/tests/data/regressions/its8427/slapd.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its8444/its8444 b/tests/data/regressions/its8444/its8444 index 896ddaf..12e4e73 100755 --- a/tests/data/regressions/its8444/its8444 +++ b/tests/data/regressions/its8444/its8444 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its8521/its8521 b/tests/data/regressions/its8521/its8521 index 2eb5409..76990ee 100755 --- a/tests/data/regressions/its8521/its8521 +++ b/tests/data/regressions/its8521/its8521 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its8616/its8616 b/tests/data/regressions/its8616/its8616 index c8a1144..45c0aa5 100755 --- a/tests/data/regressions/its8616/its8616 +++ b/tests/data/regressions/its8616/its8616 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its8663/its8663 b/tests/data/regressions/its8663/its8663 index 2069353..753658c 100755 --- a/tests/data/regressions/its8663/its8663 +++ b/tests/data/regressions/its8663/its8663 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its8667/its8667 b/tests/data/regressions/its8667/its8667 index b4858cc..e4e5389 100755 --- a/tests/data/regressions/its8667/its8667 +++ b/tests/data/regressions/its8667/its8667 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its8721/its8721 b/tests/data/regressions/its8721/its8721 index eb6a070..51087d0 100755 --- a/tests/data/regressions/its8721/its8721 +++ b/tests/data/regressions/its8721/its8721 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its8721/slapd-backend.conf b/tests/data/regressions/its8721/slapd-backend.conf index c06935d..2b679b8 100644 --- a/tests/data/regressions/its8721/slapd-backend.conf +++ b/tests/data/regressions/its8721/slapd-backend.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its8721/slapd-proxy.conf b/tests/data/regressions/its8721/slapd-proxy.conf index 10748b7..50dfb6a 100644 --- a/tests/data/regressions/its8721/slapd-proxy.conf +++ b/tests/data/regressions/its8721/slapd-proxy.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its8752/its8752 b/tests/data/regressions/its8752/its8752 index 02d9896..8bcd9ec 100755 --- a/tests/data/regressions/its8752/its8752 +++ b/tests/data/regressions/its8752/its8752 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its8752/slapd.conf b/tests/data/regressions/its8752/slapd.conf index aca705c..0e2c56a 100644 --- a/tests/data/regressions/its8752/slapd.conf +++ b/tests/data/regressions/its8752/slapd.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its8752/slapd.conf.mpr b/tests/data/regressions/its8752/slapd.conf.mpr index 855eac8..2f380e0 100644 --- a/tests/data/regressions/its8752/slapd.conf.mpr +++ b/tests/data/regressions/its8752/slapd.conf.mpr @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its8800/its8800 b/tests/data/regressions/its8800/its8800 index 1c65a66..01544ba 100755 --- a/tests/data/regressions/its8800/its8800 +++ b/tests/data/regressions/its8800/its8800 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its9051/its9051 b/tests/data/regressions/its9051/its9051 index ed7ee13..866dbfa 100755 --- a/tests/data/regressions/its9051/its9051 +++ b/tests/data/regressions/its9051/its9051 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its9282/its9282 b/tests/data/regressions/its9282/its9282 index 3d55b8a..a194103 100755 --- a/tests/data/regressions/its9282/its9282 +++ b/tests/data/regressions/its9282/its9282 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its9288/its9288 b/tests/data/regressions/its9288/its9288 index 30e67d4..61ecf50 100755 --- a/tests/data/regressions/its9288/its9288 +++ b/tests/data/regressions/its9288/its9288 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its9288/slapd-proxy.conf b/tests/data/regressions/its9288/slapd-proxy.conf index e9df3b7..e07ceb3 100644 --- a/tests/data/regressions/its9288/slapd-proxy.conf +++ b/tests/data/regressions/its9288/slapd-proxy.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its9338/its9338 b/tests/data/regressions/its9338/its9338 index 5010910..ba465fd 100755 --- a/tests/data/regressions/its9338/its9338 +++ b/tests/data/regressions/its9338/its9338 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its9400/its9400 b/tests/data/regressions/its9400/its9400 index e606d17..8ef7f2c 100755 --- a/tests/data/regressions/its9400/its9400 +++ b/tests/data/regressions/its9400/its9400 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its9400/slapd-proxy-idassert.conf b/tests/data/regressions/its9400/slapd-proxy-idassert.conf index 2f2750b..03dda2b 100644 --- a/tests/data/regressions/its9400/slapd-proxy-idassert.conf +++ b/tests/data/regressions/its9400/slapd-proxy-idassert.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its9468/its9468 b/tests/data/regressions/its9468/its9468 index 3e2e70f..9d2d068 100755 --- a/tests/data/regressions/its9468/its9468 +++ b/tests/data/regressions/its9468/its9468 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its9468/slapd-proxy.conf b/tests/data/regressions/its9468/slapd-proxy.conf index 5d0af19..aa56405 100644 --- a/tests/data/regressions/its9468/slapd-proxy.conf +++ b/tests/data/regressions/its9468/slapd-proxy.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its9468/slapd-remote.conf b/tests/data/regressions/its9468/slapd-remote.conf index 15b1c13..c784b18 100644 --- a/tests/data/regressions/its9468/slapd-remote.conf +++ b/tests/data/regressions/its9468/slapd-remote.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/regressions/its9863/its9863 b/tests/data/regressions/its9863/its9863 index d6b4795..56803c8 100755 --- a/tests/data/regressions/its9863/its9863 +++ b/tests/data/regressions/its9863/its9863 @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/retcode.conf b/tests/data/retcode.conf index 7d8b394..4f625ac 100644 --- a/tests/data/retcode.conf +++ b/tests/data/retcode.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-2db.conf b/tests/data/slapd-2db.conf index b285d96..48f6f2f 100644 --- a/tests/data/slapd-2db.conf +++ b/tests/data/slapd-2db.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-aci.conf b/tests/data/slapd-aci.conf index 41e9db7..6e7b47d 100644 --- a/tests/data/slapd-aci.conf +++ b/tests/data/slapd-aci.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-acl.conf b/tests/data/slapd-acl.conf index 66fbe3d..90bb9ba 100644 --- a/tests/data/slapd-acl.conf +++ b/tests/data/slapd-acl.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-asyncmeta.conf b/tests/data/slapd-asyncmeta.conf index 45a793e..9d786c1 100644 --- a/tests/data/slapd-asyncmeta.conf +++ b/tests/data/slapd-asyncmeta.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-cache-provider-proxyauthz.conf b/tests/data/slapd-cache-provider-proxyauthz.conf index 63cb52b..584dfc9 100644 --- a/tests/data/slapd-cache-provider-proxyauthz.conf +++ b/tests/data/slapd-cache-provider-proxyauthz.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-cache-provider.conf b/tests/data/slapd-cache-provider.conf index a248fb0..b2341dc 100644 --- a/tests/data/slapd-cache-provider.conf +++ b/tests/data/slapd-cache-provider.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-chain1.conf b/tests/data/slapd-chain1.conf index 7c7cd79..d121d81 100644 --- a/tests/data/slapd-chain1.conf +++ b/tests/data/slapd-chain1.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-chain2.conf b/tests/data/slapd-chain2.conf index 803c089..909b2e6 100644 --- a/tests/data/slapd-chain2.conf +++ b/tests/data/slapd-chain2.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-component.conf b/tests/data/slapd-component.conf index 5c0f6d1..8232498 100644 --- a/tests/data/slapd-component.conf +++ b/tests/data/slapd-component.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-dds.conf b/tests/data/slapd-dds.conf index dc3b1fa..e9747cc 100644 --- a/tests/data/slapd-dds.conf +++ b/tests/data/slapd-dds.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-deltasync-consumer.conf b/tests/data/slapd-deltasync-consumer.conf index 7e89dc6..3698a10 100644 --- a/tests/data/slapd-deltasync-consumer.conf +++ b/tests/data/slapd-deltasync-consumer.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-deltasync-provider.conf b/tests/data/slapd-deltasync-provider.conf index 844eed5..9a5b7f1 100644 --- a/tests/data/slapd-deltasync-provider.conf +++ b/tests/data/slapd-deltasync-provider.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-deref.conf b/tests/data/slapd-deref.conf index d89a032..f771c2b 100644 --- a/tests/data/slapd-deref.conf +++ b/tests/data/slapd-deref.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-dirsync1.conf b/tests/data/slapd-dirsync1.conf index cb4b8ea..a84622e 100644 --- a/tests/data/slapd-dirsync1.conf +++ b/tests/data/slapd-dirsync1.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-dn.conf b/tests/data/slapd-dn.conf index c277987..c622fb2 100644 --- a/tests/data/slapd-dn.conf +++ b/tests/data/slapd-dn.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-dnssrv.conf b/tests/data/slapd-dnssrv.conf index 048f82e..99d3300 100644 --- a/tests/data/slapd-dnssrv.conf +++ b/tests/data/slapd-dnssrv.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-dsee-consumer1.conf b/tests/data/slapd-dsee-consumer1.conf index 82b27fc..f798701 100644 --- a/tests/data/slapd-dsee-consumer1.conf +++ b/tests/data/slapd-dsee-consumer1.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-dsee-consumer2.conf b/tests/data/slapd-dsee-consumer2.conf index 934efdb..ce26276 100644 --- a/tests/data/slapd-dsee-consumer2.conf +++ b/tests/data/slapd-dsee-consumer2.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-dynlist.conf b/tests/data/slapd-dynlist.conf index b4dc1c4..fb7e06d 100644 --- a/tests/data/slapd-dynlist.conf +++ b/tests/data/slapd-dynlist.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-emptydn.conf b/tests/data/slapd-emptydn.conf index a80b279..523f96c 100644 --- a/tests/data/slapd-emptydn.conf +++ b/tests/data/slapd-emptydn.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-glue-ldap.conf b/tests/data/slapd-glue-ldap.conf index 3474bd2..2e28008 100644 --- a/tests/data/slapd-glue-ldap.conf +++ b/tests/data/slapd-glue-ldap.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-glue-syncrepl1.conf b/tests/data/slapd-glue-syncrepl1.conf index 0f25df8..439fd2d 100644 --- a/tests/data/slapd-glue-syncrepl1.conf +++ b/tests/data/slapd-glue-syncrepl1.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-glue-syncrepl2.conf b/tests/data/slapd-glue-syncrepl2.conf index 7fb82f9..9984fcd 100644 --- a/tests/data/slapd-glue-syncrepl2.conf +++ b/tests/data/slapd-glue-syncrepl2.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-glue.conf b/tests/data/slapd-glue.conf index c32d5a5..b9b1cf9 100644 --- a/tests/data/slapd-glue.conf +++ b/tests/data/slapd-glue.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-homedir.conf b/tests/data/slapd-homedir.conf index 9c51a53..e760b03 100644 --- a/tests/data/slapd-homedir.conf +++ b/tests/data/slapd-homedir.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-idassert.conf b/tests/data/slapd-idassert.conf index 9f93a2b..030820d 100644 --- a/tests/data/slapd-idassert.conf +++ b/tests/data/slapd-idassert.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-ldapglue.conf b/tests/data/slapd-ldapglue.conf index 73b274c..a1eb002 100644 --- a/tests/data/slapd-ldapglue.conf +++ b/tests/data/slapd-ldapglue.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-ldapgluegroups.conf b/tests/data/slapd-ldapgluegroups.conf index 850bdcf..777f694 100644 --- a/tests/data/slapd-ldapgluegroups.conf +++ b/tests/data/slapd-ldapgluegroups.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-ldapgluepeople.conf b/tests/data/slapd-ldapgluepeople.conf index af3def4..43777c1 100644 --- a/tests/data/slapd-ldapgluepeople.conf +++ b/tests/data/slapd-ldapgluepeople.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-limits.conf b/tests/data/slapd-limits.conf index 280cf12..caaa4c2 100644 --- a/tests/data/slapd-limits.conf +++ b/tests/data/slapd-limits.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-lload.conf b/tests/data/slapd-lload.conf index 3e1a832..3b3ae0b 100644 --- a/tests/data/slapd-lload.conf +++ b/tests/data/slapd-lload.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-meta-target1.conf b/tests/data/slapd-meta-target1.conf index 3c6be14..164aaeb 100644 --- a/tests/data/slapd-meta-target1.conf +++ b/tests/data/slapd-meta-target1.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-meta-target2.conf b/tests/data/slapd-meta-target2.conf index 8104a0e..79a9cb0 100644 --- a/tests/data/slapd-meta-target2.conf +++ b/tests/data/slapd-meta-target2.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-meta.conf b/tests/data/slapd-meta.conf index 472fd6f..6fe88b7 100644 --- a/tests/data/slapd-meta.conf +++ b/tests/data/slapd-meta.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-nis-provider.conf b/tests/data/slapd-nis-provider.conf index cbb65d6..27379bc 100644 --- a/tests/data/slapd-nis-provider.conf +++ b/tests/data/slapd-nis-provider.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-passwd.conf b/tests/data/slapd-passwd.conf index c2c887e..bcbf10d 100644 --- a/tests/data/slapd-passwd.conf +++ b/tests/data/slapd-passwd.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-ppolicy.conf b/tests/data/slapd-ppolicy.conf index 561e7ce..6e939cb 100644 --- a/tests/data/slapd-ppolicy.conf +++ b/tests/data/slapd-ppolicy.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-provider.conf b/tests/data/slapd-provider.conf index a31d992..8d0fa8a 100644 --- a/tests/data/slapd-provider.conf +++ b/tests/data/slapd-provider.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-proxyauthz.conf b/tests/data/slapd-proxyauthz.conf index d8c1789..f926a59 100644 --- a/tests/data/slapd-proxyauthz.conf +++ b/tests/data/slapd-proxyauthz.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-proxycache.conf b/tests/data/slapd-proxycache.conf index 032436f..2153836 100644 --- a/tests/data/slapd-proxycache.conf +++ b/tests/data/slapd-proxycache.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-proxytimeout.conf b/tests/data/slapd-proxytimeout.conf index 1c080fe..f4cfffa 100644 --- a/tests/data/slapd-proxytimeout.conf +++ b/tests/data/slapd-proxytimeout.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-pw.conf b/tests/data/slapd-pw.conf index 8980601..602fa68 100644 --- a/tests/data/slapd-pw.conf +++ b/tests/data/slapd-pw.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-ref-consumer.conf b/tests/data/slapd-ref-consumer.conf index 4e0dce8..bc63fa3 100644 --- a/tests/data/slapd-ref-consumer.conf +++ b/tests/data/slapd-ref-consumer.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-referrals.conf b/tests/data/slapd-referrals.conf index 632dccc..7033c03 100644 --- a/tests/data/slapd-referrals.conf +++ b/tests/data/slapd-referrals.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-refint.conf b/tests/data/slapd-refint.conf index 8028bc7..63e7c7c 100644 --- a/tests/data/slapd-refint.conf +++ b/tests/data/slapd-refint.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-relay.conf b/tests/data/slapd-relay.conf index c363979..699a97c 100644 --- a/tests/data/slapd-relay.conf +++ b/tests/data/slapd-relay.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-repl-consumer-remote.conf b/tests/data/slapd-repl-consumer-remote.conf index 80c0333..09b5569 100644 --- a/tests/data/slapd-repl-consumer-remote.conf +++ b/tests/data/slapd-repl-consumer-remote.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-retcode.conf b/tests/data/slapd-retcode.conf index 3e8dfb1..54a3bb0 100644 --- a/tests/data/slapd-retcode.conf +++ b/tests/data/slapd-retcode.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-schema.conf b/tests/data/slapd-schema.conf index ab74655..61ac3d4 100644 --- a/tests/data/slapd-schema.conf +++ b/tests/data/slapd-schema.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-sql-syncrepl-provider.conf b/tests/data/slapd-sql-syncrepl-provider.conf index 85face1..68ad8ee 100644 --- a/tests/data/slapd-sql-syncrepl-provider.conf +++ b/tests/data/slapd-sql-syncrepl-provider.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-sql.conf b/tests/data/slapd-sql.conf index 2aa28a4..0b375e0 100644 --- a/tests/data/slapd-sql.conf +++ b/tests/data/slapd-sql.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-syncrepl-consumer-persist-ldap.conf b/tests/data/slapd-syncrepl-consumer-persist-ldap.conf index 7793e15..fbed8aa 100644 --- a/tests/data/slapd-syncrepl-consumer-persist-ldap.conf +++ b/tests/data/slapd-syncrepl-consumer-persist-ldap.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-syncrepl-consumer-persist1.conf b/tests/data/slapd-syncrepl-consumer-persist1.conf index 22fad13..5c9c207 100644 --- a/tests/data/slapd-syncrepl-consumer-persist1.conf +++ b/tests/data/slapd-syncrepl-consumer-persist1.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-syncrepl-consumer-persist3.conf b/tests/data/slapd-syncrepl-consumer-persist3.conf index 647908d..c5a7bd9 100644 --- a/tests/data/slapd-syncrepl-consumer-persist3.conf +++ b/tests/data/slapd-syncrepl-consumer-persist3.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-syncrepl-consumer-refresh1.conf b/tests/data/slapd-syncrepl-consumer-refresh1.conf index 0209c1a..3cb6e84 100644 --- a/tests/data/slapd-syncrepl-consumer-refresh1.conf +++ b/tests/data/slapd-syncrepl-consumer-refresh1.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-syncrepl-consumer-refresh2.conf b/tests/data/slapd-syncrepl-consumer-refresh2.conf index 9242706..a7a14c0 100644 --- a/tests/data/slapd-syncrepl-consumer-refresh2.conf +++ b/tests/data/slapd-syncrepl-consumer-refresh2.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-syncrepl-multiproxy.conf b/tests/data/slapd-syncrepl-multiproxy.conf index 3937f36..3815de3 100644 --- a/tests/data/slapd-syncrepl-multiproxy.conf +++ b/tests/data/slapd-syncrepl-multiproxy.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-syncrepl-provider.conf b/tests/data/slapd-syncrepl-provider.conf index b2f639a..1e3e57c 100644 --- a/tests/data/slapd-syncrepl-provider.conf +++ b/tests/data/slapd-syncrepl-provider.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-tls-sasl.conf b/tests/data/slapd-tls-sasl.conf index 70d756a..7279208 100644 --- a/tests/data/slapd-tls-sasl.conf +++ b/tests/data/slapd-tls-sasl.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-tls.conf b/tests/data/slapd-tls.conf index c0e1e36..401572f 100644 --- a/tests/data/slapd-tls.conf +++ b/tests/data/slapd-tls.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-translucent-local.conf b/tests/data/slapd-translucent-local.conf index 0fcf03a..da8e6db 100644 --- a/tests/data/slapd-translucent-local.conf +++ b/tests/data/slapd-translucent-local.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-translucent-remote.conf b/tests/data/slapd-translucent-remote.conf index a33367c..30456c3 100644 --- a/tests/data/slapd-translucent-remote.conf +++ b/tests/data/slapd-translucent-remote.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-unique.conf b/tests/data/slapd-unique.conf index 4986bc5..f2c49e4 100644 --- a/tests/data/slapd-unique.conf +++ b/tests/data/slapd-unique.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-valregex.conf b/tests/data/slapd-valregex.conf index 0835870..8a08237 100644 --- a/tests/data/slapd-valregex.conf +++ b/tests/data/slapd-valregex.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-valsort.conf b/tests/data/slapd-valsort.conf index af68ec6..5f1e538 100644 --- a/tests/data/slapd-valsort.conf +++ b/tests/data/slapd-valsort.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd-whoami.conf b/tests/data/slapd-whoami.conf index 8c3e9cb..60660fc 100644 --- a/tests/data/slapd-whoami.conf +++ b/tests/data/slapd-whoami.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd.conf b/tests/data/slapd.conf index f583c49..28d6924 100644 --- a/tests/data/slapd.conf +++ b/tests/data/slapd.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/slapd2.conf b/tests/data/slapd2.conf index 9c03005..792adda 100644 --- a/tests/data/slapd2.conf +++ b/tests/data/slapd2.conf @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/data/test.schema b/tests/data/test.schema index 0635bf7..f06da23 100644 --- a/tests/data/test.schema +++ b/tests/data/test.schema @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/progs/Makefile.in b/tests/progs/Makefile.in index 5e7a2a2..7d6df22 100644 --- a/tests/progs/Makefile.in +++ b/tests/progs/Makefile.in @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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/progs/ldif-filter.c b/tests/progs/ldif-filter.c index 355b716..728eb6b 100644 --- a/tests/progs/ldif-filter.c +++ b/tests/progs/ldif-filter.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2009-2022 The OpenLDAP Foundation. + * Copyright 2009-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/tests/progs/slapd-addel.c b/tests/progs/slapd-addel.c index f67c1fb..620cd3a 100644 --- a/tests/progs/slapd-addel.c +++ b/tests/progs/slapd-addel.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1999-2022 The OpenLDAP Foundation. + * Copyright 1999-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/tests/progs/slapd-auth.c b/tests/progs/slapd-auth.c index dcb4690..9b3d89e 100644 --- a/tests/progs/slapd-auth.c +++ b/tests/progs/slapd-auth.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2006-2022 The OpenLDAP Foundation. + * Copyright 2006-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/tests/progs/slapd-bind.c b/tests/progs/slapd-bind.c index dad0dcb..c99db57 100644 --- a/tests/progs/slapd-bind.c +++ b/tests/progs/slapd-bind.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1999-2022 The OpenLDAP Foundation. + * Copyright 1999-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/tests/progs/slapd-common.c b/tests/progs/slapd-common.c index d28bdb3..d8b66a0 100644 --- a/tests/progs/slapd-common.c +++ b/tests/progs/slapd-common.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1999-2022 The OpenLDAP Foundation. + * Copyright 1999-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/tests/progs/slapd-common.h b/tests/progs/slapd-common.h index 64410c7..44d4755 100644 --- a/tests/progs/slapd-common.h +++ b/tests/progs/slapd-common.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1999-2022 The OpenLDAP Foundation. + * Copyright 1999-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/tests/progs/slapd-modify.c b/tests/progs/slapd-modify.c index acc131a..d556765 100644 --- a/tests/progs/slapd-modify.c +++ b/tests/progs/slapd-modify.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1999-2022 The OpenLDAP Foundation. + * Copyright 1999-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/tests/progs/slapd-modrdn.c b/tests/progs/slapd-modrdn.c index e224c0a..adf6a0c 100644 --- a/tests/progs/slapd-modrdn.c +++ b/tests/progs/slapd-modrdn.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1999-2022 The OpenLDAP Foundation. + * Copyright 1999-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/tests/progs/slapd-mtread.c b/tests/progs/slapd-mtread.c index bf6014a..aa58ee5 100644 --- a/tests/progs/slapd-mtread.c +++ b/tests/progs/slapd-mtread.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1999-2022 The OpenLDAP Foundation. + * Copyright 1999-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/tests/progs/slapd-read.c b/tests/progs/slapd-read.c index 75d8c07..a88baad 100644 --- a/tests/progs/slapd-read.c +++ b/tests/progs/slapd-read.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1999-2022 The OpenLDAP Foundation. + * Copyright 1999-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/tests/progs/slapd-search.c b/tests/progs/slapd-search.c index f849199..d86afd9 100644 --- a/tests/progs/slapd-search.c +++ b/tests/progs/slapd-search.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1999-2022 The OpenLDAP Foundation. + * Copyright 1999-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/tests/progs/slapd-tester.c b/tests/progs/slapd-tester.c index 8f9656e..22ee87a 100644 --- a/tests/progs/slapd-tester.c +++ b/tests/progs/slapd-tester.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1999-2022 The OpenLDAP Foundation. + * Copyright 1999-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/tests/progs/slapd-watcher.c b/tests/progs/slapd-watcher.c index 50d9d1d..2dd5579 100644 --- a/tests/progs/slapd-watcher.c +++ b/tests/progs/slapd-watcher.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1999-2022 The OpenLDAP Foundation. + * Copyright 1999-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/tests/run.in b/tests/run.in index f6723af..524c077 100644 --- a/tests/run.in +++ b/tests/run.in @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## 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 @@ -53,6 +53,7 @@ AC_deref=deref@BUILD_DEREF@ AC_dynlist=dynlist@BUILD_DYNLIST@ AC_homedir=homedir@BUILD_HOMEDIR@ AC_memberof=memberof@BUILD_MEMBEROF@ +AC_nestgroup=nestgroup@BUILD_NESTGROUP@ AC_otp=otp@BUILD_OTP@ AC_pcache=pcache@BUILD_PROXYCACHE@ AC_ppolicy=ppolicy@BUILD_PPOLICY@ @@ -85,7 +86,7 @@ if test "${AC_asyncmeta}" = "asyncmetamod" && test "${AC_LIBS_DYNAMIC}" = "stati fi export AC_ldap AC_mdb AC_meta AC_asyncmeta AC_monitor AC_null AC_perl AC_relay AC_sql \ AC_accesslog AC_argon2 AC_auditlog AC_autoca AC_constraint AC_dds AC_deref AC_dynlist \ - AC_homedir AC_memberof AC_otp AC_pcache AC_ppolicy AC_refint AC_remoteauth \ + AC_homedir AC_memberof AC_nestgroup AC_otp AC_pcache AC_ppolicy AC_refint AC_remoteauth \ AC_retcode AC_rwm AC_unique AC_syncprov AC_translucent \ AC_valsort \ AC_lloadd \ 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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|}," -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 . ## -## 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|}," -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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 <> $TESTOUT 2>&1 <> $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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## ## 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 . ## ## 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 . ## ## 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 . ## ## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . +## +## 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 +## . + +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 < $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 <> $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 <> $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 <> $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 < $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 <> $TESTOUT 2>&1 <> $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 <> $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 <> $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 -- cgit v1.2.3