From 3fa3e6ac17cbab8003ce3b3ae87928de5f5eaaf4 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 3 Jun 2024 07:34:56 +0200 Subject: Adding upstream version 2.6.8+dfsg. Signed-off-by: Daniel Baumann --- contrib/slapd-modules/variant/Makefile | 2 +- contrib/slapd-modules/variant/tests/run | 2 +- contrib/slapd-modules/variant/tests/scripts/all | 2 +- .../slapd-modules/variant/tests/scripts/common.sh | 2 +- .../variant/tests/scripts/test001-config | 2 +- .../variant/tests/scripts/test002-add-delete | 2 +- .../variant/tests/scripts/test003-search | 2 +- .../variant/tests/scripts/test004-compare | 2 +- .../variant/tests/scripts/test005-modify | 2 +- .../variant/tests/scripts/test006-acl | 2 +- .../variant/tests/scripts/test007-subtypes | 2 +- .../tests/scripts/test008-variant-replication | 2 +- .../tests/scripts/test009-ignored-replication | 2 +- .../variant/tests/scripts/test010-limits | 2 +- .../variant/tests/scripts/test011-referral | 2 +- .../variant/tests/scripts/test012-crossdb | 2 +- contrib/slapd-modules/variant/variant.c | 24 +++++++++++----------- 17 files changed, 28 insertions(+), 28 deletions(-) (limited to 'contrib/slapd-modules/variant') diff --git a/contrib/slapd-modules/variant/Makefile b/contrib/slapd-modules/variant/Makefile index 1be3f3e..9b9a93b 100644 --- a/contrib/slapd-modules/variant/Makefile +++ b/contrib/slapd-modules/variant/Makefile @@ -1,7 +1,7 @@ # $OpenLDAP$ # This work is part of OpenLDAP Software . # -# Copyright 1998-2022 The OpenLDAP Foundation. +# Copyright 1998-2024 The OpenLDAP Foundation. # Copyright 2017 Ondřej Kuzník, Symas Corp. All Rights Reserved. # # Redistribution and use in source and binary forms, with or without 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 . ## -## Copyright 1998-2022 The OpenLDAP 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 . ## -## Copyright 1998-2022 The OpenLDAP 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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 . ## -## 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/variant.c b/contrib/slapd-modules/variant/variant.c index cbc2ce2..037c719 100644 --- a/contrib/slapd-modules/variant/variant.c +++ b/contrib/slapd-modules/variant/variant.c @@ -696,7 +696,7 @@ static ConfigTable variant_cfg[] = { { "passReplication", "on|off", 2, 2, 0, ARG_ON_OFF|ARG_OFFSET, (void *)offsetof( variant_info_t, passReplication ), - "( OLcfgOvAt:FIXME.1 NAME 'olcVariantPassReplication' " + "( OLcfgOvAt:9.1 NAME 'olcVariantPassReplication' " "DESC 'Whether to let searches with replication control " "pass unmodified' " "SYNTAX OMsBoolean " @@ -706,7 +706,7 @@ static ConfigTable variant_cfg[] = { { "variantDN", "dn", 2, 2, 0, ARG_DN|ARG_QUOTE|ARG_MAGIC, variant_set_dn, - "( OLcfgOvAt:FIXME.2 NAME 'olcVariantEntry' " + "( OLcfgOvAt:9.2 NAME 'olcVariantEntry' " "DESC 'DN of the variant entry' " "EQUALITY distinguishedNameMatch " "SYNTAX OMsDN " @@ -716,7 +716,7 @@ static ConfigTable variant_cfg[] = { { "variantRegex", "regex", 2, 2, 0, ARG_BERVAL|ARG_QUOTE|ARG_MAGIC, variant_set_regex, - "( OLcfgOvAt:FIXME.6 NAME 'olcVariantEntryRegex' " + "( OLcfgOvAt:9.6 NAME 'olcVariantEntryRegex' " "DESC 'Pattern for the variant entry' " "EQUALITY caseExactMatch " "SYNTAX OMsDirectoryString " @@ -727,7 +727,7 @@ static ConfigTable variant_cfg[] = { { "", NULL, 2, 2, 0, ARG_STRING|ARG_MAGIC|VARIANT_ATTR, variant_set_attribute, - "( OLcfgOvAt:FIXME.3 NAME 'olcVariantVariantAttribute' " + "( OLcfgOvAt:9.3 NAME 'olcVariantVariantAttribute' " "DESC 'Attribute to fill in the entry' " "EQUALITY caseIgnoreMatch " "SYNTAX OMsDirectoryString " @@ -737,7 +737,7 @@ static ConfigTable variant_cfg[] = { { "", NULL, 2, 2, 0, ARG_STRING|ARG_MAGIC|VARIANT_ATTR_ALT, variant_set_attribute, - "( OLcfgOvAt:FIXME.4 NAME 'olcVariantAlternativeAttribute' " + "( OLcfgOvAt:9.4 NAME 'olcVariantAlternativeAttribute' " "DESC 'Attribute to take from the alternative entry' " "EQUALITY caseIgnoreMatch " "SYNTAX OMsDirectoryString " @@ -747,7 +747,7 @@ static ConfigTable variant_cfg[] = { { "", NULL, 2, 2, 0, ARG_DN|ARG_QUOTE|ARG_MAGIC, variant_set_alt_dn, - "( OLcfgOvAt:FIXME.5 NAME 'olcVariantAlternativeEntry' " + "( OLcfgOvAt:9.5 NAME 'olcVariantAlternativeEntry' " "DESC 'DN of the alternative entry' " "EQUALITY distinguishedNameMatch " "SYNTAX OMsDN " @@ -757,7 +757,7 @@ static ConfigTable variant_cfg[] = { { "", NULL, 2, 2, 0, ARG_BERVAL|ARG_QUOTE|ARG_MAGIC, variant_set_alt_pattern, - "( OLcfgOvAt:FIXME.7 NAME 'olcVariantAlternativeEntryPattern' " + "( OLcfgOvAt:9.7 NAME 'olcVariantAlternativeEntryPattern' " "DESC 'Replacement pattern to locate the alternative entry' " "EQUALITY caseExactMatch " "SYNTAX OMsDirectoryString " @@ -780,13 +780,13 @@ static ConfigTable variant_cfg[] = { }; static ConfigOCs variant_ocs[] = { - { "( OLcfgOvOc:FIXME.1 " + { "( OLcfgOvOc:9.1 " "NAME 'olcVariantConfig' " "DESC 'Variant overlay configuration' " "SUP olcOverlayConfig " "MAY ( olcVariantPassReplication ) )", Cft_Overlay, variant_cfg, NULL, variant_cfadd }, - { "( OLcfgOvOc:FIXME.2 " + { "( OLcfgOvOc:9.2 " "NAME 'olcVariantVariant' " "DESC 'Variant configuration' " "MUST ( olcVariantEntry ) " @@ -794,7 +794,7 @@ static ConfigOCs variant_ocs[] = { "SUP top " "STRUCTURAL )", Cft_Misc, variant_cfg, variant_ldadd }, - { "( OLcfgOvOc:FIXME.3 " + { "( OLcfgOvOc:9.3 " "NAME 'olcVariantAttribute' " "DESC 'Variant attribute description' " "MUST ( olcVariantVariantAttribute $ " @@ -805,7 +805,7 @@ static ConfigOCs variant_ocs[] = { "SUP top " "STRUCTURAL )", Cft_Misc, variant_cfg, variant_attr_ldadd }, - { "( OLcfgOvOc:FIXME.4 " + { "( OLcfgOvOc:9.4 " "NAME 'olcVariantRegex' " "DESC 'Variant configuration' " "MUST ( olcVariantEntryRegex ) " @@ -813,7 +813,7 @@ static ConfigOCs variant_ocs[] = { "SUP top " "STRUCTURAL )", Cft_Misc, variant_cfg, variant_regex_ldadd }, - { "( OLcfgOvOc:FIXME.5 " + { "( OLcfgOvOc:9.5 " "NAME 'olcVariantAttributePattern' " "DESC 'Variant attribute description' " "MUST ( olcVariantVariantAttribute $ " -- cgit v1.2.3