Removed all references to ldbm from test data and man pages. Only slapd-ldbm.5 left.

doc/man/man5/slapd.conf.5

@@ -1052,7 +1052,6 @@ should be one of
 .BR dnssrv ,
 .BR hdb ,
 .BR ldap ,
-.BR ldbm ,
 .BR ldif ,
 .BR meta ,
 .BR monitor ,

doc/man/man5/slapo-syncprov.5

@@ -21,9 +21,6 @@ memory on startup, and maintained in memory thereafter. Checkpoints may be
 configured to write the contextCSN into the underlying database to minimize
 recovery time after an unclean shutdown.
 
-Note that due to deadlock constraints in the LDBM database, this overlay
-will only work in RefreshOnly mode, and cannot perform checkpoints, on LDBM.
-
 On databases that support inequality indexing, it is helpful to set an
 eq index on the entryCSN attribute when using this overlay.
 .SH CONFIGURATION

tests/data/slapd-aci.conf

@@ -50,8 +50,8 @@ rootpw		secret
 #bdb#index		cn,sn,uid	pres,eq,sub
 #hdb#index		objectClass	eq
 #hdb#index		cn,sn,uid	pres,eq,sub
-#ldbm#index		objectClass	eq
-#ldbm#index		cn,sn,uid	pres,eq,sub
+
+
 
 access to dn.subtree="dc=example,dc=com"
 	by dynacl/aci write

tests/data/slapd-acl.conf

@@ -42,7 +42,7 @@ access		to *
 #######################################################################
 
 database	@BACKEND@
-#ldbm#cachesize	0
+
 suffix		"dc=example,dc=com"
 directory	@TESTDIR@/db.1.a
 rootdn		"cn=Manager,dc=example,dc=com"
@@ -51,8 +51,8 @@ rootpw		secret
 #bdb#index		cn,sn,uid	pres,eq,sub
 #hdb#index		objectClass	eq
 #hdb#index		cn,sn,uid	pres,eq,sub
-#ldbm#index		objectClass	eq
-#ldbm#index		cn,sn,uid	pres,eq,sub
+
+
 
 #access		to attrs=objectclass dn.subtree="dc=example,dc=com"
 access		to attrs=objectclass

tests/data/slapd-cache-master.conf

@@ -41,7 +41,7 @@ rootpw		secret
 #bdb#index		cn,sn,uid	pres,eq,sub
 #hdb#index		objectClass	eq
 #hdb#index		cn,sn,uid	pres,eq,sub
-#ldbm#index		objectClass	eq
-#ldbm#index		cn,sn,uid	pres,eq,sub
+
+
 
 #monitor#database	monitor

tests/data/slapd-chain1.conf

@@ -50,7 +50,7 @@ chain-idassert-bind	bindmethod=simple
 #
 
 database	@BACKEND@
-#ldbm#cachesize	0
+
 suffix		"dc=example,dc=com"
 directory	@TESTDIR@/db.1.a
 rootdn		"cn=Manager,dc=example,dc=com"
@@ -59,7 +59,7 @@ rootpw		secret
 #bdb#index		cn,sn,uid	pres,eq,sub
 #hdb#index		objectClass	eq
 #hdb#index		cn,sn,uid	pres,eq,sub
-#ldbm#index		objectClass	eq
-#ldbm#index		cn,sn,uid	pres,eq,sub
+
+
 
 #monitor#database	monitor

tests/data/slapd-chain2.conf

@@ -39,7 +39,7 @@ argsfile	@TESTDIR@/slapd.2.args
 #
 
 database	@BACKEND@
-#ldbm#cachesize	0
+
 suffix		"dc=example,dc=com"
 directory	@TESTDIR@/db.2.a
 rootdn		"cn=Manager,dc=example,dc=com"
@@ -48,8 +48,8 @@ rootpw		secret
 #bdb#index		cn,sn,uid	pres,eq,sub
 #hdb#index		objectClass	eq
 #hdb#index		cn,sn,uid	pres,eq,sub
