diff options
| author | Derrell Lipman <derrell.lipman@unwireduniverse.com> | 2008-07-16 09:48:23 -0400 |
|---|---|---|
| committer | Derrell Lipman <derrell.lipman@unwireduniverse.com> | 2008-07-16 09:48:23 -0400 |
| commit | db7bff1babdb556efa54b7ff02d66fb50e833a30 (patch) | |
| tree | fc436d46a35ce503234aa20d60349795f8d28408 /docs-xml | |
| parent | deac1761f0695053dec3557e06be5d53e7d189e2 (diff) | |
| parent | ddc0d9deb32082a5d8d591800d638d0e96fa6ff3 (diff) | |
| download | samba-db7bff1babdb556efa54b7ff02d66fb50e833a30.tar.gz samba-db7bff1babdb556efa54b7ff02d66fb50e833a30.tar.bz2 samba-db7bff1babdb556efa54b7ff02d66fb50e833a30.zip | |
Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into v3-3-test
(This used to be commit 11d74fc51c637b8129304b5de85bbe02a86a69ce)
Diffstat (limited to 'docs-xml')
| -rw-r--r-- | docs-xml/smbdotconf/winbind/idmapbackend.xml | 4 | ||||
| -rw-r--r-- | docs-xml/smbdotconf/winbind/idmapconfig.xml | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/docs-xml/smbdotconf/winbind/idmapbackend.xml b/docs-xml/smbdotconf/winbind/idmapbackend.xml index 20e1115c5f..10c4cb30a4 100644 --- a/docs-xml/smbdotconf/winbind/idmapbackend.xml +++ b/docs-xml/smbdotconf/winbind/idmapbackend.xml @@ -8,9 +8,9 @@ The idmap backend provides a plugin interface for Winbind to use varying backends to store SID/uid/gid mapping tables. This option is mutually exclusive with the newer and more flexible - <smbconfoption name="idmap domains"/> parameter. The main difference + <smbconfoption name="idmap domains"/> parameter. The main difference between the "idmap backend" and the "idmap domains" - is that the former only allows on backend for all domains while the + is that the former only allows one backend for all domains while the latter supports configuring backends on a per domain basis. </para> diff --git a/docs-xml/smbdotconf/winbind/idmapconfig.xml b/docs-xml/smbdotconf/winbind/idmapconfig.xml index 63b0a907a8..08297d704c 100644 --- a/docs-xml/smbdotconf/winbind/idmapconfig.xml +++ b/docs-xml/smbdotconf/winbind/idmapconfig.xml @@ -7,9 +7,9 @@ <para> The idmap config prefix provides a means of managing each domain defined by the <smbconfoption name="idmap domains"/> option using Samba's - parameteric option support. The idmap config prefix should be + parametric option support. The idmap config prefix should be followed by the name of the domain, a colon, and a setting specific to - the chosen backend. There are three options available for all domains: + the chosen backend. There are three options available for all domains: </para> <variablelist> <varlistentry> @@ -45,9 +45,10 @@ The following example illustrates how to configure the <citerefentry> <refentrytitle>idmap_ad</refentrytitle><manvolnum>8</manvolnum></citerefentry> for the CORP domain and the <citerefentry><refentrytitle>idmap_tdb</refentrytitle> - <manvolnum>8</manvolnum></citerefentry> backend for all other domains. The - TRUSTEDDOMAINS string is simply a key used to reference the "idmap + <manvolnum>8</manvolnum></citerefentry> backend for all other domains. The + TRUSTEDDOMAINS string is simply an arbitrary key used to reference the "idmap config" settings and does not represent the actual name of a domain. + It is a catchall domain backend for any domain not explicitly listed. </para> <programlisting> |