Issue#9020 - Use consistent namespaces for overlays

diff --git a/contrib/slapd-modules/autogroup/autogroup.c b/contrib/slapd-modules/autogroup/autogroup.c
index c6af90442885ddf6408189f3bc0667e893c586cd..482af12bceff946d9086d1efb9c666b228c80e33 100644 (file)
--- a/contrib/slapd-modules/autogroup/autogroup.c
+++ b/contrib/slapd-modules/autogroup/autogroup.c
@@ -1713,7 +1713,7 @@ static ConfigDriver       ag_cfgen;
 static ConfigTable agcfg[] = {
        { "autogroup-attrset", "group-oc> <URL-ad> <member-ad",
                4, 4, 0, ARG_MAGIC|AG_ATTRSET, ag_cfgen,
-               "( OLcfgCtAt:2.1 NAME 'olcAGattrSet' "
+               "( OLcfgCtAt:2.1 NAME ( 'olcAutoGroupAttrSet' 'olcAGattrSet' ) "
                        "DESC 'Automatic groups: <group objectClass>, <URL attributeDescription>, <member attributeDescription>' "
                        "EQUALITY caseIgnoreMatch "
                        "SYNTAX OMsDirectoryString "
@@ -1722,7 +1722,7 @@ static ConfigTable agcfg[] = {
        
        { "autogroup-memberof-ad", "memberOf attribute",
                2, 2, 0, ARG_MAGIC|AG_MEMBER_OF_AD, ag_cfgen,
-               "( OLcfgCtAt:2.2 NAME 'olcAGmemberOfAd' "
+               "( OLcfgCtAt:2.2 NAME ( 'olcAutoGroupMemberOfAd' 'olcAGmemberOfAd' ) "
                        "DESC 'memberOf attribute' "
                        "EQUALITY caseIgnoreMatch "
                        "SYNTAX OMsDirectoryString SINGLE-VALUE )",
@@ -1733,12 +1733,12 @@ static ConfigTable agcfg[] = {
 
 static ConfigOCs agocs[] = {
        { "( OLcfgCtOc:2.1 "
-               "NAME 'olcAutomaticGroups' "
+               "NAME 'olcAutoGroupConfig' "
                "DESC 'Automatic groups configuration' "
                "SUP olcOverlayConfig "
                "MAY ( "
-                       "olcAGattrSet "
-                       "$ olcAGmemberOfAd "
+                       "olcAutoGroupAttrSet "
+                       "$ olcAutoGroupMemberOfAd "
                    ")"
          ")",
                Cft_Overlay, agcfg, NULL, NULL },

diff --git a/contrib/slapd-modules/autogroup/slapo-autogroup.5 b/contrib/slapd-modules/autogroup/slapo-autogroup.5
index 1230e2365e07bf0d73944cae91f705452460d2b8..18c0e76e3473389fba3c827e3dd67a64be2f4ca4 100644 (file)
--- a/contrib/slapd-modules/autogroup/slapo-autogroup.5
+++ b/contrib/slapd-modules/autogroup/slapo-autogroup.5
@@ -39,7 +39,7 @@ here for convenience:
 .TP
 .B \FCautogroup-attrset\FT <group-oc> <URL-ad> <member-ad>
 .TP
-.B \FColcAGattrSet:\FT <group-oc> <URL-ad> <member-ad>
+.B \FColcAutoGroupAttrSet:\FT <group-oc> <URL-ad> <member-ad>
 This defines the objectclass-attribute-URI mappings defining the
 automatically managed groups, and may appear multiple times.
 
@@ -57,7 +57,7 @@ disabled for consistency.
 .TP
 .B \FCautogroup-memberof-ad\FT <memberof-ad>
 .TP
-.B \FColcAGmemberOfAd\FT <memberof-ad>
+.B \FColcAutoGroupMemberOfAd\FT <memberof-ad>
 This defines the attribute that is used by the memberOf overlay to
 store the names of groups that an entry is member of; it must be
 DN-valued. It should be set to the same value as
@@ -88,6 +88,15 @@ cases the overlay will try to detect if groups have been modified and
 then simply refresh them. This can cause performance hits if the
 search specified by the URI deals with a significant number of
 entries.
+.SH BACKWARD COMPATIBILITY
+The autogroup overlay has been reworked with the 2.5 release to use
+a consistent namespace as with other overlays. As a side-effect the
+following cn=config parameters are deprecated and will be removed in
+a future release:
+.B olcAGattrSet
+is replaced with olcAutoGroupAttrSet
+.B olcAGmemberOfAd
+is replaced with olcAutoGroupMemberOfAd
 .SH ACKNOWLEDGEMENTS
 This module was originally written in 2007 by Michał
 Szulczyński.  Further enhancements were contributed by Howard

diff --git a/doc/man/man5/slapo-dyngroup.5 b/doc/man/man5/slapo-dyngroup.5
index 9ef73184ce0816e70c5084b57cb93648742244be..997818542f1d9a0a14626858a5e09ca46fb9413f 100644 (file)
--- a/doc/man/man5/slapo-dyngroup.5
+++ b/doc/man/man5/slapo-dyngroup.5
@@ -42,6 +42,15 @@ to be evaluated for the result.
 .TP
 ETCDIR/slapd.conf
 default slapd configuration file
+.SH BACKWARD COMPATIBILITY
+The dyngroup overlay has been reworked with the 2.5 release to use
+a consistent namespace as with other overlays. As a side-effect the
+following cn=config parameters are deprecated and will be removed in
+a future release:
+.B olcDGAttrPair
+is replaced with olcDynGroupAttrPair
+.B olcDGConfig
+is replaced with olcDynGroupConfig
 .SH SEE ALSO
 .BR slapd.conf (5),
 .BR slapd\-config (5).

diff --git a/doc/man/man5/slapo-dynlist.5 b/doc/man/man5/slapo-dynlist.5
index 853daafde876e43a06c361258348aafd35faf045..761041771c264076629b8a0b35af5e6b029ca3d3 100644 (file)
--- a/doc/man/man5/slapo-dynlist.5
+++ b/doc/man/man5/slapo-dynlist.5
@@ -197,6 +197,15 @@ entry like
 .TP
 ETCDIR/slapd.conf
 default slapd configuration file
+.SH BACKWARD COMPATIBILITY
+The dyngroup overlay has been reworked with the 2.5 release to use
+a consistent namespace as with other overlays. As a side-effect the
+following cn=config parameters are deprecated and will be removed in
+a future release:
+.B olcDlAttrSet
+is replaced with olcDynListAttrSet
+.B olcDynamicList
+is replaced with olcDynListConfig
 .SH SEE ALSO
 .BR slapd.conf (5),
 .BR slapd\-config (5),

diff --git a/doc/man/man5/slapo-memberof.5 b/doc/man/man5/slapo-memberof.5
index 0194cbc947f3d79f94efcd1173e97b62f696a1d9..b04411f88f61db4009967233d0213012c94ccb65 100644 (file)
--- a/doc/man/man5/slapo-memberof.5
+++ b/doc/man/man5/slapo-memberof.5
@@ -118,6 +118,13 @@ to emulate slapo-memberOf behavior.
 .TP
 ETCDIR/slapd.conf
 default slapd configuration file
+.SH BACKWARD COMPATIBILITY
+The dyngroup overlay has been reworked with the 2.5 release to use
+a consistent namespace as with other overlays. As a side-effect the
+following cn=config parameters are deprecated and will be removed in
+a future release:
+.B olcMemberOf
+is replaced with olcMemberOfConfig
 .SH SEE ALSO
 .BR slapd.conf (5),
 .BR slapd\-config (5),

diff --git a/servers/slapd/overlays/autoca.c b/servers/slapd/overlays/autoca.c
index 2979dc77057f5aec1b308f26c623951a26b4ccf1..dbaa4e0676ce7a1007356ef3a72f9652e79932ec 100644 (file)
--- a/servers/slapd/overlays/autoca.c
+++ b/servers/slapd/overlays/autoca.c
@@ -724,55 +724,55 @@ static int autoca_cf( ConfigArgs *c )
 static ConfigTable autoca_cfg[] = {
        { "userClass", "objectclass", 2, 2, 0,
          ARG_STRING|ARG_MAGIC|ACA_USRCLASS, autoca_cf,
-         "( OLcfgOvAt:22.1 NAME 'olcACAuserClass' "
+         "( OLcfgOvAt:22.1 NAME 'olcAutoCAuserClass' "
          "DESC 'ObjectClass of user entries' "
          "EQUALITY caseIgnoreMatch "
          "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
        { "serverClass", "objectclass", 2, 2, 0,
          ARG_STRING|ARG_MAGIC|ACA_SRVCLASS, autoca_cf,
-         "( OLcfgOvAt:22.2 NAME 'olcACAserverClass' "
+         "( OLcfgOvAt:22.2 NAME 'olcAutoCAserverClass' "
          "DESC 'ObjectClass of server entries' "
          "EQUALITY caseIgnoreMatch "
          "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
        { "userKeybits", "integer", 2, 2, 0,
          ARG_INT|ARG_MAGIC|ACA_USRKEYBITS, autoca_cf,
-         "( OLcfgOvAt:22.3 NAME 'olcACAuserKeybits' "
+         "( OLcfgOvAt:22.3 NAME 'olcAutoCAuserKeybits' "
          "DESC 'Size of PrivateKey for user entries' "
          "EQUALITY integerMatch "
          "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
        { "serverKeybits", "integer", 2, 2, 0,
          ARG_INT|ARG_MAGIC|ACA_SRVKEYBITS, autoca_cf,
-         "( OLcfgOvAt:22.4 NAME 'olcACAserverKeybits' "
+         "( OLcfgOvAt:22.4 NAME 'olcAutoCAserverKeybits' "
          "DESC 'Size of PrivateKey for server entries' "
          "EQUALITY integerMatch "
          "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
        { "caKeybits", "integer", 2, 2, 0,
          ARG_INT|ARG_MAGIC|ACA_CAKEYBITS, autoca_cf,
-         "( OLcfgOvAt:22.5 NAME 'olcACAKeybits' "
+         "( OLcfgOvAt:22.5 NAME 'olcAutoCAKeybits' "
          "DESC 'Size of PrivateKey for CA certificate' "
          "EQUALITY integerMatch "
          "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
        { "userDays", "integer", 2, 2, 0,
          ARG_INT|ARG_MAGIC|ACA_USRDAYS, autoca_cf,
-         "( OLcfgOvAt:22.6 NAME 'olcACAuserDays' "
+         "( OLcfgOvAt:22.6 NAME 'olcAutoCAuserDays' "
          "DESC 'Lifetime of user certificates in days' "
          "EQUALITY integerMatch "
          "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
        { "serverDays", "integer", 2, 2, 0,
          ARG_INT|ARG_MAGIC|ACA_SRVDAYS, autoca_cf,
-         "( OLcfgOvAt:22.7 NAME 'olcACAserverDays' "
+         "( OLcfgOvAt:22.7 NAME 'olcAutoCAserverDays' "
          "DESC 'Lifetime of server certificates in days' "
          "EQUALITY integerMatch "
          "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
        { "caDays", "integer", 2, 2, 0,
          ARG_INT|ARG_MAGIC|ACA_CADAYS, autoca_cf,
-         "( OLcfgOvAt:22.8 NAME 'olcACADays' "
+         "( OLcfgOvAt:22.8 NAME 'olcAutoCADays' "
          "DESC 'Lifetime of CA certificate in days' "
          "EQUALITY integerMatch "
          "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
        { "localdn", "dn", 2, 2, 0,
          ARG_DN|ARG_MAGIC|ACA_LOCALDN, autoca_cf,
-         "( OLcfgOvAt:22.9 NAME 'olcACAlocalDN' "
+         "( OLcfgOvAt:22.9 NAME 'olcAutoCAlocalDN' "
          "DESC 'DN of local server cert' "
          "EQUALITY distinguishedNameMatch "
          "SYNTAX OMsDN SINGLE-VALUE )", NULL, NULL },
@@ -781,13 +781,13 @@ static ConfigTable autoca_cfg[] = {
 
 static ConfigOCs autoca_ocs[] = {
        { "( OLcfgOvOc:22.1 "
-         "NAME 'olcACAConfig' "
+         "NAME 'olcAutoCAConfig' "
          "DESC 'AutoCA configuration' "
          "SUP olcOverlayConfig "
-         "MAY ( olcACAuserClass $ olcACAserverClass $ "
-          "olcACAuserKeybits $ olcACAserverKeybits $ olcACAKeyBits $ "
-          "olcACAuserDays $ olcACAserverDays $ olcACADays $ "
-          "olcACAlocalDN ) )",
+         "MAY ( olcAutoCAuserClass $ olcAutoCAserverClass $ "
+          "olcAutoCAuserKeybits $ olcAutoCAserverKeybits $ olcAutoCAKeyBits $ "
+          "olcAutoCAuserDays $ olcAutoCAserverDays $ olcAutoCADays $ "
+          "olcAutoCAlocalDN ) )",
          Cft_Overlay, autoca_cfg },
        { NULL, 0, NULL }
 };

diff --git a/servers/slapd/overlays/dyngroup.c b/servers/slapd/overlays/dyngroup.c
index da227dc1d54983e3c4d0cba65a2a10efd0b5749e..615caf0f4e23780baddff46c5e4edc863dbb19e2 100644 (file)
--- a/servers/slapd/overlays/dyngroup.c
+++ b/servers/slapd/overlays/dyngroup.c
@@ -123,7 +123,7 @@ static int dgroup_cf( ConfigArgs *c )
 static ConfigTable dgroupcfg[] = {
        { "attrpair", "member-attribute> <URL-attribute", 3, 3, 0,
          ARG_MAGIC, dgroup_cf,
-         "( OLcfgOvAt:17.1 NAME 'olcDGAttrPair' "
+         "( OLcfgOvAt:17.1 NAME ( 'olcDynGroupAttrPair' 'olcDGAttrPair' ) "
          "EQUALITY caseIgnoreMatch "
          "DESC 'Member and MemberURL attribute pair' "
          "SYNTAX OMsDirectoryString )", NULL, NULL },
@@ -132,10 +132,10 @@ static ConfigTable dgroupcfg[] = {
 
 static ConfigOCs dgroupocs[] = {
        { "( OLcfgOvOc:17.1 "
-         "NAME 'olcDGConfig' "
+         "NAME ( 'olcDynGroupConfig' 'olcDGConfig' ) "
          "DESC 'Dynamic Group configuration' "
          "SUP olcOverlayConfig "
-         "MAY olcDGAttrPair )",
+         "MAY olcDynGroupAttrPair)",
          Cft_Overlay, dgroupcfg },
        { NULL, 0, NULL }
 };

diff --git a/servers/slapd/overlays/dynlist.c b/servers/slapd/overlays/dynlist.c
index c7c8f57b5b8e44999777cd04bf3def249f0852e0..4f996eac7af67645c9bb8b3c967ab645590110bd 100644 (file)
--- a/servers/slapd/overlays/dynlist.c
+++ b/servers/slapd/overlays/dynlist.c
@@ -1398,7 +1398,7 @@ static ConfigDriver       dl_cfgen;
 static ConfigTable dlcfg[] = {
        { "dynlist-attrset", "group-oc> [uri] <URL-ad> <[mapped:]member-ad> [...]",
                3, 0, 0, ARG_MAGIC|DL_ATTRSET, dl_cfgen,
-               "( OLcfgOvAt:8.1 NAME 'olcDlAttrSet' "
+               "( OLcfgOvAt:8.1 NAME ( 'olcDynListAttrSet' 'olcDlAttrSet' ) "
                        "DESC 'Dynamic list: <group objectClass>, <URL attributeDescription>, <member attributeDescription>' "
                        "EQUALITY caseIgnoreMatch "
                        "SYNTAX OMsDirectoryString "
@@ -1417,10 +1417,10 @@ static ConfigTable dlcfg[] = {
 
 static ConfigOCs dlocs[] = {
        { "( OLcfgOvOc:8.1 "
-               "NAME 'olcDynamicList' "
+               "NAME ( 'olcDynListConfig' 'olcDynamicList' ) "
                "DESC 'Dynamic list configuration' "
                "SUP olcOverlayConfig "
-               "MAY olcDLattrSet )",
+               "MAY olcDynListAttrSet )",
                Cft_Overlay, dlcfg, NULL, NULL },
        { NULL, 0, NULL }
 };

diff --git a/servers/slapd/overlays/memberof.c b/servers/slapd/overlays/memberof.c
index 16239a5eb606c17c38f507c0182f59b5984bb6d6..6d60fc14435b2153028d98e9415e2fe07f7a74fc 100644 (file)
--- a/servers/slapd/overlays/memberof.c
+++ b/servers/slapd/overlays/memberof.c
@@ -1759,7 +1759,7 @@ static ConfigTable mo_cfg[] = {
 
 static ConfigOCs mo_ocs[] = {
        { "( OLcfgOvOc:18.1 "
-               "NAME 'olcMemberOf' "
+               "NAME ( 'olcMemberOfConfig' 'olcMemberOf' ) "
                "DESC 'Member-of configuration' "
                "SUP olcOverlayConfig "
                "MAY ( "

diff --git a/tests/data/regressions/its8444/slapd-provider1.ldif b/tests/data/regressions/its8444/slapd-provider1.ldif
index d2a57a83c80c6dcac07160b0e53c661570506f42..cc18d7d476af336b439463b993572993fc7946cd 100644 (file)
--- a/tests/data/regressions/its8444/slapd-provider1.ldif
+++ b/tests/data/regressions/its8444/slapd-provider1.ldif
@@ -101,13 +101,13 @@ olcSyncrepl: {2}rid=102 provider=@URI4@ binddn="cn=manager,dc=example,dc=com
 
 dn: olcOverlay={0}dynlist,olcDatabase={1}@BACKEND@,cn=config
 objectClass: olcOverlayConfig
-objectClass: olcDynamicList
+objectClass: olcDynListConfig
 olcOverlay: {0}dynlist
-olcDlAttrSet: {0}groupOfURLs memberURL
+olcDynListAttrSet: {0}groupOfURLs memberURL
 
 dn: olcOverlay={1}memberof,olcDatabase={1}@BACKEND@,cn=config
 objectClass: olcOverlayConfig
-objectClass: olcMemberOf
+objectClass: olcMemberOfConfig
 olcOverlay: {1}memberof
 olcMemberOfDangling: ignore
 olcMemberOfRefInt: TRUE

diff --git a/tests/data/regressions/its8444/slapd-provider2.ldif b/tests/data/regressions/its8444/slapd-provider2.ldif
index fa72a2f0644389131bdf619985a7c8742bbc8658..3b17593400fa0f873691ebd5873a8ddb300fe02e 100644 (file)
--- a/tests/data/regressions/its8444/slapd-provider2.ldif
+++ b/tests/data/regressions/its8444/slapd-provider2.ldif
@@ -101,13 +101,13 @@ olcSyncrepl: {2}rid=102 provider=@URI4@ binddn="cn=manager,dc=example,dc=com
 
 dn: olcOverlay={0}dynlist,olcDatabase={1}@BACKEND@,cn=config
 objectClass: olcOverlayConfig
-objectClass: olcDynamicList
+objectClass: olcDynListConfig
 olcOverlay: {0}dynlist
-olcDlAttrSet: {0}groupOfURLs memberURL
+olcDynListAttrSet: {0}groupOfURLs memberURL
 
 dn: olcOverlay={1}memberof,olcDatabase={1}@BACKEND@,cn=config
 objectClass: olcOverlayConfig
-objectClass: olcMemberOf
+objectClass: olcMemberOfConfig
 olcOverlay: {1}memberof
 olcMemberOfDangling: ignore
 olcMemberOfRefInt: TRUE

diff --git a/tests/data/regressions/its8444/slapd-provider3.ldif b/tests/data/regressions/its8444/slapd-provider3.ldif
index 26a3ea1160436576044d9644c8cb2ba0996a5443..689a23be156416dbe2a9d2be191d4b43bcf41a08 100644 (file)
--- a/tests/data/regressions/its8444/slapd-provider3.ldif
+++ b/tests/data/regressions/its8444/slapd-provider3.ldif
@@ -101,13 +101,13 @@ olcSyncrepl: {2}rid=102 provider=@URI4@ binddn="cn=manager,dc=example,dc=com
 
 dn: olcOverlay={0}dynlist,olcDatabase={1}@BACKEND@,cn=config
 objectClass: olcOverlayConfig
-objectClass: olcDynamicList
+objectClass: olcDynListConfig
 olcOverlay: {0}dynlist
-olcDlAttrSet: {0}groupOfURLs memberURL
+olcDynListAttrSet: {0}groupOfURLs memberURL
 
 dn: olcOverlay={1}memberof,olcDatabase={1}@BACKEND@,cn=config
 objectClass: olcOverlayConfig
-objectClass: olcMemberOf
+objectClass: olcMemberOfConfig
 olcOverlay: {1}memberof
 olcMemberOfDangling: ignore
 olcMemberOfRefInt: TRUE

diff --git a/tests/data/regressions/its8444/slapd-provider4.ldif b/tests/data/regressions/its8444/slapd-provider4.ldif
index eae330ebce81c0e38eeb2dcc73f8700553272d87..8359f9f9e59661257496265dfa6bb220f4edf45f 100644 (file)
--- a/tests/data/regressions/its8444/slapd-provider4.ldif
+++ b/tests/data/regressions/its8444/slapd-provider4.ldif
@@ -101,13 +101,13 @@ olcSyncrepl: {2}rid=102 provider=@URI1@ binddn="cn=manager,dc=example,dc=com
 
 dn: olcOverlay={0}dynlist,olcDatabase={1}@BACKEND@,cn=config
 objectClass: olcOverlayConfig
-objectClass: olcDynamicList
+objectClass: olcDynListConfig
 olcOverlay: {0}dynlist
-olcDlAttrSet: {0}groupOfURLs memberURL
+olcDynListAttrSet: {0}groupOfURLs memberURL
 
 dn: olcOverlay={1}memberof,olcDatabase={1}@BACKEND@,cn=config
 objectClass: olcOverlayConfig
-objectClass: olcMemberOf
+objectClass: olcMemberOfConfig
 olcOverlay: {1}memberof
 olcMemberOfDangling: ignore
 olcMemberOfRefInt: TRUE

diff --git a/tests/data/regressions/its8663/its8663 b/tests/data/regressions/its8663/its8663
index 3b161a35804d56e998e959c2a5759b0f929a3e87..eb4db57e3a07ad21633cd6e83fa790572124d9ca 100755 (executable)
--- a/tests/data/regressions/its8663/its8663
+++ b/tests/data/regressions/its8663/its8663
@@ -134,7 +134,7 @@ changetype: add
 objectClass: olcOverlayConfig
 objectClass: olcConfig
 objectClass: top
-objectClass: olcMemberOf
+objectClass: olcMemberOfConfig
 olcMemberOfGroupOC: groupOfNames
 olcMemberOfMemberAD: member
 olcMemberOfMemberOfAD: memberOf

diff --git a/tests/scripts/test044-dynlist b/tests/scripts/test044-dynlist
index 2d02c2b5b1d6a6468af1df1cf360bf42f479061d..80ef669042f477055e9a5b14b19fc971e0f55833 100755 (executable)
--- a/tests/scripts/test044-dynlist
+++ b/tests/scripts/test044-dynlist
@@ -309,11 +309,11 @@ $LDAPMODIFY -x -D cn=config -h $LOCALHOST -p $PORT1 -y $CONFIGPWF > \
 version: 1
 dn: olcOverlay={0}dynlist,olcDatabase={$DBIX}$BACKEND,cn=config
 changetype: modify
-delete: olcDLattrSet
-olcDLattrSet: {0}
+delete: olcDynListAttrSet
+olcDynListAttrSet: {0}
 -
-add: olcDLattrSet
-olcDLattrSet: groupOfURLs memberURL sn:cn mail
+add: olcDynListAttrSet
+olcDynListAttrSet: groupOfURLs memberURL sn:cn mail
 -
 EOMODS
 
@@ -419,11 +419,11 @@ $LDAPMODIFY -x -D cn=config -h $LOCALHOST -p $PORT1 -y $CONFIGPWF > \
 version: 1
 dn: olcOverlay={0}dynlist,olcDatabase={$DBIX}$BACKEND,cn=config
 changetype: modify
-delete: olcDLattrSet
-olcDLattrSet: {0}
+delete: olcDynListAttrSet
+olcDynListAttrSet: {0}
 -
-add: olcDLattrSet
-olcDLattrSet: groupOfURLs memberURL member
+add: olcDynListAttrSet
+olcDynListAttrSet: groupOfURLs memberURL member
 -
 EOMODS
 
@@ -698,11 +698,11 @@ $LDAPMODIFY -x -D cn=config -h $LOCALHOST -p $PORT1 -y $CONFIGPWF > \
 version: 1
 dn: olcOverlay={0}dynlist,olcDatabase={$DBIX}$BACKEND,cn=config
 changetype: modify
-delete: olcDLattrSet
-olcDLattrSet: {0}
+delete: olcDynListAttrSet
+olcDynListAttrSet: {0}
 -
-add: olcDLattrSet
-olcDLattrSet: groupOfURLs memberURL member@dgMemberOf
+add: olcDynListAttrSet
+olcDynListAttrSet: groupOfURLs memberURL member@dgMemberOf
 -
 EOMODS
 

diff --git a/tests/scripts/test052-memberof b/tests/scripts/test052-memberof
index 1dba9462baf87e1e8690245434f96938205bbcfd..7fe3df2250b5a92129571f2405351291592af5ef 100755 (executable)
--- a/tests/scripts/test052-memberof
+++ b/tests/scripts/test052-memberof
@@ -121,7 +121,7 @@ ${mainInclude}olcDbMode: 384"
 
 dn: olcOverlay={0}memberof,olcDatabase={1}$BACKEND,cn=config
 objectClass: olcOverlayConfig
-objectClass: olcMemberOf
+objectClass: olcMemberOfConfig
 olcOverlay: {0}memberof
 olcMemberOfRefInt: TRUE
 olcMemberOfGroupOC: groupOfNames
@@ -130,7 +130,7 @@ olcMemberOfMemberOfAD: memberOf
 
 dn: olcOverlay={1}memberof,olcDatabase={1}$BACKEND,cn=config
 objectClass: olcOverlayConfig
-objectClass: olcMemberOf
+objectClass: olcMemberOfConfig
 olcOverlay: {1}memberof
 olcMemberOfRefInt: TRUE
 olcMemberOfGroupOC: groupA
@@ -139,7 +139,7 @@ olcMemberOfMemberOfAD: memberOfA
 
 dn: olcOverlay={2}memberof,olcDatabase={1}$BACKEND,cn=config
 objectClass: olcOverlayConfig
-objectClass: olcMemberOf
+objectClass: olcMemberOfConfig
 olcOverlay: {2}memberof
 olcMemberOfRefInt: TRUE
 olcMemberOfGroupOC: groupB

diff --git a/tests/scripts/test057-memberof-refint b/tests/scripts/test057-memberof-refint
index ba480f8a604eee2ab9696450bc16e07a20d8a1ba..75e3e4b8701c4fa2004dbbb2d2b30703f9d50755 100755 (executable)
--- a/tests/scripts/test057-memberof-refint
+++ b/tests/scripts/test057-memberof-refint
@@ -107,7 +107,7 @@ ${mainInclude}olcDbMode: 384
 # {0}memberof, {1}$BACKEND, config
 dn: olcOverlay={0}memberof,olcDatabase={1}$BACKEND,cn=config
 objectClass: olcOverlayConfig
-objectClass: olcMemberOf
+objectClass: olcMemberOfConfig
 olcOverlay: {0}memberof
 olcMemberOfRefInt: TRUE
 olcMemberOfGroupOC: groupOfNames

diff --git a/tests/scripts/test066-autoca b/tests/scripts/test066-autoca
index 8003574e47adb59609e46f2bb484ceb2bc23b340..b94408fbc650a2e695485bcd7b73f1a095d2d271 100755 (executable)
--- a/tests/scripts/test066-autoca
+++ b/tests/scripts/test066-autoca
@@ -195,9 +195,9 @@ $LDAPMODIFY -D cn=config -H $URIP1 -y $CONFIGPWF <<EOF >> $TESTOUT 2>&1
 dn: olcOverlay=autoca,olcDatabase={1}$BACKEND,cn=config
 changetype: add
 objectClass: olcOverlayConfig
-objectClass: olcACAConfig
+objectClass: olcAutoCAConfig
 olcOverlay: autoca
-olcACAlocalDN: cn=localhost,ou=Servers,$BASEDN
+olcAutoCAlocalDN: cn=localhost,ou=Servers,$BASEDN
 EOF
 RC=$?
 if test $RC != 0 ; then