From c01bbc7e3bcdcb2e3ba905e8dabae4c768ab38c1 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Thu, 2 Feb 2017 10:43:01 -0800 Subject: [PATCH] Tweak examples to use back-mdb --- doc/guide/admin/appendix-changes.sdf | 10 +++++----- doc/guide/admin/overlays.sdf | 10 +++++----- doc/man/man5/slapd-config.5 | 6 +++--- doc/man/man5/slapo-auditlog.5 | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/guide/admin/appendix-changes.sdf b/doc/guide/admin/appendix-changes.sdf index 6e327ec205..92fef3bc49 100644 --- a/doc/guide/admin/appendix-changes.sdf +++ b/doc/guide/admin/appendix-changes.sdf @@ -45,18 +45,18 @@ original design called for auto-renaming of config entries when you insert or delete entries with ordered names, but that was not implemented in 2.3. It is now in 2.4. This means, e.g., if you have -> olcDatabase={1}bdb,cn=config +> olcDatabase={1}mdb,cn=config > olcSuffix: dc=example,dc=com and you want to add a new subordinate, now you can ldapadd: -> olcDatabase={1}bdb,cn=config +> olcDatabase={1}mdb,cn=config > olcSuffix: dc=foo,dc=example,dc=com -This will insert a new BDB database in slot 1 and bump all following databases - down one, so the original BDB database will now be named: +This will insert a new back-mdb database in slot 1 and bump all following databases + down one, so the original back-mdb database will now be named: -> olcDatabase={2}bdb,cn=config +> olcDatabase={2}mdb,cn=config > olcSuffix: dc=example,dc=com H3: Better {{B:cn=schema}} functionality diff --git a/doc/guide/admin/overlays.sdf b/doc/guide/admin/overlays.sdf index f5b6c277b4..685ac78279 100644 --- a/doc/guide/admin/overlays.sdf +++ b/doc/guide/admin/overlays.sdf @@ -182,7 +182,7 @@ H3: Audit Logging Configuration If the directory is running vi {{F:slapd.d}}, then the following LDIF could be used to add the overlay to the overlay list in {{B:cn=config}} and set what file the {{TERM:LDIF}} gets logged to (adjust to suit) -> dn: olcOverlay=auditlog,olcDatabase={1}hdb,cn=config +> dn: olcOverlay=auditlog,olcDatabase={1}mdb,cn=config > changetype: add > objectClass: olcOverlayConfig > objectClass: olcAuditLogConfig @@ -369,7 +369,7 @@ title attribute of any {{titleCatalog}} entries in the given scope. An example for use with {{cn=config}}: -> dn: olcOverlay=constraint,olcDatabase={1}hdb,cn=config +> dn: olcOverlay=constraint,olcDatabase={1}mdb,cn=config > changetype: add > objectClass: olcOverlayConfig > objectClass: olcConstraintConfig @@ -809,10 +809,10 @@ at server {{EX:ldap.example.com}}. > olcPcacheTemplate: "(&(sn=)(givenName=))" 0 3600 0 0 0 > olcPcacheTemplate: "(&(departmentNumber=)(secretary=))" 0 3600 > -> dn: olcDatabase={0}hdb,olcOverlay={0}pcache,olcDatabase={2}ldap,cn=config -> objectClass: olcHdbConfig +> dn: olcDatabase={0}mdb,olcOverlay={0}pcache,olcDatabase={2}ldap,cn=config +> objectClass: olcMdbConfig > objectClass: olcPcacheDatabase -> olcDatabase: {0}hdb +> olcDatabase: {0}mdb > olcDbDirectory: ./testrun/db.2.a > olcDbCacheSize: 20 > olcDbIndex: objectClass eq diff --git a/doc/man/man5/slapd-config.5 b/doc/man/man5/slapd-config.5 index fcb06dcbba..fc675958a5 100644 --- a/doc/man/man5/slapd-config.5 +++ b/doc/man/man5/slapd-config.5 @@ -1733,14 +1733,14 @@ when using the \fIsyncprov\fP overlay, which needs to follow \fIglue\fP in order to work over all of the glued databases. E.g. .RS .nf - dn: olcDatabase={1}bdb,cn=config + dn: olcDatabase={1}mdb,cn=config olcSuffix: dc=example,dc=com ... - dn: olcOverlay={0}glue,olcDatabase={1}bdb,cn=config + dn: olcOverlay={0}glue,olcDatabase={1}mdb,cn=config ... - dn: olcOverlay={1}syncprov,olcDatabase={1}bdb,cn=config + dn: olcOverlay={1}syncprov,olcDatabase={1}mdb,cn=config ... .fi .RE diff --git a/doc/man/man5/slapo-auditlog.5 b/doc/man/man5/slapo-auditlog.5 index 7cdcdb6a23..b4b9ef870d 100644 --- a/doc/man/man5/slapo-auditlog.5 +++ b/doc/man/man5/slapo-auditlog.5 @@ -38,7 +38,7 @@ The following LDIF could be used to add this overlay to .LP .RS .nf -dn: olcOverlay=auditlog,olcDatabase={1}hdb,cn=config +dn: olcOverlay=auditlog,olcDatabase={1}mdb,cn=config changetype: add objectClass: olcOverlayConfig objectClass: olcAuditLogConfig -- 2.39.5