partial fulfilment of ITS#3705

tests/data/slapd-relay.conf

@@ -49,48 +49,48 @@ index		objectClass eq
 database	@RELAY@
 suffix		"o=Example,c=US"
 ### back-relay can automatically instantiate the rwm overlay
-#relay#relay		"dc=example,dc=com" massage
-#relay#rwm-map		objectClass groupOfNames groupOfUniqueNames
-#relay#rwm-map		objectClass uidObject dcObject
-#relay#rwm-map		attribute member uniqueMember
-#relay#rwm-map		attribute uid dc
+#relay-relay#relay		"dc=example,dc=com" massage
+#relay-relay#rwm-map		objectClass groupOfNames groupOfUniqueNames
+#relay-relay#rwm-map		objectClass uidObject dcObject
+#relay-relay#rwm-map		attribute member uniqueMember
+#relay-relay#rwm-map		attribute uid dc
 ### back-ldap needs explicit instantiation of the rwm overlay
-#ldap#uri		"@URI1@"
-#ldap#overlay		rwm
-#ldap#rwm-suffixmassage	"dc=example,dc=com"
-#ldap#rwm-map		objectClass groupOfNames groupOfUniqueNames
-#ldap#rwm-map		objectClass uidObject dcObject
-#ldap#rwm-map		attribute member uniqueMember
-#ldap#rwm-map		attribute uid dc
-#meta#uri		"@URI1@o=Example,c=US"
-#meta#suffixmassage	"o=Example,c=US" "dc=example,dc=com"
-#meta#map		objectClass groupOfNames groupOfUniqueNames
-#meta#map		objectClass uidObject dcObject
-#meta#map		attribute member uniqueMember
-#meta#map		attribute uid dc
+#relay-ldap#uri		"@URI1@"
+#relay-ldap#overlay		rwm
+#relay-ldap#rwm-suffixmassage	"dc=example,dc=com"
+#relay-ldap#rwm-map		objectClass groupOfNames groupOfUniqueNames
+#relay-ldap#rwm-map		objectClass uidObject dcObject
+#relay-ldap#rwm-map		attribute member uniqueMember
+#relay-ldap#rwm-map		attribute uid dc
+#relay-meta#uri		"@URI1@o=Example,c=US"
+#relay-meta#suffixmassage	"o=Example,c=US" "dc=example,dc=com"
+#relay-meta#map		objectClass groupOfNames groupOfUniqueNames
+#relay-meta#map		objectClass uidObject dcObject
+#relay-meta#map		attribute member uniqueMember
+#relay-meta#map		attribute uid dc
 
 database	@RELAY@
 suffix		"o=Esempio,c=IT"
 ### use this alternate form of back-relay, without the "relay" directive,
 ### which causes the target database to be selected after DN massaging
-#relay#overlay		rwm
-#relay#rwm-suffixmassage	"dc=example,dc=com"
+#relay-relay#overlay		rwm
+#relay-relay#rwm-suffixmassage	"dc=example,dc=com"
 ### back-ldap needs URI
-#ldap#uri		"@URI1@"
-#ldap#overlay		rwm
-#ldap#rwm-suffixmassage	"dc=example,dc=com"
-#meta#uri		"@URI1@o=Esempio,c=IT"
-#meta#suffixmassage	"o=Esempio,c=IT" "dc=example,dc=com"
+#relay-ldap#uri		"@URI1@"
+#relay-ldap#overlay		rwm
+#relay-ldap#rwm-suffixmassage	"dc=example,dc=com"
+#relay-meta#uri		"@URI1@o=Esempio,c=IT"
+#relay-meta#suffixmassage	"o=Esempio,c=IT" "dc=example,dc=com"
 
 database	@RELAY@
 suffix		"o=Beispiel,c=DE"
 ### back-relay can automatically instantiate the rwm overlay
-#relay#relay		"dc=example,dc=com" massage
+#relay-relay#relay		"dc=example,dc=com" massage
 ### back-ldap needs explicit instantiation of the rwm overlay
-#ldap#uri		"@URI1@"
-#ldap#overlay		rwm
-#ldap#rwm-suffixmassage	"dc=example,dc=com"
-#meta#uri		"@URI1@o=Beispiel,c=DE"
-#meta#suffixmassage	"o=Beispiel,c=DE" "dc=example,dc=com"
+#relay-ldap#uri		"@URI1@"
+#relay-ldap#overlay		rwm
+#relay-ldap#rwm-suffixmassage	"dc=example,dc=com"
+#relay-meta#uri		"@URI1@o=Beispiel,c=DE"
+#relay-meta#suffixmassage	"o=Beispiel,c=DE" "dc=example,dc=com"
 
 #monitor#database monitor