Commit 555a8cc4 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#9706 - Fix typos and align slapd configuration documentation

parent 7b216087
...@@ -54,7 +54,7 @@ the whole of the {{slapd-ldap(5)}} options. ...@@ -54,7 +54,7 @@ the whole of the {{slapd-ldap(5)}} options.
For example, the {{SECT: Translucent Proxy}}, which retrieves entries from a For example, the {{SECT: Translucent Proxy}}, which retrieves entries from a
remote LDAP server that can be partially overridden by the defined database, has remote LDAP server that can be partially overridden by the defined database, has
only four specific {{translucent-}} directives, but can be configured using any only four specific {{translucent-}} directives, but can be configured using any
of the normal {{slapd-ldap(5)}} options. See {[slapo-translucent(5)}} for details. of the normal {{slapd-ldap(5)}} options. See {{slapo-translucent(5)}} for details.
Other {{SECT: Overlays}} allow you to tag directives in front of a normal Other {{SECT: Overlays}} allow you to tag directives in front of a normal
{{slapd-ldap(5)}} directive. For example, the {{slapo-chain(5)}} overlay does {{slapd-ldap(5)}} directive. For example, the {{slapo-chain(5)}} overlay does
......
...@@ -20,7 +20,7 @@ returns objects in response to search requests in the {{cn=Monitor}} ...@@ -20,7 +20,7 @@ returns objects in response to search requests in the {{cn=Monitor}}
subtree. Each object contains information about a particular aspect subtree. Each object contains information about a particular aspect
of the server. The information is held in a combination of user of the server. The information is held in a combination of user
applications and operational attributes. This information can be applications and operational attributes. This information can be
access with {{ldapsearch(1)}}, with any general-purpose LDAP browser, accessed with {{ldapsearch(1)}}, with any general-purpose LDAP browser,
or with specialized monitoring tools. The {{SECT:Accessing Monitoring or with specialized monitoring tools. The {{SECT:Accessing Monitoring
Information}} section provides a brief tutorial on how to use Information}} section provides a brief tutorial on how to use
{{ldapsearch}}(1) to access monitoring information, while the {{ldapsearch}}(1) to access monitoring information, while the
...@@ -210,9 +210,9 @@ trimmed to show only key information. ...@@ -210,9 +210,9 @@ trimmed to show only key information.
H3: Backends H3: Backends
The {{EX:cn=Backends,cn=Monitor}} object, itself, provides a list The {{EX:cn=Backends,cn=Monitor}} object provides a list of available
of available backends. The list of available backends all builtin backends. The list of available backends includes all builtin backends,
backends, as well as backends loaded by modules. For example: as well as those backends loaded by modules. For example:
> dn: cn=Backends,cn=Monitor > dn: cn=Backends,cn=Monitor
> monitoredInfo: config > monitoredInfo: config
......
...@@ -290,7 +290,7 @@ Note: This is not the same as using a SASL mechanism to ...@@ -290,7 +290,7 @@ Note: This is not the same as using a SASL mechanism to
authenticate the LDAP session. authenticate the LDAP session.
Pass-Through authentication works only with plaintext passwords, as Pass-Through authentication works only with plaintext passwords, as
used in the "simple bind" and "SASL PLAIN" authentication mechanisms.}} used in the "simple bind" and "SASL PLAIN" authentication mechanisms.
Pass-Through authentication is selective: it only affects users whose Pass-Through authentication is selective: it only affects users whose
{{userPassword}} attribute has a value marked with the "{SASL}" {{userPassword}} attribute has a value marked with the "{SASL}"
......
...@@ -543,6 +543,7 @@ H4: olcSyncrepl ...@@ -543,6 +543,7 @@ H4: olcSyncrepl
> [filter=<filter str>] > [filter=<filter str>]
> [scope=sub|one|base] > [scope=sub|one|base]
> [attrs=<attr list>] > [attrs=<attr list>]
> [exattrs=<attr list>]
> [attrsonly] > [attrsonly]
> [sizelimit=<limit>] > [sizelimit=<limit>]
> [timelimit=<limit>] > [timelimit=<limit>]
...@@ -597,7 +598,7 @@ The content of the syncrepl consumer is defined using a search ...@@ -597,7 +598,7 @@ The content of the syncrepl consumer is defined using a search
specification as its result set. The consumer slapd will specification as its result set. The consumer slapd will
send search requests to the provider slapd according to the search send search requests to the provider slapd according to the search
specification. The search specification includes {{EX:searchbase}}, specification. The search specification includes {{EX:searchbase}},
{{EX:scope}}, {{EX:filter}}, {{EX:attrs}}, {{EX:attrsonly}}, {{EX:scope}}, {{EX:filter}}, {{EX:attrs}}, {{EX:exattrs}}, {{EX:attrsonly}},
{{EX:sizelimit}}, and {{EX:timelimit}} parameters as in the normal {{EX:sizelimit}}, and {{EX:timelimit}} parameters as in the normal
search specification. The {{EX:searchbase}} parameter has no search specification. The {{EX:searchbase}} parameter has no
default value and must always be specified. The {{EX:scope}} defaults default value and must always be specified. The {{EX:scope}} defaults
...@@ -605,7 +606,8 @@ to {{EX:sub}}, the {{EX:filter}} defaults to {{EX:(objectclass=*)}}, ...@@ -605,7 +606,8 @@ to {{EX:sub}}, the {{EX:filter}} defaults to {{EX:(objectclass=*)}},
{{EX:attrs}} defaults to {{EX:"*,+"}} to replicate all user and operational {{EX:attrs}} defaults to {{EX:"*,+"}} to replicate all user and operational
attributes, and {{EX:attrsonly}} is unset by default. Both {{EX:sizelimit}} attributes, and {{EX:attrsonly}} is unset by default. Both {{EX:sizelimit}}
and {{EX:timelimit}} default to "unlimited", and only positive integers and {{EX:timelimit}} default to "unlimited", and only positive integers
or "unlimited" may be specified. or "unlimited" may be specified. The {{EX:exattrs}} option may also be used
to specify attributes that should be omitted from incoming entries.
The {{TERM[expand]LDAP Sync}} protocol has two operation The {{TERM[expand]LDAP Sync}} protocol has two operation
types: {{EX:refreshOnly}} and {{EX:refreshAndPersist}}. types: {{EX:refreshOnly}} and {{EX:refreshAndPersist}}.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment