test030 and test032 actually do the same things

[openldap] / tests / data / slapd-relay.conf

diff --git a/tests/data/slapd-relay.conf b/tests/data/slapd-relay.conf
index 74e846f3a95ccc92dd0b08409fd08d8d4cbb9234..5014f6812d3d1faba79bd1813e688b7da77b769c 100644 (file)
--- a/tests/data/slapd-relay.conf
+++ b/tests/data/slapd-relay.conf
@@ -26,6 +26,8 @@ argsfile    ./test-db/slapd.args
 #mod#moduleload        back_@BACKEND@.la
 #relaymod#modulepath ../servers/slapd/back-relay/
 #relaymod#moduleload back_relay.la
+#ldapmod#modulepath ../servers/slapd/back-ldap/
+#ldapmod#moduleload back_ldap.la
 #monitormod#modulepath ../servers/slapd/back-monitor/
 #monitormod#moduleload back_monitor.la
 #rwmmod#modulepath ../servers/slapd/overlays/
@@ -42,20 +44,31 @@ rootdn              "cn=Manager,dc=example,dc=com"
 rootpw         secret
 index          objectClass eq
 
-database       relay
+database       @RELAY@
 suffix         "o=Example,c=US"
-relay          "dc=example,dc=com" massage
+### back-relay can automatically instantiate the rwm overlay
+#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"
 
-database       relay
+database       @RELAY@
 suffix         "o=Esempio,c=IT"
-# relay                "dc=example,dc=com" massage
-# use this alternate form, which causes the target database
-# to be selected after DN massaging
+### back-ldap needs URI
+#ldap#uri              "@URI1@"
+### use this alternate form of back-relay, without the "relay" directive,
+### which causes the target database to be selected after DN massaging
 overlay                rwm
-rwm-suffixmassage      "o=Esempio,c=IT" "dc=example,dc=com"
+rwm-suffixmassage      "dc=example,dc=com"
 
-database       relay
+database       @RELAY@
 suffix         "o=Beispiel,c=DE"
-relay          "dc=example,dc=com" massage
+### back-relay can automatically instantiate the rwm overlay
+#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"
 
 #monitor#database monitor