-#ldbm#index		objectClass	eq
-#ldbm#index		cn,sn,uid	pres,eq,sub
+
+
 
 #
 # uses the chain overlay as database specific;

tests/data/slapd-component.conf

@@ -44,6 +44,6 @@ rootdn		"cn=Manager,dc=example,dc=com"
 rootpw		secret
 #bdb#index		objectClass eq
 #hdb#index		objectClass eq
-#ldbm#index		objectClass eq
+
 
 #monitor#database	monitor

tests/data/slapd-config-undo.conf

@@ -14,8 +14,8 @@ rootpw		secret
 #bdb#index		cn,sn,uid	pres,eq,sub
 #hdb#index		objectClass	eq
 #hdb#index		cn,sn,uid	pres,eq,sub
-#ldbm#index		objectClass	eq
-#ldbm#index		cn,sn,uid	pres,eq,sub
+
+
 
 #monitor#database	monitor
 

tests/data/slapd-dds.conf

@@ -46,9 +46,9 @@ rootpw		secret
 #hdb#index		objectClass	eq
 #hdb#index		cn,sn,uid	pres,eq,sub
 #hdb#index		entryExpireTimestamp	eq
-#ldbm#index		objectClass	eq
-#ldbm#index		cn,sn,uid	pres,eq,sub
-#ldbm#index		entryExpireTimestamp	eq
+
+
+
 
 overlay		dds
 dds-max-ttl	1d

tests/data/slapd-deltasync-master.conf

@@ -44,8 +44,8 @@ rootdn		"cn=Manager,dc=example,dc=com"
 #bdb#index		entryUUID,entryCSN	eq
 #hdb#index		objectClass	eq
 #hdb#index		entryUUID,entryCSN	eq
-#ldbm#index		objectClass	eq
-#ldbm#index		entryUUID,entryCSN	eq
+
+
 
 overlay syncprov
 syncprov-reloadhint true
@@ -63,8 +63,8 @@ rootpw		secret
 #hdb#index		objectClass	eq
 #hdb#index		cn,sn,uid	pres,eq,sub
 #hdb#index		entryUUID,entryCSN	eq
-#ldbm#index		objectClass	eq
-#ldbm#index		cn,sn,uid	pres,eq,sub
+
+
 access to *
 	by users write
 	by * read

tests/data/slapd-deltasync-slave.conf

@@ -52,8 +52,8 @@ rootpw		secret
 #bdb#index		cn,sn,uid	pres,eq,sub
 #hdb#index		objectClass	eq
 #hdb#index		cn,sn,uid	pres,eq,sub
-#ldbm#index		objectClass	eq
-#ldbm#index		cn,sn,uid	pres,eq,sub
+
+
 
 # Don't change syncrepl spec yet
 syncrepl	rid=1

tests/data/slapd-dn.conf

@@ -42,7 +42,7 @@ rootpw		secret
 #bdb#index		cn,sn,uid	pres,eq,sub
 #hdb#index		objectClass	eq
 #hdb#index		cn,sn,uid	pres,eq,sub
-#ldbm#index		objectClass	eq
-#ldbm#index		cn,sn,uid	pres,eq,sub
+
+
 
 #monitor#database	monitor

tests/data/slapd-dynlist.conf

@@ -46,8 +46,8 @@ rootpw		secret
 #bdb#index		cn,sn,uid	pres,eq,sub
 #hdb#index		objectClass	eq
 #hdb#index		cn,sn,uid	pres,eq,sub
-#ldbm#index		objectClass	eq
-#ldbm#index		cn,sn,uid	pres,eq,sub
+
+
 
 overlay			dynlist
 ### DO NOT ADD ANY DIRECTIVE BELOW THIS; TEST APPENDS STUFF ###

tests/data/slapd-emptydn.conf

@@ -47,8 +47,8 @@ rootpw		secret
 #bdb#index		cn,sn,uid	pres,eq,sub
 #hdb#index		objectClass	eq
 #hdb#index		cn,sn,uid	pres,eq,sub
