diff options
Diffstat (limited to 'docs-xml/manpages-3')
| -rw-r--r-- | docs-xml/manpages-3/idmap_ad.8.xml | 7 | ||||
| -rw-r--r-- | docs-xml/manpages-3/idmap_adex.8.xml | 5 | ||||
| -rw-r--r-- | docs-xml/manpages-3/idmap_autorid.8.xml | 14 | ||||
| -rw-r--r-- | docs-xml/manpages-3/idmap_hash.8.xml | 5 | ||||
| -rw-r--r-- | docs-xml/manpages-3/idmap_ldap.8.xml | 107 | ||||
| -rw-r--r-- | docs-xml/manpages-3/idmap_nss.8.xml | 5 | ||||
| -rw-r--r-- | docs-xml/manpages-3/idmap_rid.8.xml | 7 | ||||
| -rw-r--r-- | docs-xml/manpages-3/idmap_tdb.8.xml | 55 | ||||
| -rw-r--r-- | docs-xml/manpages-3/idmap_tdb2.8.xml | 30 | ||||
| -rw-r--r-- | docs-xml/manpages-3/net.8.xml | 131 | ||||
| -rw-r--r-- | docs-xml/manpages-3/smb.conf.5.xml | 4 | ||||
| -rw-r--r-- | docs-xml/manpages-3/vfs_gpfs.8.xml | 20 | ||||
| -rw-r--r-- | docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml | 14 | ||||
| -rw-r--r-- | docs-xml/manpages-3/wbinfo.1.xml | 2 | ||||
| -rw-r--r-- | docs-xml/manpages-3/winbindd.8.xml | 18 |
15 files changed, 238 insertions, 186 deletions
diff --git a/docs-xml/manpages-3/idmap_ad.8.xml b/docs-xml/manpages-3/idmap_ad.8.xml index 3ecb07e590c..fbadaf2d55c 100644 --- a/docs-xml/manpages-3/idmap_ad.8.xml +++ b/docs-xml/manpages-3/idmap_ad.8.xml @@ -34,7 +34,7 @@ to configure it separately for each domain for which one wants to use it, using disjoint ranges. One usually needs to configure a writeable default idmap range, using for example the - <parameter>tdb</parameter> or <parameter>ldap</parameter>) + <parameter>tdb</parameter> or <parameter>ldap</parameter> backend, in order to be able to map the BUILTIN sids and possibly other trusted domains. The writeable default config is also needed in order to be able to create group mappings. @@ -85,9 +85,8 @@ <programlisting> [global] - idmap backend = tdb - idmap uid = 1000000-1999999 - idmap gid = 1000000-1999999 + idmap config * : backend = tdb + idmap config * : range = 1000000-1999999 idmap config CORP : backend = ad idmap config CORP : range = 1000-999999 diff --git a/docs-xml/manpages-3/idmap_adex.8.xml b/docs-xml/manpages-3/idmap_adex.8.xml index 7349caa61e3..16d12cdbbc9 100644 --- a/docs-xml/manpages-3/idmap_adex.8.xml +++ b/docs-xml/manpages-3/idmap_adex.8.xml @@ -66,9 +66,8 @@ <programlisting> [global] - idmap backend = adex - idmap uid = 1000-4000000000 - idmap gid = 1000-4000000000 + idmap config * : backend = adex + idmap config * : range = 1000-4000000000 winbind nss info = adex winbind normalize names = yes diff --git a/docs-xml/manpages-3/idmap_autorid.8.xml b/docs-xml/manpages-3/idmap_autorid.8.xml index 38790ea2b04..b5a9bde2e66 100644 --- a/docs-xml/manpages-3/idmap_autorid.8.xml +++ b/docs-xml/manpages-3/idmap_autorid.8.xml @@ -88,9 +88,8 @@ workgroup = CUSTOMER realm = CUSTOMER.COM - idmap backend = autorid - idmap uid = 1000000-1999999 - idmap gid = 1000000-1999999 + idmap config * : backend = autorid + idmap config * : range = 1000000-1999999 </programlisting> @@ -98,7 +97,7 @@ This example shows how to configure idmap_autorid as default for all domains with a potentially large amount of users plus a specific configuration for a trusted domain - that uses the SFU mapping scheme. Please note that idmap uid/gid + that uses the SFU mapping scheme. Please note that idmap ranges and sfu ranges are not allowed to overlap. </para> @@ -108,10 +107,9 @@ workgroup = CUSTOMER realm = CUSTOMER.COM - idmap backend = autorid - autorid:rangesize = 1000000 - idmap uid = 1000000-19999999 - idmap gid = 1000000-19999999 + idmap config * : backend = autorid + idmap config * : range = 1000000-19999999 + idmap config * : rangesize = 1000000 idmap config TRUSTED : backend = ad idmap config TRUSTED : range = 50000 - 99999 diff --git a/docs-xml/manpages-3/idmap_hash.8.xml b/docs-xml/manpages-3/idmap_hash.8.xml index 2bbae713544..f3ec6a7bc25 100644 --- a/docs-xml/manpages-3/idmap_hash.8.xml +++ b/docs-xml/manpages-3/idmap_hash.8.xml @@ -52,9 +52,8 @@ <programlisting> [global] - idmap backend = hash - idmap uid = 1000-4000000000 - idmap gid = 1000-4000000000 + idmap config * : backend = hash + idmap config * : range = 1000-4000000000 winbind nss info = hash winbind normalize names = yes diff --git a/docs-xml/manpages-3/idmap_ldap.8.xml b/docs-xml/manpages-3/idmap_ldap.8.xml index e3588b95bcf..2c0fcfd17c6 100644 --- a/docs-xml/manpages-3/idmap_ldap.8.xml +++ b/docs-xml/manpages-3/idmap_ldap.8.xml @@ -27,26 +27,9 @@ <para> In contrast to read only backends like idmap_rid, it is an allocating backend: This means that it needs to allocate new user and group IDs in - order to create new mappings. The allocator can be provided by the - idmap_ldap backend itself or by any other allocating backend like - idmap_tdb or idmap_tdb2. This is configured with the - parameter <parameter>idmap alloc backend</parameter>. + order to create new mappings. </para> - <para> - Note that in order for this (or any other allocating) backend to - function at all, the default backend needs to be writeable. - The ranges used for uid and gid allocation are the default ranges - configured by "idmap uid" and "idmap gid". - </para> - - <para> - Furthermore, since there is only one global allocating backend - responsible for all domains using writeable idmap backends, - any explicitly configured domain with idmap backend ldap - should have the same range as the default range, since it needs - to use the global uid / gid allocator. See the example below. - </para> </refsynopsisdiv> <refsect1> @@ -56,7 +39,7 @@ <varlistentry> <term>ldap_base_dn = DN</term> <listitem><para> - Defines the directory base suffix to use when searching for + Defines the directory base suffix to use for SID/uid/gid mapping entries. If not defined, idmap_ldap will default to using the "ldap idmap suffix" option from smb.conf. </para></listitem> @@ -65,15 +48,21 @@ <varlistentry> <term>ldap_user_dn = DN</term> <listitem><para> - Defines the user DN to be used for authentication. If absent an - anonymous bind will be performed. + Defines the user DN to be used for authentication. + The secret for authenticating this user should be + stored with net idmap secret + (see <citerefentry><refentrytitle>net</refentrytitle> + <manvolnum>8</manvolnum></citerefentry>). + If absent, the ldap credentials from the ldap passdb configuration + are used, and if these are also absent, an anonymous + bind will be performed as last fallback. </para></listitem> </varlistentry> <varlistentry> <term>ldap_url = ldap://server/</term> <listitem><para> - Specifies the LDAP server to use when searching for existing + Specifies the LDAP server to use for SID/uid/gid map entries. If not defined, idmap_ldap will assume that ldap://localhost/ should be used. </para></listitem> @@ -84,64 +73,50 @@ <listitem><para> Defines the available matching uid and gid range for which the backend is authoritative. - If the parameter is absent, Winbind fails over to use the - "idmap uid" and "idmap gid" options - from smb.conf. </para></listitem> </varlistentry> </variablelist> </refsect1> <refsect1> - <title>IDMAP ALLOC OPTIONS</title> - - <variablelist> - <varlistentry> - <term>ldap_base_dn = DN</term> - <listitem><para> - Defines the directory base suffix under which new SID/uid/gid mapping - entries should be stored. If not defined, idmap_ldap will default - to using the "ldap idmap suffix" option from smb.conf. - </para></listitem> - </varlistentry> - - <varlistentry> - <term>ldap_user_dn = DN</term> - <listitem><para> - Defines the user DN to be used for authentication. If absent an - anonymous bind will be performed. - </para></listitem> - </varlistentry> - - <varlistentry> - <term>ldap_url = ldap://server/</term> - <listitem><para> - Specifies the LDAP server to which modify/add/delete requests should - be sent. If not defined, idmap_ldap will assume that ldap://localhost/ - should be used. - </para></listitem> - </varlistentry> - </variablelist> -</refsect1> - -<refsect1> <title>EXAMPLES</title> <para> - The follow sets of a LDAP configuration which uses two LDAP - directories, one for storing the ID mappings and one for retrieving - new IDs. + The following example shows how an ldap directory is used as the + default idmap backend. It also configures the idmap range and base + directory suffix. The secret for the ldap_user_dn has to be set with + "net idmap secret '*' password". </para> <programlisting> [global] - idmap backend = ldap:ldap://localhost/ - idmap uid = 1000000-1999999 - idmap gid = 1000000-1999999 + idmap config * : backend = ldap + idmap config * : range = 1000000-1999999 + idmap config * : ldap_url = ldap://localhost/ + idmap config * : ldap_base_dn = ou=idmap,dc=example,dc=com + idmap config * : ldap_user_dn = cn=idmap_admin,dc=example,dc=com + </programlisting> + + <para> + This example shows how ldap can be used as a readonly backend while + tdb is the default backend used to store the mappings. + It adds an explicit configuration for some domain DOM1, that + uses the ldap idmap backend. Note that a range disjoint from the + default range is used. + </para> - 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> + [global] + # "backend = tdb" is redundant here since it is the default + idmap config * : backend = tdb + idmap config * : range = 1000000-1999999 + + idmap config DOM1 : backend = ldap + idmap config DOM1 : range = 2000000-2999999 + idmap config DOM1 : read only = yes + idmap config DOM1 : ldap_url = ldap://server/ + idmap config DOM1 : ldap_base_dn = ou=idmap,dc=dom1,dc=example,dc=com + idmap config DOM1 : ldap_user_dn = cn=idmap_admin,dc=dom1,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 a7fdca033b1..576eef666a9 100644 --- a/docs-xml/manpages-3/idmap_nss.8.xml +++ b/docs-xml/manpages-3/idmap_nss.8.xml @@ -38,9 +38,8 @@ <programlisting> [global] - idmap backend = tdb - idmap uid = 1000000-1999999 - idmap gid = 1000000-1999999 + idmap config * : backend = tdb + idmap config * : range = 1000000-1999999 idmap config SAMBA : backend = nss idmap config SAMBA : range = 1000-999999 diff --git a/docs-xml/manpages-3/idmap_rid.8.xml b/docs-xml/manpages-3/idmap_rid.8.xml index a2a1c58a6f4..3f8735288ca 100644 --- a/docs-xml/manpages-3/idmap_rid.8.xml +++ b/docs-xml/manpages-3/idmap_rid.8.xml @@ -28,7 +28,7 @@ Currently, there should to be an explicit idmap configuration for each domain that should use the idmap_rid backend, using disjoint ranges. One usually needs to define a writeable default idmap range, using - a backent like <parameter>tdb</parameter> or <parameter>ldap</parameter> + a backend like <parameter>tdb</parameter> or <parameter>ldap</parameter> that can create unix ids, in order to be able to map the BUILTIN sids and other domains, and also in order to be able to create group mappings. See the example below. @@ -106,9 +106,8 @@ security = domain workgroup = MAIN - idmap backend = tdb - idmap uid = 1000000-1999999 - idmap gid = 1000000-1999999 + idmap config * : backend = tdb + idmap config * : range = 1000000-1999999 idmap config MAIN : backend = rid idmap config MAIN : range = 10000 - 49999 diff --git a/docs-xml/manpages-3/idmap_tdb.8.xml b/docs-xml/manpages-3/idmap_tdb.8.xml index 06a29679c85..c67d6cb9bc2 100644 --- a/docs-xml/manpages-3/idmap_tdb.8.xml +++ b/docs-xml/manpages-3/idmap_tdb.8.xml @@ -27,25 +27,7 @@ <para> In contrast to read only backends like idmap_rid, it is an allocating backend: This means that it needs to allocate new user and group IDs in - order to create new mappings. The allocator can be provided by the - idmap_tdb backend itself or by any other allocating backend like - idmap_ldap or idmap_tdb2. This is configured with the - parameter <parameter>idmap alloc backend</parameter>. - </para> - - <para> - Note that in order for this (or any other allocating) backend to - function at all, the default backend needs to be writeable. - The ranges used for uid and gid allocation are the default ranges - configured by "idmap uid" and "idmap gid". - </para> - - <para> - Furthermore, since there is only one global allocating backend - responsible for all domains using writeable idmap backends, - any explicitly configured domain with idmap backend tdb - should have the same range as the default range, since it needs - to use the global uid / gid allocator. See the example below. + order to create new mappings. </para> </refsynopsisdiv> @@ -58,9 +40,6 @@ <listitem><para> Defines the available matching uid and gid range for which the backend is authoritative. - If the parameter is absent, Winbind fails over to use - the "idmap uid" and "idmap gid" options - from smb.conf. </para></listitem> </varlistentry> </variablelist> @@ -71,38 +50,14 @@ <para> This example shows how tdb is used as a the default idmap backend. - It configures the idmap range through the global options for all - domains encountered. This same range is used for uid/gid allocation. - </para> - - <programlisting> - [global] - # "idmap backend = tdb" is redundant here since it is the default - idmap backend = tdb - idmap uid = 1000000-2000000 - idmap gid = 1000000-2000000 - </programlisting> - - <para> - This (rather theoretical) example shows how tdb can be used as the - allocating backend while ldap is the default backend used to store - the mappings. - It adds an explicit configuration for some domain DOM1, that - uses the tdb idmap backend. Note that the same range as the - default uid/gid range is used, since the allocator has to serve - both the default backend and the explicitly configured domain DOM1. + This configured range is used for uid and gid allocation. </para> <programlisting> [global] - idmap backend = ldap - idmap uid = 1000000-2000000 - idmap gid = 1000000-2000000 - # use a different uid/gid allocator: - idmap alloc backend = tdb - - idmap config DOM1 : backend = tdb - idmap config DOM1 : range = 1000000-2000000 + # "backend = tdb" is redundant here since it is the default + idmap config * : backend = tdb + idmap config * : range = 1000000-2000000 </programlisting> </refsect1> diff --git a/docs-xml/manpages-3/idmap_tdb2.8.xml b/docs-xml/manpages-3/idmap_tdb2.8.xml index a5d1080474e..980ffe6eff8 100644 --- a/docs-xml/manpages-3/idmap_tdb2.8.xml +++ b/docs-xml/manpages-3/idmap_tdb2.8.xml @@ -28,25 +28,7 @@ <para> In contrast to read only backends like idmap_rid, it is an allocating backend: This means that it needs to allocate new user and group IDs in - order to create new mappings. The allocator can be provided by the - idmap_tdb2 backend itself or by any other allocating backend like - idmap_tdb or idmap_ldap. This is configured with the - parameter <parameter>idmap alloc backend</parameter>. - </para> - - <para> - Note that in order for this (or any other allocating) backend to - function at all, the default backend needs to be writeable. - The ranges used for uid and gid allocation are the default ranges - configured by "idmap uid" and "idmap gid". - </para> - - <para> - Furthermore, since there is only one global allocating backend - responsible for all domains using writeable idmap backends, - any explicitly configured domain with idmap backend tdb2 - should have the same range as the default range, since it needs - to use the global uid / gid allocator. See the example below. + order to create new mappings. </para> </refsynopsisdiv> @@ -59,9 +41,6 @@ <listitem><para> Defines the available matching uid and gid range for which the backend is authoritative. - If the parameter is absent, Winbind fails over to use - the "idmap uid" and "idmap gid" options - from smb.conf. </para></listitem> </varlistentry> </variablelist> @@ -108,14 +87,13 @@ <para> This example shows how tdb2 is used as a the default idmap backend. It configures the idmap range through the global options for all - domains encountered. This same range is used for uid/gid allocation. + domains encountered. </para> <programlisting> [global] - idmap backend = tdb2 - idmap uid = 1000000-2000000 - idmap gid = 1000000-2000000 + idmap config * : backend = tdb2 + idmap config * : range = 1000000-2000000 </programlisting> </refsect1> diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml index d69a3b72205..2c6c11ecf84 100644 --- a/docs-xml/manpages-3/net.8.xml +++ b/docs-xml/manpages-3/net.8.xml @@ -795,8 +795,122 @@ appear in your system. <para>List all interdomain trust relationships.</para> </refsect3> +</refsect2> + +<refsect2> +<title>RPC TRUST</title> + +<refsect3> +<title>RPC TRUST CREATE</title> + +<para>Create a trust object by calling lsaCreateTrustedDomainEx2. +The can be done on a single server or on two servers at once with the +possibility to use a random trust password.</para> + +<variablelist><title>Options:</title> +<varlistentry> +<term>otherserver</term> +<listitem><para>Domain controller of the second domain</para></listitem> +</varlistentry> + +<varlistentry> +<term>otheruser</term> +<listitem><para>Admin user in the second domain</para></listitem> +</varlistentry> + +<varlistentry> +<term>otherdomainsid</term> +<listitem><para>SID of the second domain</para></listitem> +</varlistentry> + +<varlistentry> +<term>other_netbios_domain</term> +<listitem><para>NetBIOS (short) name of the second domain</para></listitem> +</varlistentry> + +<varlistentry> +<term>otherdomain</term> +<listitem><para>DNS (full) name of the second domain</para></listitem> +</varlistentry> + +<varlistentry> +<term>trustpw</term> +<listitem><para>Trust password</para></listitem> +</varlistentry> +</variablelist> + +<variablelist><title>Examples:</title> +<varlistentry> +<term>Create a trust object on srv1.dom1.dom for the domain dom2</term> +<listitem><literallayout> +net rpc trust create \ + otherdomainsid=S-x-x-xx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxx \ + other_netbios_domain=dom2 \ + otherdomain=dom2.dom \ + trustpw=12345678 \ + -S srv1.dom1.dom +</literallayout></listitem> +</varlistentry> +<varlistentry> +<term>Create a trust relationship between dom1 and dom2</term> +<listitem><literallayout> +net rpc trust create \ + otherserver=srv2.dom2.test \ + otheruser=dom2adm \ + -S srv1.dom1.dom +</literallayout></listitem> +</varlistentry> +</variablelist> +</refsect3> <refsect3> +<title>RPC TRUST DELETE</title> + +<para>Delete a trust trust object by calling lsaDeleteTrustedDomain. +The can be done on a single server or on two servers at once.</para> + +<variablelist><title>Options:</title> +<varlistentry> +<term>otherserver</term> +<listitem><para>Domain controller of the second domain</para></listitem> +</varlistentry> + +<varlistentry> +<term>otheruser</term> +<listitem><para>Admin user in the second domain</para></listitem> +</varlistentry> + +<varlistentry> +<term>otherdomainsid</term> +<listitem><para>SID of the second domain</para></listitem> +</varlistentry> +</variablelist> + +<variablelist><title>Examples:</title> +<varlistentry> +<term>Delete a trust object on srv1.dom1.dom for the domain dom2</term> +<listitem><literallayout> +net rpc trust delete \ + otherdomainsid=S-x-x-xx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxx \ + -S srv1.dom1.dom +</literallayout></listitem> +</varlistentry> +<varlistentry> +<term>Delete a trust relationship between dom1 and dom2</term> +<listitem><literallayout> +net rpc trust delete \ + otherserver=srv2.dom2.test \ + otheruser=dom2adm \ + -S srv1.dom1.dom +</literallayout></listitem> +</varlistentry> +</variablelist> +</refsect3> + +</refsect2> + +<refsect2> +<refsect3> <title>RPC RIGHTS</title> <para>This subcommand is used to view and manage Samba's rights assignments (also @@ -1734,8 +1848,10 @@ Manipulate Samba's registry. <para>The registry commands are: <simplelist> <member>net registry enumerate - Enumerate registry keys and values.</member> +<member>net registry enumerate_recursive - Enumerate registry key and its subkeys.</member> <member>net registry createkey - Create a new registry key.</member> <member>net registry deletekey - Delete a registry key.</member> +<member>net registry deletekey_recursive - Delete a registry key with subkeys.</member> <member>net registry getvalue - Print a registry value.</member> <member>net registry getvalueraw - Print a registry value (raw format).</member> <member>net registry setvalue - Set a new registry value.</member> @@ -1758,7 +1874,13 @@ string.</member> <refsect3> <title>REGISTRY ENUMERATE <replaceable>key</replaceable> </title> - <para>Enumerate subkeys and values of <emphasis>key</emphasis> + <para>Enumerate subkeys and values of <emphasis>key</emphasis>. + </para> +</refsect3> + +<refsect3> + <title>REGISTRY ENUMERATE_RECURSIVE <replaceable>key</replaceable> </title> + <para>Enumerate values of <emphasis>key</emphasis> and its subkeys. </para> </refsect3> @@ -1770,6 +1892,13 @@ string.</member> <refsect3> <title>REGISTRY DELETEKEY <replaceable>key</replaceable> </title> + <para>Delete the given <emphasis>key</emphasis> and its + values from the registry, if it has no subkeys. + </para> +</refsect3> + +<refsect3> + <title>REGISTRY DELETEKEY_RECURSIVE <replaceable>key</replaceable> </title> <para>Delete the given <emphasis>key</emphasis> and all of its subkeys and values from the registry. </para> diff --git a/docs-xml/manpages-3/smb.conf.5.xml b/docs-xml/manpages-3/smb.conf.5.xml index 2b930654436..f5f252ba46d 100644 --- a/docs-xml/manpages-3/smb.conf.5.xml +++ b/docs-xml/manpages-3/smb.conf.5.xml @@ -503,12 +503,16 @@ chmod 1770 /usr/local/samba/lib/usershares <varlistentry> <term>%I</term> <listitem><para>the IP address of the client machine.</para> + <para>Before 3.6.0 it could contain IPv4 mapped IPv6 addresses, + now it only contains IPv4 or IPv6 addresses.</para> </listitem> </varlistentry> <varlistentry> <term>%i</term> <listitem><para>the local IP address to which a client connected.</para> + <para>Before 3.6.0 it could contain IPv4 mapped IPv6 addresses, + now it only contains IPv4 or IPv6 addresses.</para> </listitem> </varlistentry> diff --git a/docs-xml/manpages-3/vfs_gpfs.8.xml b/docs-xml/manpages-3/vfs_gpfs.8.xml index 5f89ffac779..a6b31240eea 100644 --- a/docs-xml/manpages-3/vfs_gpfs.8.xml +++ b/docs-xml/manpages-3/vfs_gpfs.8.xml @@ -276,6 +276,26 @@ </listitem> </varlistentry> + <varlistentry> + <term>gpfs:syncio = [yes|no]</term> + <listitem> + <para>This parameter makes Samba open all files with O_SYNC. + This triggers optimizations in GPFS for workloads that + heavily share files.</para> + + <para>Following is the behaviour of Samba for different + values: + </para> + <itemizedlist> + <listitem><para><command>yes</command>Open files with O_SYNC + </para></listitem> + <listitem><para><command>no (default)</command>Open files as + normal Samba would do + </para></listitem> + </itemizedlist> + </listitem> + </varlistentry> + </variablelist> </refsect1> diff --git a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml index 882ee6af3f8..8df9751aa4d 100644 --- a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml +++ b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml @@ -45,6 +45,8 @@ protocol, supporting only a small list of VFS operations, and had several drawbacks. The protocol version 2 is a try to solve the problems version 1 had while at the same time adding new features. + With the release of Samba 3.6.0, the module will run protocol version 2 + by default. </para> </refsect1> @@ -77,6 +79,7 @@ <listitem><para><command>SHARE</command> - the name of the share on which the VFS operation occured</para></listitem> <listitem><para><command>FILENAME</command> - the name of the file that was used by the VFS operation</para></listitem> <listitem><para><command>TIMESTAMP</command> - a timestamp, formatted as "yyyy-mm-dd hh-mm-ss.ms" indicating when the VFS operation occured</para></listitem> + <listitem><para><command>IP</command> - The IP Address (v4 or v6) of the client machine that initiated the VFS operation.</para></listitem> </itemizedlist> </para> @@ -136,7 +139,7 @@ The module now can identify itself against the receiver with a sub-release number, where the receiver may run with a different sub-release number than the module. However, as long as both run on the V2.x protocol, the receiver will not crash, even if the module - uses features only implemented in the newer subrelease. Ultimativly, if the module uses + uses features only implemented in the newer subrelease. Ultimatively, if the module uses a new feature from a newer subrelease, and the receiver runs an older protocol, it is just ignoring the functionality. Of course it is best to have both the receiver and the module running the same subrelease of the protocol. @@ -150,7 +153,7 @@ </listitem> <listitem> <para> - The module now potientially has the ability to create data on every VFS function. As of + The module now potentially has the ability to create data on every VFS function. As of protocol V2.0, there is support for 8 VFS functions, namely write,read,pread,pwrite, rename,chdir,mkdir and rmdir. Supporting more VFS functions is one of the targets for the upcoming sub-releases. @@ -224,9 +227,9 @@ <varlistentry> <term>smb_traffic_analyzer:protocol_version = STRING</term> <listitem> - <para>If STRING matches to V1 or is not given at all, the module - will use version 1 of the protocol. If STRING matches to "V2" - the module will use version 2 of the protocol. + <para>If STRING matches to V1, the module will use version 1 of the + protocol. If STRING is not given, the module will use version 2 of the + protocol, which is the default. </para> </listitem> </varlistentry> @@ -241,7 +244,6 @@ <smbconfsection name="[example_share]"/> <smbconfoption name="path">/data/example</smbconfoption> <smbconfoption name="vfs_objects">smb_traffic_analyzer</smbconfoption> - <smbconfoption name="smb_traffic_analyzer:protocol_version">V2</smbconfoption> <smbconfoption name="smb_traffic_analyzer:host">examplehost</smbconfoption> <smbconfoption name="smb_traffic_analyzer:port">3491</smbconfoption> </programlisting> diff --git a/docs-xml/manpages-3/wbinfo.1.xml b/docs-xml/manpages-3/wbinfo.1.xml index c1b2c1f6278..0701d08a56d 100644 --- a/docs-xml/manpages-3/wbinfo.1.xml +++ b/docs-xml/manpages-3/wbinfo.1.xml @@ -423,7 +423,7 @@ <term>-U|--uid-to-sid <replaceable>uid</replaceable></term> <listitem><para>Try to convert a UNIX user id to a Windows NT SID. If the uid specified does not refer to one within - the idmap uid range then the operation will fail. </para></listitem> + the idmap range then the operation will fail. </para></listitem> </varlistentry> <varlistentry> diff --git a/docs-xml/manpages-3/winbindd.8.xml b/docs-xml/manpages-3/winbindd.8.xml index c9fd4d8e656..df44e4437d9 100644 --- a/docs-xml/manpages-3/winbindd.8.xml +++ b/docs-xml/manpages-3/winbindd.8.xml @@ -45,10 +45,9 @@ <para>Even if winbind is not used for nsswitch, it still provides a service to <command>smbd</command>, <command>ntlm_auth</command> and the <command>pam_winbind.so</command> PAM module, by managing connections to - domain controllers. In this configuraiton the - <smbconfoption name="idmap uid"/> and - <smbconfoption name="idmap gid"/> - parameters are not required. (This is known as `netlogon proxy only mode'.)</para> + domain controllers. In this configuration the + <smbconfoption name="idmap config * : range"/> + parameter is not required. (This is known as `netlogon proxy only mode'.)</para> <para> The Name Service Switch allows user and system information to be obtained from different databases @@ -246,11 +245,9 @@ hosts: files wins <listitem><para> <smbconfoption name="winbind separator"/></para></listitem> <listitem><para> - <smbconfoption name="idmap uid"/></para></listitem> + <smbconfoption name="idmap config * : range"/></para></listitem> <listitem><para> - <smbconfoption name="idmap gid"/></para></listitem> - <listitem><para> - <smbconfoption name="idmap backend"/></para></listitem> + <smbconfoption name="idmap config * : backend"/></para></listitem> <listitem><para> <smbconfoption name="winbind cache time"/></para></listitem> <listitem><para> @@ -340,8 +337,7 @@ auth required /lib/security/pam_unix.so \ winbind cache time = 10 template shell = /bin/bash template homedir = /home/%D/%U - idmap uid = 10000-20000 - idmap gid = 10000-20000 + idmap config * : range = 10000-20000 workgroup = DOMAIN security = domain password server = * @@ -374,7 +370,7 @@ auth required /lib/security/pam_unix.so \ <para>If more than one UNIX machine is running <command>winbindd</command>, then in general the user and groups ids allocated by winbindd will not be the same. The user and group ids will only be valid for the local - machine, unless a shared <smbconfoption name="idmap backend"/> is configured.</para> + machine, unless a shared <smbconfoption name="idmap config * : backend"/> is configured.</para> <para>If the the Windows NT SID to UNIX user and group id mapping file is damaged or destroyed then the mappings will be lost. </para> |