From 4eecd27729bed0ac6da0c821a842afb478118bf3 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Thu, 19 Sep 2013 14:28:12 -0700 Subject: [PATCH] Update example slapd.conf bits to use mdb instead of bdb --- contrib/slapd-modules/allop/slapo-allop.5 | 2 +- contrib/slapd-modules/lastmod/slapo-lastmod.5 | 2 +- contrib/slapd-modules/smbk5pwd/README | 2 +- contrib/slapd-modules/usn/README | 2 +- doc/man/man5/slapd-relay.5 | 2 +- doc/man/man5/slapd.conf.5 | 6 ++++-- doc/man/man5/slapo-accesslog.5 | 4 ++-- doc/man/man5/slapo-dyngroup.5 | 2 +- doc/man/man5/slapo-ppolicy.5 | 2 +- doc/man/man5/slapo-valsort.5 | 2 +- 10 files changed, 14 insertions(+), 12 deletions(-) diff --git a/contrib/slapd-modules/allop/slapo-allop.5 b/contrib/slapd-modules/allop/slapo-allop.5 index 2a24014fb3..d92d1a00e3 100644 --- a/contrib/slapd-modules/allop/slapo-allop.5 +++ b/contrib/slapd-modules/allop/slapo-allop.5 @@ -44,7 +44,7 @@ affects all requests affects only requests directed to the suffix of a database .nf # per database - database bdb + database mdb suffix "dc=example,dc=com" # database specific directives ... overlay allop diff --git a/contrib/slapd-modules/lastmod/slapo-lastmod.5 b/contrib/slapd-modules/lastmod/slapo-lastmod.5 index 810a106fd0..54971a2270 100644 --- a/contrib/slapd-modules/lastmod/slapo-lastmod.5 +++ b/contrib/slapd-modules/lastmod/slapo-lastmod.5 @@ -147,7 +147,7 @@ request types that are considered equivalent to a write operation. .LP .RS .nf -database bdb +database mdb suffix dc=example,dc=com \... overlay lastmod diff --git a/contrib/slapd-modules/smbk5pwd/README b/contrib/slapd-modules/smbk5pwd/README index f67f2a336c..6985e18d65 100644 --- a/contrib/slapd-modules/smbk5pwd/README +++ b/contrib/slapd-modules/smbk5pwd/README @@ -25,7 +25,7 @@ To use the overlay, add: moduleload smbk5pwd.so ... - database bdb + database mdb ... overlay smbk5pwd diff --git a/contrib/slapd-modules/usn/README b/contrib/slapd-modules/usn/README index aa4f393356..3eeee9f1a0 100644 --- a/contrib/slapd-modules/usn/README +++ b/contrib/slapd-modules/usn/README @@ -7,7 +7,7 @@ To use the overlay, add: moduleload usn.so ... - database bdb + database mdb ... overlay usn diff --git a/doc/man/man5/slapd-relay.5 b/doc/man/man5/slapd-relay.5 index d94f35893c..0040dcc1f4 100644 --- a/doc/man/man5/slapd-relay.5 +++ b/doc/man/man5/slapd-relay.5 @@ -150,7 +150,7 @@ but none of the real to virtual. Access rules: .LP .nf - database bdb + database mdb suffix "dc=example,dc=com" # skip... access to dn.subtree="dc=example,dc=com" diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5 index df2c1b1516..68e4fde96c 100644 --- a/doc/man/man5/slapd.conf.5 +++ b/doc/man/man5/slapd.conf.5 @@ -1265,6 +1265,7 @@ should be one of .BR hdb , .BR ldap , .BR ldif , +.BR mdb , .BR meta , .BR monitor , .BR null , @@ -1294,6 +1295,7 @@ should be one of .BR hdb , .BR ldap , .BR ldif , +.BR mdb , .BR meta , .BR monitor , .BR null , @@ -1727,7 +1729,7 @@ 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 - database bdb + database mdb suffix dc=example,dc=com ... overlay glue @@ -2020,7 +2022,7 @@ access to attrs=userPassword by * auth # Read access to other attributes and entries. access to * by * read -database bdb +database mdb suffix "dc=our\-domain,dc=com" # The database directory MUST exist prior to # running slapd AND should only be accessible diff --git a/doc/man/man5/slapo-accesslog.5 b/doc/man/man5/slapo-accesslog.5 index 358fc6da66..f179e52485 100644 --- a/doc/man/man5/slapo-accesslog.5 +++ b/doc/man/man5/slapo-accesslog.5 @@ -102,7 +102,7 @@ succeed or not. The default is FALSE. .SH EXAMPLES .LP .nf - database bdb + database mdb suffix dc=example,dc=com \... overlay accesslog @@ -111,7 +111,7 @@ succeed or not. The default is FALSE. logbase search|compare ou=testing,dc=example,dc=com logold (objectclass=person) - database bdb + database mdb suffix cn=log \... index reqStart eq diff --git a/doc/man/man5/slapo-dyngroup.5 b/doc/man/man5/slapo-dyngroup.5 index aa3b4cfe4a..e8c2a2562c 100644 --- a/doc/man/man5/slapo-dyngroup.5 +++ b/doc/man/man5/slapo-dyngroup.5 @@ -33,7 +33,7 @@ will cause the to be evaluated for the result. .SH EXAMPLES .nf - database bdb + database mdb ... overlay dyngroup attrpair member memberURL diff --git a/doc/man/man5/slapo-ppolicy.5 b/doc/man/man5/slapo-ppolicy.5 index 8135dcce83..be52fa5c3b 100644 --- a/doc/man/man5/slapo-ppolicy.5 +++ b/doc/man/man5/slapo-ppolicy.5 @@ -762,7 +762,7 @@ administrative reset. .LP .RS .nf -database bdb +database mdb suffix dc=example,dc=com \|... overlay ppolicy diff --git a/doc/man/man5/slapo-valsort.5 b/doc/man/man5/slapo-valsort.5 index 4088258747..933d6eb579 100644 --- a/doc/man/man5/slapo-valsort.5 +++ b/doc/man/man5/slapo-valsort.5 @@ -61,7 +61,7 @@ for an attribute with a syntax other than Integer or NumericString. .SH EXAMPLES .LP .nf - database bdb + database mdb suffix dc=example,dc=com ... overlay valsort -- 2.39.5