Merging upstream version 2.6.8+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

15 files changed, 15 insertions, 15 deletions

diff --git a/contrib/slapd-modules/variant/tests/run b/contrib/slapd-modules/variant/tests/run
index 239bff7..9f24063 100755
--- a/contrib/slapd-modules/variant/tests/run
+++ b/contrib/slapd-modules/variant/tests/run
@@ -2,7 +2,7 @@
 ## $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2022 The OpenLDAP Foundation.
+## Copyright 1998-2024 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
diff --git a/contrib/slapd-modules/variant/tests/scripts/all b/contrib/slapd-modules/variant/tests/scripts/all
index a5c1774..7d9c8e3 100755
--- a/contrib/slapd-modules/variant/tests/scripts/all
+++ b/contrib/slapd-modules/variant/tests/scripts/all
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2022 The OpenLDAP Foundation.
+## Copyright 1998-2024 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
diff --git a/contrib/slapd-modules/variant/tests/scripts/common.sh b/contrib/slapd-modules/variant/tests/scripts/common.sh
index 3b155ad..789171d 100755
--- a/contrib/slapd-modules/variant/tests/scripts/common.sh
+++ b/contrib/slapd-modules/variant/tests/scripts/common.sh
@@ -2,7 +2,7 @@
 ## $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2016-2022 The OpenLDAP Foundation.
+## Copyright 2016-2024 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
diff --git a/contrib/slapd-modules/variant/tests/scripts/test001-config b/contrib/slapd-modules/variant/tests/scripts/test001-config
index 7a5559f..1f9d984 100755
--- a/contrib/slapd-modules/variant/tests/scripts/test001-config
+++ b/contrib/slapd-modules/variant/tests/scripts/test001-config
@@ -2,7 +2,7 @@
 ## $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2016-2022 The OpenLDAP Foundation.
+## Copyright 2016-2024 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
diff --git a/contrib/slapd-modules/variant/tests/scripts/test002-add-delete b/contrib/slapd-modules/variant/tests/scripts/test002-add-delete
index bd316b2..fc0903b 100755
--- a/contrib/slapd-modules/variant/tests/scripts/test002-add-delete
+++ b/contrib/slapd-modules/variant/tests/scripts/test002-add-delete
@@ -2,7 +2,7 @@
 ## $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2016-2022 The OpenLDAP Foundation.
+## Copyright 2016-2024 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
diff --git a/contrib/slapd-modules/variant/tests/scripts/test003-search b/contrib/slapd-modules/variant/tests/scripts/test003-search
index 2284ab7..c213b4b 100755
--- a/contrib/slapd-modules/variant/tests/scripts/test003-search
+++ b/contrib/slapd-modules/variant/tests/scripts/test003-search
@@ -2,7 +2,7 @@
 ## $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2016-2022 The OpenLDAP Foundation.
+## Copyright 2016-2024 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
diff --git a/contrib/slapd-modules/variant/tests/scripts/test004-compare b/contrib/slapd-modules/variant/tests/scripts/test004-compare
index c87d347..5bc9edb 100755
--- a/contrib/slapd-modules/variant/tests/scripts/test004-compare
+++ b/contrib/slapd-modules/variant/tests/scripts/test004-compare
@@ -2,7 +2,7 @@
 ## $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2016-2022 The OpenLDAP Foundation.
+## Copyright 2016-2024 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
diff --git a/contrib/slapd-modules/variant/tests/scripts/test005-modify b/contrib/slapd-modules/variant/tests/scripts/test005-modify
index 4cbf289..f874fde 100755
--- a/contrib/slapd-modules/variant/tests/scripts/test005-modify
+++ b/contrib/slapd-modules/variant/tests/scripts/test005-modify
@@ -2,7 +2,7 @@
 ## $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2016-2022 The OpenLDAP Foundation.
+## Copyright 2016-2024 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
diff --git a/contrib/slapd-modules/variant/tests/scripts/test006-acl b/contrib/slapd-modules/variant/tests/scripts/test006-acl
index 6b34fb8..d1a4f7c 100755
--- a/contrib/slapd-modules/variant/tests/scripts/test006-acl
+++ b/contrib/slapd-modules/variant/tests/scripts/test006-acl
@@ -2,7 +2,7 @@
 ## $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2016-2022 The OpenLDAP Foundation.
+## Copyright 2016-2024 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
diff --git a/contrib/slapd-modules/variant/tests/scripts/test007-subtypes b/contrib/slapd-modules/variant/tests/scripts/test007-subtypes
index 177fc33..fc2377a 100755
--- a/contrib/slapd-modules/variant/tests/scripts/test007-subtypes
+++ b/contrib/slapd-modules/variant/tests/scripts/test007-subtypes
@@ -2,7 +2,7 @@
 ## $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2016-2022 The OpenLDAP Foundation.
+## Copyright 2016-2024 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
diff --git a/contrib/slapd-modules/variant/tests/scripts/test008-variant-replication b/contrib/slapd-modules/variant/tests/scripts/test008-variant-replication
index 63e2d7e..06ca8dc 100755
--- a/contrib/slapd-modules/variant/tests/scripts/test008-variant-replication
+++ b/contrib/slapd-modules/variant/tests/scripts/test008-variant-replication
@@ -2,7 +2,7 @@
 ## $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2016-2022 The OpenLDAP Foundation.
+## Copyright 2016-2024 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
diff --git a/contrib/slapd-modules/variant/tests/scripts/test009-ignored-replication b/contrib/slapd-modules/variant/tests/scripts/test009-ignored-replication
index aefbfa9..6a2a304 100755
--- a/contrib/slapd-modules/variant/tests/scripts/test009-ignored-replication
+++ b/contrib/slapd-modules/variant/tests/scripts/test009-ignored-replication
@@ -2,7 +2,7 @@
 ## $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2016-2022 The OpenLDAP Foundation.
+## Copyright 2016-2024 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
diff --git a/contrib/slapd-modules/variant/tests/scripts/test010-limits b/contrib/slapd-modules/variant/tests/scripts/test010-limits
index 5828922..3db3a6d 100755
--- a/contrib/slapd-modules/variant/tests/scripts/test010-limits
+++ b/contrib/slapd-modules/variant/tests/scripts/test010-limits
@@ -2,7 +2,7 @@
 ## $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2016-2022 The OpenLDAP Foundation.
+## Copyright 2016-2024 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
diff --git a/contrib/slapd-modules/variant/tests/scripts/test011-referral b/contrib/slapd-modules/variant/tests/scripts/test011-referral
index 37d6d8c..0b308a9 100755
--- a/contrib/slapd-modules/variant/tests/scripts/test011-referral
+++ b/contrib/slapd-modules/variant/tests/scripts/test011-referral
@@ -2,7 +2,7 @@
 ## $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2016-2022 The OpenLDAP Foundation.
+## Copyright 2016-2024 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
diff --git a/contrib/slapd-modules/variant/tests/scripts/test012-crossdb b/contrib/slapd-modules/variant/tests/scripts/test012-crossdb
index 8854a1b..18f84b6 100755
--- a/contrib/slapd-modules/variant/tests/scripts/test012-crossdb
+++ b/contrib/slapd-modules/variant/tests/scripts/test012-crossdb
@@ -2,7 +2,7 @@
 ## $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2016-2022 The OpenLDAP Foundation.
+## Copyright 2016-2024 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without