-#ldbm#index		objectClass	eq
-#ldbm#index		cn,sn,uid	pres,eq,sub
+
+
 
 access		to attrs=userPassword
 		by dn.exact="cn=Manager,c=US" write
@@ -72,8 +72,8 @@ rootpw		secret
 #bdb#index		cn,sn,uid	pres,eq,sub
 #hdb#index		objectClass	eq
 #hdb#index		cn,sn,uid	pres,eq,sub
-#ldbm#index		objectClass	eq
-#ldbm#index		cn,sn,uid	pres,eq,sub
+
+
 
 access		to attrs=userPassword
 		by self =wx

tests/data/slapd-glue-syncrepl1.conf

@@ -45,11 +45,11 @@ rootdn		"cn=Manager 1,dc=example,dc=com"
 #hdb#index		uid	pres,eq,sub
 #hdb#index		cn,sn	pres,eq,sub,subany
 #hdb#index		entryUUID,entryCSN	pres
-#ldbm#index		objectclass	eq
-#ldbm#index		uid	pres,eq,sub
-#ldbm#index		cn,sn	pres,eq,sub,subany
-#ldbm#dbnosync
-#ldbm#dbnolocking
+
+
+
+
+
 overlay		syncprov
 
 database	@BACKEND@
@@ -65,11 +65,11 @@ rootdn		"cn=Manager 1,dc=example,dc=com"
 #hdb#index		uid	pres,eq,sub
 #hdb#index		cn,sn	pres,eq,sub,subany
 #hdb#index		entryUUID,entryCSN	pres
-#ldbm#index		objectclass	eq
-#ldbm#index		uid	pres,eq,sub
-#ldbm#index		cn,sn	pres,eq,sub,subany
-#ldbm#dbnosync
-#ldbm#dbnolocking
+
+
+
+
+
 syncrepl	rid=1
 		provider=@URI2@
 		binddn="cn=Manager 2,dc=example,dc=com"
@@ -97,11 +97,11 @@ rootpw		secret
 #hdb#index		objectclass	eq
 #hdb#index		uid	pres,eq,sub
 #hdb#index		cn,sn	pres,eq,sub,subany
-#ldbm#index		objectclass	eq
-#ldbm#index		uid	pres,eq,sub
-#ldbm#index		cn,sn	pres,eq,sub,subany
-#ldbm#dbnosync
-#ldbm#dbnolocking
+
+
+
+
+
 #overlay		syncprov
 
 #monitor#database	monitor

tests/data/slapd-glue-syncrepl2.conf

@@ -45,11 +45,11 @@ rootdn		"cn=Manager 2,dc=example,dc=com"
 #hdb#index		uid	pres,eq,sub
 #hdb#index		cn,sn	pres,eq,sub,subany
 #hdb#index		entryUUID,entryCSN	pres
-#ldbm#index		objectclass	eq
-#ldbm#index		uid	pres,eq,sub
-#ldbm#index		cn,sn	pres,eq,sub,subany
-#ldbm#dbnosync
-#ldbm#dbnolocking
+
+
+
+
+
 syncrepl	rid=2
 		provider=@URI1@
 		binddn="cn=Manager 1,dc=example,dc=com"
@@ -78,11 +78,11 @@ rootdn		"cn=Manager 2,dc=example,dc=com"
 #hdb#index		uid	pres,eq,sub
 #hdb#index		cn,sn	pres,eq,sub,subany
 #hdb#index		entryUUID,entryCSN	pres
-#ldbm#index		objectclass	eq
-#ldbm#index		uid	pres,eq,sub
-#ldbm#index		cn,sn	pres,eq,sub,subany
-#ldbm#dbnosync
-#ldbm#dbnolocking
+
+
+
+
+
 overlay		syncprov
 
 
@@ -97,11 +97,11 @@ rootpw		secret
 #hdb#index		objectclass	eq
 #hdb#index		uid	pres,eq,sub
 #hdb#index		cn,sn	pres,eq,sub,subany
