Revert to 2.2 glue/subordinate config syntax

diff --git a/tests/data/slapd-glue-ldap.conf b/tests/data/slapd-glue-ldap.conf
index e8a3f3e483a6b6074140cb116d94896f381f59f7..32497bf9db7fb96a64953e6de3649615a077bb4e 100644 (file)
--- a/tests/data/slapd-glue-ldap.conf
+++ b/tests/data/slapd-glue-ldap.conf
@@ -32,8 +32,6 @@ argsfile    ./test-db/slapd.m.args
 #metamod#moduleload back_meta.la
 #monitormod#modulepath ../servers/slapd/back-monitor/
 #monitormod#moduleload back_monitor.la
-#gluemod#modulepath ../servers/slapd/overlays/
-#gluemod#moduleload glue.la
 #rwmmod#modulepath ../servers/slapd/overlays/
 #rwmmod#moduleload rwm.la
 
@@ -47,6 +45,7 @@ rwm-suffixmassage     "o=Example,c=US" "dc=example,dc=com"
 # remote
 database       ldap
 suffix         "ou=Meta,dc=example,dc=com"
+subordinate
 uri            "@URI2@"
 rootdn         "cn=Manager,dc=example,dc=com"
 chase-referrals        no
@@ -71,8 +70,4 @@ idassert-bind bindmethod=simple
                flags=non-prescriptive
 idassert-authzfrom     "dn.exact:cn=Manager,dc=example,dc=com"
 
-
-overlay                glue
-glue-sub       "ou=Meta,dc=example,dc=com"
-
 #monitor#database      monitor

diff --git a/tests/data/slapd-glue-syncrepl1.conf b/tests/data/slapd-glue-syncrepl1.conf
index 4f10f84b56a5d93085676acee09b57e69c08d0d5..ef9ebf485bd9b152e1bc40840d00c523ac1f0935 100644 (file)
--- a/tests/data/slapd-glue-syncrepl1.conf
+++ b/tests/data/slapd-glue-syncrepl1.conf
@@ -26,7 +26,6 @@ argsfile      ./testrun/slapd.1.args
 #mod#moduleload        back_@BACKEND@.la
 #monitormod#modulepath ../servers/slapd/back-monitor/
 #monitormod#moduleload back_monitor.la
-#gluemod#moduleload ../servers/slapd/overlays/glue.la
 #syncprovmod#moduleload ../servers/slapd/overlays/syncprov.la
 
 #######################################################################
@@ -35,6 +34,7 @@ argsfile      ./testrun/slapd.1.args
 
 database       @BACKEND@
 suffix         "ou=Information Technology Division,ou=People,dc=example,dc=com"
+subordinate
 directory      ./testrun/db.1.a
 rootdn         "cn=Manager 1,dc=example,dc=com"
 #bdb#index             objectclass     eq
@@ -54,6 +54,7 @@ overlay               syncprov
 
 database       @BACKEND@
 suffix         "ou=Groups,dc=example,dc=com"
+subordinate
 directory      ./testrun/db.1.b
 rootdn         "cn=Manager 1,dc=example,dc=com"
 #bdb#index             objectclass     eq
@@ -102,8 +103,5 @@ rootpw              secret
 #ldbm#dbnosync
 #ldbm#dbnolocking
 #overlay               syncprov
-overlay                glue
-glue-sub       "ou=Information Technology Division,ou=People,dc=example,dc=com"
-glue-sub       "ou=Groups,dc=example,dc=com"
 
 #monitor#database      monitor

diff --git a/tests/data/slapd-glue-syncrepl2.conf b/tests/data/slapd-glue-syncrepl2.conf
index 19ddc8d5d9ca307ad72aa8eed3da37b61fb8303a..2147cc16316a722876df7d56049c3cb3000a810c 100644 (file)
--- a/tests/data/slapd-glue-syncrepl2.conf
+++ b/tests/data/slapd-glue-syncrepl2.conf
@@ -26,7 +26,6 @@ argsfile      ./testrun/slapd.2.args
 #mod#moduleload        back_@BACKEND@.la
 #monitormod#modulepath ../servers/slapd/back-monitor/
 #monitormod#moduleload back_monitor.la
-#gluemod#moduleload ../servers/slapd/overlays/glue.la
 #syncprovmod#moduleload ../servers/slapd/overlays/syncprov.la
 
 #######################################################################
@@ -35,6 +34,7 @@ argsfile      ./testrun/slapd.2.args
 
 database       @BACKEND@
 suffix         "ou=Information Technology Division,ou=People,dc=example,dc=com"
+subordinate
 directory      ./testrun/db.2.a
 rootdn         "cn=Manager 2,dc=example,dc=com"
 #bdb#index             objectclass     eq
@@ -67,6 +67,7 @@ updateref     @URI1@
 
 database       @BACKEND@
 suffix         "ou=Groups,dc=example,dc=com"
+subordinate
 directory      ./testrun/db.2.b
 rootdn         "cn=Manager 2,dc=example,dc=com"
 #bdb#index             objectclass     eq
@@ -102,8 +103,5 @@ rootpw              secret
 #ldbm#dbnosync
 #ldbm#dbnolocking
 #overlay               syncprov
-overlay                glue
-glue-sub       "ou=Information Technology Division,ou=People,dc=example,dc=com"
-glue-sub       "ou=Groups,dc=example,dc=com"
 
 #monitor#database      monitor

diff --git a/tests/data/slapd-glue.conf b/tests/data/slapd-glue.conf
index 69e9178c565780fb18d690cd6fb2f465e977b634..4f9d1c2a9599bb96815a78426f4ed067f15f77c3 100644 (file)
--- a/tests/data/slapd-glue.conf
+++ b/tests/data/slapd-glue.conf
@@ -26,7 +26,6 @@ argsfile    ./testrun/slapd.1.args
 #mod#moduleload        back_@BACKEND@.la
 #monitormod#modulepath ../servers/slapd/back-monitor/
 #monitormod#moduleload back_monitor.la
-#gluemod#moduleload ../servers/slapd/overlays/glue.la
 
 #######################################################################
 # database definitions
@@ -34,6 +33,7 @@ argsfile    ./testrun/slapd.1.args
 
 database       @BACKEND@
 suffix         "ou=Information Technology Division,ou=People,dc=example,dc=com"
+subordinate
 directory      ./testrun/db.1.a
 rootdn         "cn=Manager, dc=example,dc=com"
 #bdb#index             objectclass     eq
@@ -50,6 +50,7 @@ rootdn                "cn=Manager, dc=example,dc=com"
 
 database       @BACKEND@
 suffix         "ou=Groups,dc=example,dc=com"
+subordinate
 directory      ./testrun/db.1.b
 rootdn         "cn=Manager, dc=example,dc=com"
 #bdb#index             objectclass     eq
@@ -80,8 +81,5 @@ rootpw                secret
 #ldbm#index            cn,sn   pres,eq,sub,subany
 #ldbm#dbnosync
 #ldbm#dbnolocking
-overlay glue
-glue-sub       "ou=Information Technology Division,ou=People,dc=example,dc=com"
-glue-sub       "ou=Groups,dc=example,dc=com"
 
 #monitor#database      monitor

diff --git a/tests/data/slapd-ldapglue.conf b/tests/data/slapd-ldapglue.conf
index e235aed4d8a0a3bf00005fe576c6a37aa9802d26..f1a40254e54fc98689bdd4f782f6df22cbb94553 100644 (file)
--- a/tests/data/slapd-ldapglue.conf
+++ b/tests/data/slapd-ldapglue.conf
@@ -29,7 +29,6 @@ argsfile    ./testrun/slapd.1.args
 #ldapmod#moduleload back_ldap.la
 #monitormod#modulepath ../servers/slapd/back-monitor/
 #monitormod#moduleload back_monitor.la
-#gluemod#moduleload ../servers/slapd/overlays/glue.la
 
 #######################################################################
 # database definitions
@@ -52,6 +51,7 @@ access to *
 # people branch
 database        ldap
 suffix          "ou=People,dc=example,dc=com"
+subordinate
 uri             "@URI2@"
 # FIXME: doesn't work with authz=native
 #sasl#idassert-bind    bindmethod=sasl authcid=proxy credentials=proxy @SASL_MECH@ mode=self
@@ -60,6 +60,7 @@ uri             "@URI2@"
 # groups branch
 database        ldap
 suffix          "ou=Groups,dc=example,dc=com"
+subordinate
 uri             "@URI3@"
 # FIXME: doesn't work with authz=native
 #sasl#idassert-bind    bindmethod=sasl authcid=proxy credentials=proxy @SASL_MECH@ mode=self
@@ -77,8 +78,5 @@ rootpw                secret
 #hdb#index             cn,sn,uid       pres,eq,sub
 #ldbm#index            objectClass     eq
 #ldbm#index            cn,sn,uid       pres,eq,sub
-overlay                glue
-glue-sub       "ou=groups,dc=example,dc=com"
-glue-sub       "ou=people,dc=example,dc=com"
 
 #monitor#database      monitor