Merging upstream version 2.6.8+dfsg.

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

8 files changed, 8 insertions, 8 deletions

diff --git a/contrib/slapd-modules/emptyds/Makefile b/contrib/slapd-modules/emptyds/Makefile
index d6e69cd..5fa1fc6 100644
--- a/contrib/slapd-modules/emptyds/Makefile
+++ b/contrib/slapd-modules/emptyds/Makefile
@@ -1,7 +1,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.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted only as authorized by the OpenLDAP
diff --git a/contrib/slapd-modules/emptyds/README b/contrib/slapd-modules/emptyds/README
index 914d4e7..9789a2a 100644
--- a/contrib/slapd-modules/emptyds/README
+++ b/contrib/slapd-modules/emptyds/README
@@ -53,7 +53,7 @@ CAVEATS
       the last overlay configured so it will run before the other overlays.
 
 ---
-Copyright 2014-2022 The OpenLDAP Foundation.
+Copyright 2014-2024 The OpenLDAP Foundation.
 Portions Copyright (C) DAASI International GmbH, Tamim Ziai.
 All rights reserved.
 
diff --git a/contrib/slapd-modules/emptyds/emptyds.c b/contrib/slapd-modules/emptyds/emptyds.c
index bb3202e..d26c730 100644
--- a/contrib/slapd-modules/emptyds/emptyds.c
+++ b/contrib/slapd-modules/emptyds/emptyds.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2014-2022 The OpenLDAP Foundation.
+ * Copyright 2014-2024 The OpenLDAP Foundation.
  * Portions Copyright (C) 2014 DAASI International GmbH, Tamim Ziai.
  * Portions Copyright (C) 2022 Ondřej Kuzník, Symas Corporation.
  * All rights reserved.
diff --git a/contrib/slapd-modules/emptyds/slapo-emptyds.5 b/contrib/slapd-modules/emptyds/slapo-emptyds.5
index 75b1059..53a2b0e 100644
--- a/contrib/slapd-modules/emptyds/slapo-emptyds.5
+++ b/contrib/slapd-modules/emptyds/slapo-emptyds.5
@@ -1,5 +1,5 @@
 .TH SLAPO-EDS 5 "RELEASEDATE" "OpenLDAP LDVERSION"
-.\" Copyright 2022 The OpenLDAP Foundation, All Rights Reserved.
+.\" Copyright 2022-2024 The OpenLDAP Foundation, All Rights Reserved.
 .\" Copyright 2018 Tamim Ziai 
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
 .\" $OpenLDAP$
diff --git a/contrib/slapd-modules/emptyds/tests/data/emptyds.conf b/contrib/slapd-modules/emptyds/tests/data/emptyds.conf
index 221fe81..4b7c87b 100644
--- a/contrib/slapd-modules/emptyds/tests/data/emptyds.conf
+++ b/contrib/slapd-modules/emptyds/tests/data/emptyds.conf
@@ -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/emptyds/tests/run b/contrib/slapd-modules/emptyds/tests/run
index 239bff7..9f24063 100755
--- a/contrib/slapd-modules/emptyds/tests/run
+++ b/contrib/slapd-modules/emptyds/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/emptyds/tests/scripts/all b/contrib/slapd-modules/emptyds/tests/scripts/all
index a5c1774..7d9c8e3 100755
--- a/contrib/slapd-modules/emptyds/tests/scripts/all
+++ b/contrib/slapd-modules/emptyds/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/emptyds/tests/scripts/test001-emptyds b/contrib/slapd-modules/emptyds/tests/scripts/test001-emptyds
index b8d715a..09d2c20 100755
--- a/contrib/slapd-modules/emptyds/tests/scripts/test001-emptyds
+++ b/contrib/slapd-modules/emptyds/tests/scripts/test001-emptyds
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2022 The OpenLDAP Foundation.
+## Copyright 2022-2024 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without