Commit e3e725cd authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5

parents 5a22509a 64d11337
Pipeline #507 passed with stage
in 28 minutes and 21 seconds
......@@ -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
......
......@@ -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
......
......@@ -14,7 +14,7 @@
## <http://www.OpenLDAP.org/license.html>.
echo "This test is no longer valid after the fixes in ITS#9015"
echo "http://www.openldap.org/its/index.cgi/?findid=9015"
echo "https://bugs.openldap.org/show_bug.cgi?id=9015"
exit 0
echo "running defines.sh"
......@@ -28,8 +28,8 @@ fi
echo ""
echo " This test tracks a case where a consumer fails to replicate from the provider"
echo " when the provider is dynamically configured for replication."
echo " See http://www.openldap.org/its/index.cgi/?findid=8521 and"
echo " See http://www.openldap.org/its/index.cgi/?findid=8281 for more information."
echo " See https://bugs.openldap.org/show_bug.cgi?id=8521 and"
echo " See https://bugs.openldap.org/show_bug.cgi?id=8281 for more information."
echo ""
PRODIR=$TESTDIR/pro
......
......@@ -24,7 +24,7 @@ fi
echo ""
echo " This test tracks a case where it was not possible to modify the syncprov overlay configuration"
echo " when the provider is dynamically configured for replication."
echo " See http://www.openldap.org/its/index.cgi/?findid=8616 for more information"
echo " See https://bugs.openldap.org/show_bug.cgi?id=8616 for more information"
echo ""
PRODIR=$TESTDIR/pro
......
......@@ -24,7 +24,7 @@ fi
echo ""
echo " This test tracks a case where it was not possible to modify the memberof overlay configuration"
echo " when the provider is dynamically configured for replication."
echo " See http://www.openldap.org/its/index.cgi/?findid=8663 for more information"
echo " See https://bugs.openldap.org/show_bug.cgi?id=8663 for more information"
echo ""
PRODIR=$TESTDIR/pro
......@@ -134,7 +134,7 @@ changetype: add
objectClass: olcOverlayConfig
objectClass: olcConfig
objectClass: top
objectClass: olcMemberOf
objectClass: olcMemberOfConfig
olcMemberOfGroupOC: groupOfNames
olcMemberOfMemberAD: member
olcMemberOfMemberOfAD: memberOf
......
......@@ -19,7 +19,7 @@ echo "running defines.sh"
echo ""
echo " This test tracks a case where the -g flag to slapcat fails to work"
echo " correctly, exporting the subordinate dbs as well as the root db."
echo " See http://www.openldap.org/its/index.cgi/?findid=8667 for more information."
echo " See https://bugs.openldap.org/show_bug.cgi?id=8667 for more information."
echo ""
DBDIR1=$TESTDIR/db.1.a
......
......@@ -45,7 +45,7 @@ fi
# 3. keep making changes on all servers to see things still work
echo "This test tracks a case where slapd deadlocks during a significant write load"
echo "See http://www.openldap.org/its/index.cgi/?findid=8752 for more information."
echo "See https://bugs.openldap.org/show_bug.cgi?id=8752 for more information."
MMR=4
iterations=20000
......
......@@ -36,7 +36,7 @@ if test $BACKEND = ldif ; then
fi
echo "This test tracks a case where changes are not refreshed when an old db is reloaded"
echo "See http://www.openldap.org/its/index.cgi/?findid=8800 for more information."
echo "See https://bugs.openldap.org/show_bug.cgi?id=8800 for more information."
MMR=4
XDIR=$TESTDIR/srv
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment