Revert to 2.2 glue/subordinate config syntax

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

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

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

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

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