-#ldbm#index		objectclass	eq
-#ldbm#index		uid	pres,eq,sub
-#ldbm#index		cn,sn	pres,eq,sub,subany
-#ldbm#dbnosync
-#ldbm#dbnolocking
+
+
+
+
+
 #overlay		syncprov
 
 #monitor#database	monitor

tests/data/slapd-glue.conf

@@ -42,11 +42,11 @@ rootdn		"cn=Manager, dc=example,dc=com"
 #hdb#index		objectclass	eq
 #hdb#index		uid	pres,eq,sub
 #hdb#index		cn,sn	pres,eq,sub,subany
-#ldbm#index		objectclass	eq
-#ldbm#index		uid	pres,eq,sub
-#ldbm#index		cn,sn	pres,eq,sub,subany
-#ldbm#dbnosync
-#ldbm#dbnolocking
+
+
+
+
+
 
 database	@BACKEND@
 suffix		"ou=Groups,dc=example,dc=com"
@@ -59,11 +59,11 @@ rootdn		"cn=Manager, dc=example,dc=com"
 #hdb#index		objectclass	eq
 #hdb#index		uid	pres,eq,sub
 #hdb#index		cn,sn	pres,eq,sub,subany
-#ldbm#index		objectclass	eq
-#ldbm#index		uid	pres,eq,sub
-#ldbm#index		cn,sn	pres,eq,sub,subany
-#ldbm#dbnosync
-#ldbm#dbnolocking
+
+
+
+
+
 
 database	@BACKEND@
 suffix		"dc=example,dc=com"
@@ -76,10 +76,10 @@ rootpw		secret
 #hdb#index		objectclass	eq
 #hdb#index		uid	pres,eq,sub
 #hdb#index		cn,sn	pres,eq,sub,subany
-#ldbm#index		objectclass	eq
-#ldbm#index		uid	pres,eq,sub
-#ldbm#index		cn,sn	pres,eq,sub,subany
-#ldbm#dbnosync
-#ldbm#dbnolocking
+
+
+
+
+
 
 #monitor#database	monitor

tests/data/slapd-idassert.conf

@@ -58,7 +58,7 @@ access to *
 	by * search
 
 database	@BACKEND@
-#ldbm#cachesize	0
+
 suffix		"dc=example,dc=com"
 directory	@TESTDIR@/db.1.a
 rootdn		"cn=Manager,dc=example,dc=com"
@@ -67,8 +67,8 @@ rootpw		secret
 #bdb#index		cn,sn,uid	pres,eq,sub
 #hdb#index		objectClass	eq
 #hdb#index		cn,sn,uid	pres,eq,sub
-#ldbm#index		objectClass	eq
-#ldbm#index		cn,sn,uid	pres,eq,sub
+
+
 
 access to dn.exact="cn=Proxy,ou=Admin,dc=example,dc=com"
 		attrs=authzTo
@@ -76,7 +76,7 @@ access to dn.exact="cn=Proxy,ou=Admin,dc=example,dc=com"
 	by * =x
 
 database	@BACKEND@
-#ldbm#cachesize	0
+
 suffix		"dc=example,dc=it"
 directory	@TESTDIR@/db.2.a
 rootdn		"cn=Manager,dc=example,dc=it"
@@ -85,8 +85,8 @@ rootpw		secret
 #bdb#index		cn,sn,uid	pres,eq,sub
 #hdb#index		objectClass	eq
 #hdb#index		cn,sn,uid	pres,eq,sub
-#ldbm#index		objectClass	eq
-#ldbm#index		cn,sn,uid	pres,eq,sub
+
+
 
 database	ldap
 suffix		"o=Example,c=US"

tests/data/slapd-ldapglue.conf

@@ -76,7 +76,7 @@ rootpw		secret
 #bdb#index		cn,sn,uid	pres,eq,sub
 #hdb#index		objectClass	eq
 #hdb#index		cn,sn,uid	pres,eq,sub
-#ldbm#index		objectClass	eq
-#ldbm#index		cn,sn,uid	pres,eq,sub
+
+
 
 #monitor#database	monitor