diff options
Diffstat (limited to 'docs-xml/manpages-3')
| -rw-r--r-- | docs-xml/manpages-3/idmap_ad.8.xml | 11 | ||||
| -rw-r--r-- | docs-xml/manpages-3/idmap_ldap.8.xml | 37 | ||||
| -rw-r--r-- | docs-xml/manpages-3/idmap_nss.8.xml | 15 | ||||
| -rw-r--r-- | docs-xml/manpages-3/idmap_rid.8.xml | 18 | ||||
| -rw-r--r-- | docs-xml/manpages-3/idmap_tdb.8.xml | 20 | ||||
| -rw-r--r-- | docs-xml/manpages-3/winbindd.8.xml | 3 |
6 files changed, 29 insertions, 75 deletions
diff --git a/docs-xml/manpages-3/idmap_ad.8.xml b/docs-xml/manpages-3/idmap_ad.8.xml index 766eb85090..fb0792eb9e 100644 --- a/docs-xml/manpages-3/idmap_ad.8.xml +++ b/docs-xml/manpages-3/idmap_ad.8.xml @@ -68,13 +68,12 @@ <programlisting> [global] - idmap domains = ALLDOMAINS - idmap config ALLDOMAINS:backend = ad - idmap config ALLDOMAINS:default = yes - idmap config ALLDOMAINS:range = 10000 - 300000000 + idmap backend = tdb + idmap uid = 1000000-1999999 + idmap gid = 1000000-1999999 - idmap alloc backend = tdb - idmap alloc config:range = 5000 - 9999 + idmap config CORP : backend = ad + idmap config CORP : range = 1000-999999 </programlisting> </refsect1> diff --git a/docs-xml/manpages-3/idmap_ldap.8.xml b/docs-xml/manpages-3/idmap_ldap.8.xml index ea7def3a0c..c09c141bb4 100644 --- a/docs-xml/manpages-3/idmap_ldap.8.xml +++ b/docs-xml/manpages-3/idmap_ldap.8.xml @@ -99,16 +99,6 @@ should be used. </para></listitem> </varlistentry> - - <varlistentry> - <term>range = low - high</term> - <listitem><para> - Defines the available matching uid and gid range from which - winbindd can allocate for users and groups. If the parameter - is absent, Winbind fail over to use the "idmap uid" - and "idmap gid" options from smb.conf. - </para></listitem> - </varlistentry> </variablelist> </refsect1> @@ -116,27 +106,20 @@ <title>EXAMPLES</title> <para> - The follow sets of a LDAP configuration which uses a slave server - running on localhost for fast fetching SID/gid/uid mappings, it - implies correct configuration of referrals. - The idmap alloc backend is pointed directly to the master to skip - the referral (and consequent reconnection to the master) that the - slave would return as allocation requires writing on the master. + The follow sets of a LDAP configuration which uses two LDAP + directories, one for storing the ID mappings and one for retrieving + new IDs. </para> <programlisting> [global] - idmap domains = ALLDOMAINS - idmap config ALLDOMAINS:default = yes - idmap config ALLDOMAINS:backend = ldap - idmap config ALLDOMAINS:ldap_base_dn = ou=idmap,dc=example,dc=com - idmap config ALLDOMAINS:ldap_url = ldap://localhost/ - idmap config ALLDOMAINS:range = 10000 - 50000 - - idmap alloc backend = ldap - idmap alloc config:ldap_base_dn = ou=idmap,dc=example,dc=com - idmap alloc config:ldap_url = ldap://master.example.com/ - idmap alloc config:range = 10000 - 50000 + idmap backend = ldap:ldap://localhost/ + idmap uid = 1000000-1999999 + idmap gid = 1000000-1999999 + + idmap alloc backend = ldap + idmap alloc config : ldap_url = ldap://id-master/ + idmap alloc config : ldap_base_dn = ou=idmap,dc=example,dc=com </programlisting> </refsect1> diff --git a/docs-xml/manpages-3/idmap_nss.8.xml b/docs-xml/manpages-3/idmap_nss.8.xml index 063ce73748..7d3503bcd1 100644 --- a/docs-xml/manpages-3/idmap_nss.8.xml +++ b/docs-xml/manpages-3/idmap_nss.8.xml @@ -38,17 +38,12 @@ <programlisting> [global] - idmap domains = SAMBA TRUSTEDDOMAINS + idmap backend = tdb + idmap uid = 1000000-1999999 + idmap gid = 1000000-1999999 - idmap config SAMBA:backend = nss - idmap config SAMBA:readonly = yes - - idmap config TRUSTEDDOMAINS:default = yes - idmap config TRUSTEDDOMAINS:backend = tdb - idmap config TRUSTEDDOMAINS:range = 10000 - 50000 - - idmap alloc backend = tdb - idmap alloc config:range = 10000 - 50000 + idmap config SAMBA : backend = nss + idmap config SAMBA : range = 1000-999999 </programlisting> </refsect1> diff --git a/docs-xml/manpages-3/idmap_rid.8.xml b/docs-xml/manpages-3/idmap_rid.8.xml index 1d80bf3a0e..5eba356a7d 100644 --- a/docs-xml/manpages-3/idmap_rid.8.xml +++ b/docs-xml/manpages-3/idmap_rid.8.xml @@ -47,6 +47,9 @@ by default start at 1000 (512 hexadecimal), this means a good value for base_rid can be 1000 as the resulting ID is calculated this way: ID = RID - BASE_RID + LOW RANGE ID. + </para> + <para> + Use of this parameter is deprecated. </para></listitem> </varlistentry> </variablelist> @@ -54,19 +57,16 @@ <refsect1> <title>EXAMPLES</title> - <para>This example shows how to configure 2 domains with idmap_rid</para> + <para>This example shows how to configure a domain with idmap_rid</para> <programlisting> [global] - idmap domains = MAIN TRUSTED1 + idmap backend = tdb + idmap uid = 1000000-1999999 + idmap gid = 1000000-1999999 - idmap config MAIN:backend = rid - idmap config MAIN:base_rid = 0 - idmap config MAIN:range = 10000 - 49999 - - idmap config TRUSTED1:backend = rid - idmap config TRUSTED1:base_rid = 1000 - idmap config TRUSTED1:range = 50000 - 99999 + idmap config TRUSTED : backend = rid + idmap config TRUSTED : range = 50000 - 99999 </programlisting> </refsect1> diff --git a/docs-xml/manpages-3/idmap_tdb.8.xml b/docs-xml/manpages-3/idmap_tdb.8.xml index 2caba1e6cb..4258d95ac6 100644 --- a/docs-xml/manpages-3/idmap_tdb.8.xml +++ b/docs-xml/manpages-3/idmap_tdb.8.xml @@ -60,26 +60,6 @@ </refsect1> <refsect1> - <title>EXAMPLES</title> - - <para> - The following example is equivalent to the pre-3.0.25 default idmap - configuration using the "idmap backend = tdb" setting. - </para> - - <programlisting> - [global] - idmap domains = ALLDOMAINS - idmap config ALLDOMAINS:default = yes - idmap config ALLDOMAINS:backend = tdb - idmap config ALLDOMAINS:range = 10000 - 50000 - - idmap alloc backend = tdb - idmap alloc config:range = 10000 - 50000 - </programlisting> -</refsect1> - -<refsect1> <title>AUTHOR</title> <para> diff --git a/docs-xml/manpages-3/winbindd.8.xml b/docs-xml/manpages-3/winbindd.8.xml index a4490968ef..7721bd480e 100644 --- a/docs-xml/manpages-3/winbindd.8.xml +++ b/docs-xml/manpages-3/winbindd.8.xml @@ -230,9 +230,6 @@ hosts: files wins determine which user and group ids correspond to Windows NT user and group rids. </para> - <para>See the <smbconfoption name="idmap domains"/> or the old <smbconfoption name="idmap backend"/> parameters in - <filename>smb.conf</filename> for options for sharing this - database, such as via LDAP.</para> </refsect1> |