Ignore:
Timestamp:
Nov 27, 2012, 4:43:17 PM (13 years ago)
Author:
Silvan Scherrer
Message:

Samba Server: updated trunk to 3.6.0

Location:
trunk/server
Files:
10 deleted
75 edited
4 copied

Legend:

Unmodified
Added
Removed

  • trunk/server

  • trunk/server/docs-xml/manpages-3/eventlogadm.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2121
    2222                <command>eventlogadm</command>
     23                <arg><option>-s</option></arg>
    2324                <arg><option>-d</option></arg>
    2425                <arg><option>-h</option></arg>
    … …  
    3334        <cmdsynopsis>
    3435                <command>eventlogadm</command>
     36                <arg><option>-s</option></arg>
    3537                <arg><option>-d</option></arg>
    3638                <arg><option>-h</option></arg>
    … …  
    4345        <cmdsynopsis>
    4446                <command>eventlogadm</command>
     47                <arg><option>-s</option></arg>
    4548                <arg><option>-d</option></arg>
    4649                <arg><option>-h</option></arg>
    … …  
    7376
    7477        <variablelist>
     78                <varlistentry>
     79                <term>
     80                <option>-s</option>
     81                <replaceable>FILENAME</replaceable>
     82                </term>
     83                <listitem><para>
     84                The <command>-s</command> option causes <command>eventlogadm</command> to load the
     85                configuration file given as FILENAME instead of the default one used by Samba.
     86                </para></listitem>
     87                </varlistentry>
    7588
    7689                <varlistentry>

  • trunk/server/docs-xml/manpages-3/findsmb.1.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/idmap_ad.8.xml

    r480 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2626        classes and relative attribute/value pairs to the user and
    2727        group objects in the AD.</para>
     28
     29        <para>
     30        Note that the idmap_ad module has changed considerably since
     31        Samba versions 3.0 and 3.2.
     32        Currently, the <parameter>ad</parameter> backend
     33        does not work as the the default idmap backend, but one has
     34        to configure it separately for each domain for which one wants
     35        to use it, using disjoint ranges. One usually needs to configure
     36        a writeable default idmap range, using for example the
     37        <parameter>tdb</parameter> or <parameter>ldap</parameter>
     38        backend, in order to be able to map the BUILTIN sids and
     39        possibly other trusted domains. The writeable default config
     40        is also needed in order to be able to create group mappings.
     41        This catch-all default idmap configuration should have a range
     42        that is disjoint from any explicitly configured domain with
     43        idmap backend <parameter>ad</parameter>. See the example below.
     44        </para>
    2845</refsynopsisdiv>
    2946
    … …  
    6986        <programlisting>
    7087        [global]
    71         idmap backend = tdb
    72         idmap uid = 1000000-1999999
    73         idmap gid = 1000000-1999999
     88        idmap config * : backend = tdb
     89        idmap config * : range = 1000000-1999999
    7490
    7591        idmap config CORP : backend  = ad

  • trunk/server/docs-xml/manpages-3/idmap_adex.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    6767        <programlisting>
    6868        [global]
    69         idmap backend = adex
    70         idmap uid = 1000-4000000000
    71         idmap gid = 1000-4000000000
     69        idmap config * : backend = adex
     70        idmap config * : range = 1000-4000000000
    7271
    7372        winbind nss info = adex

  • trunk/server/docs-xml/manpages-3/idmap_hash.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    5353        <programlisting>
    5454        [global]
    55         idmap backend = hash
    56         idmap uid = 1000-4000000000
    57         idmap gid = 1000-4000000000
     55        idmap config * : backend = hash
     56        idmap config * : range = 1000-4000000000
    5857
    5958        winbind nss info = hash

  • trunk/server/docs-xml/manpages-3/idmap_ldap.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2828        In contrast to read only backends like idmap_rid, it is an allocating
    2929        backend: This means that it needs to allocate new user and group IDs in
    30         order to create new mappings. The allocator can be provided by the
    31         idmap_ldap backend itself or by any other allocating backend like
    32         idmap_tdb or idmap_tdb2. This is configured with the
    33         parameter <parameter>idmap alloc backend</parameter>.
     30        order to create new mappings.
    3431        </para>
    3532
    36         <para>
    37         Note that in order for this (or any other allocating) backend to
    38         function at all, the default backend needs to be writeable.
    39         The ranges used for uid and gid allocation are the default ranges
    40         configured by &quot;idmap uid&quot; and &quot;idmap gid&quot;.
    41         </para>
    42 
    43         <para>
    44         Furthermore, since there is only one global allocating backend
    45         responsible for all domains using writeable idmap backends,
    46         any explicitly configured domain with idmap backend ldap
    47         should have the same range as the default range, since it needs
    48         to use the global uid / gid allocator. See the example below.
    49         </para>
    5033</refsynopsisdiv>
    5134
    … …  
    5740                <term>ldap_base_dn = DN</term>
    5841                <listitem><para>
    59                         Defines the directory base suffix to use when searching for
     42                        Defines the directory base suffix to use for
    6043                        SID/uid/gid mapping entries.  If not defined, idmap_ldap will default
    6144                        to using the &quot;ldap idmap suffix&quot; option from smb.conf.
    … …  
    6649                <term>ldap_user_dn = DN</term>
    6750                <listitem><para>
    68                         Defines the user DN to be used for authentication. If absent an
    69                         anonymous bind will be performed.
     51                        Defines the user DN to be used for authentication.
     52                        The secret for authenticating this user should be
     53                        stored with net idmap secret
     54                        (see <citerefentry><refentrytitle>net</refentrytitle>
     55                        <manvolnum>8</manvolnum></citerefentry>).
     56                        If absent, the ldap credentials from the ldap passdb configuration
     57                        are used, and if these are also absent, an anonymous
     58                        bind will be performed as last fallback.
    7059                </para></listitem>
    7160                </varlistentry>
    … …  
    7463                <term>ldap_url = ldap://server/</term>
    7564                <listitem><para>
    76                         Specifies the LDAP server to use when searching for existing
     65                        Specifies the LDAP server to use for
    7766                        SID/uid/gid map entries. If not defined, idmap_ldap will
    7867                        assume that ldap://localhost/ should be used.
    … …  
    8574                        Defines the available matching uid and gid range for which the
    8675                        backend is authoritative.
    87                         If the parameter is absent, Winbind fails over to use the
    88                         &quot;idmap uid&quot; and &quot;idmap gid&quot; options
    89                         from smb.conf.
    9076                </para></listitem>
    9177                </varlistentry>
    92         </variablelist>
    93 </refsect1>
    94 
    95 <refsect1>
    96         <title>IDMAP ALLOC OPTIONS</title>
    97 
    98         <variablelist>
    99                 <varlistentry>
    100                 <term>ldap_base_dn = DN</term>
    101                 <listitem><para>
    102                         Defines the directory base suffix under which new SID/uid/gid mapping
    103                         entries should be stored.  If not defined, idmap_ldap will default
    104                         to using the &quot;ldap idmap suffix&quot; option from smb.conf.
    105                 </para></listitem>
    106                 </varlistentry>
    107 
    108                 <varlistentry>
    109                 <term>ldap_user_dn = DN</term>
    110                 <listitem><para>
    111                         Defines the user DN to be used for authentication. If absent an
    112                         anonymous bind will be performed.
    113                 </para></listitem>
    114                 </varlistentry>
    115 
    116                 <varlistentry>
    117                 <term>ldap_url = ldap://server/</term>
    118                 <listitem><para>
    119                         Specifies the LDAP server to which modify/add/delete requests should
    120                         be sent.  If not defined, idmap_ldap will assume that ldap://localhost/
    121                         should be used.
    122                 </para></listitem>
    123                 </varlistentry>
    12478        </variablelist>
    12579</refsect1>
    … …  
    12983
    13084        <para>
    131         The follow sets of a LDAP configuration which uses two LDAP
    132         directories, one for storing the ID mappings and one for retrieving
    133         new IDs.
     85        The following example shows how an ldap directory is used as the
     86        default idmap backend. It also configures the idmap range and base
     87        directory suffix. The secret for the ldap_user_dn has to be set with
     88        &quot;net idmap secret '*' password&quot;.
    13489        </para>
    13590
    13691        <programlisting>
    13792        [global]
    138         idmap backend = ldap:ldap://localhost/
    139         idmap uid = 1000000-1999999
    140         idmap gid = 1000000-1999999
     93        idmap config * : backend      = ldap
     94        idmap config * : range        = 1000000-1999999
     95        idmap config * : ldap_url     = ldap://localhost/
     96        idmap config * : ldap_base_dn = ou=idmap,dc=example,dc=com
     97        idmap config * : ldap_user_dn = cn=idmap_admin,dc=example,dc=com
     98        </programlisting>
    14199
    142         idmap alloc backend = ldap
    143         idmap alloc config : ldap_url   = ldap://id-master/
    144         idmap alloc config : ldap_base_dn = ou=idmap,dc=example,dc=com
     100        <para>
     101        This example shows how ldap can be used as a readonly backend while
     102        tdb is the default backend used to store the mappings.
     103        It adds an explicit configuration for some domain DOM1, that
     104        uses the ldap idmap backend. Note that a range disjoint from the
     105        default range is used.
     106        </para>
     107
     108        <programlisting>
     109        [global]
     110        # "backend = tdb" is redundant here since it is the default
     111        idmap config * : backend = tdb
     112        idmap config * : range = 1000000-1999999
     113
     114        idmap config DOM1 : backend = ldap
     115        idmap config DOM1 : range = 2000000-2999999
     116        idmap config DOM1 : read only = yes
     117        idmap config DOM1 : ldap_url = ldap://server/
     118        idmap config DOM1 : ldap_base_dn = ou=idmap,dc=dom1,dc=example,dc=com
     119        idmap config DOM1 : ldap_user_dn = cn=idmap_admin,dc=dom1,dc=example,dc=com
    145120        </programlisting>
    146121</refsect1>

  • trunk/server/docs-xml/manpages-3/idmap_nss.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    3939        <programlisting>
    4040        [global]
    41         idmap backend = tdb
    42         idmap uid = 1000000-1999999
    43         idmap gid = 1000000-1999999
     41        idmap config * : backend = tdb
     42        idmap config * : range = 1000000-1999999
    4443
    4544        idmap config SAMBA : backend  = nss

  • trunk/server/docs-xml/manpages-3/idmap_rid.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2222        mapping scheme to map UIDs/GIDs and SIDs. No database is required
    2323        in this case as the mapping is deterministic.</para>
     24
     25        <para>
     26        Note that the idmap_rid module has changed considerably since Samba
     27        versions 3.0. and 3.2.
     28        Currently, there should to be an explicit idmap configuration for each
     29        domain that should use the idmap_rid backend, using disjoint ranges.
     30        One usually needs to define a writeable default idmap range, using
     31        a backent like <parameter>tdb</parameter> or <parameter>ldap</parameter>
     32        that can create unix ids, in order to be able to map the BUILTIN sids
     33        and other domains, and also in order to be able to create group mappings.
     34        See the example below.
     35        </para>
     36
     37        <para>
     38        Note that the old syntax
     39        <parameter>idmap backend = rid:"DOM1=range DOM2=range2 ..."</parameter>
     40        is not supported any more since Samba version 3.0.25.
     41        </para>
    2442</refsynopsisdiv>
    2543
    … …  
    89107        workgroup = MAIN
    90108
    91         idmap backend = tdb
    92         idmap uid = 1000000-1999999
    93         idmap gid = 1000000-1999999
     109        idmap config * : backend        = tdb
     110        idmap config * : range          = 1000000-1999999
    94111
    95112        idmap config MAIN : backend     = rid

  • trunk/server/docs-xml/manpages-3/idmap_tdb.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2828        In contrast to read only backends like idmap_rid, it is an allocating
    2929        backend: This means that it needs to allocate new user and group IDs in
    30         order to create new mappings. The allocator can be provided by the
    31         idmap_tdb backend itself or by any other allocating backend like
    32         idmap_ldap or idmap_tdb2. This is configured with the
    33         parameter <parameter>idmap alloc backend</parameter>.
    34         </para>
    35 
    36         <para>
    37         Note that in order for this (or any other allocating) backend to
    38         function at all, the default backend needs to be writeable.
    39         The ranges used for uid and gid allocation are the default ranges
    40         configured by &quot;idmap uid&quot; and &quot;idmap gid&quot;.
    41         </para>
    42 
    43         <para>
    44         Furthermore, since there is only one global allocating backend
    45         responsible for all domains using writeable idmap backends,
    46         any explicitly configured domain with idmap backend tdb
    47         should have the same range as the default range, since it needs
    48         to use the global uid / gid allocator. See the example below.
     30        order to create new mappings.
    4931        </para>
    5032</refsynopsisdiv>
    … …  
    5941                        Defines the available matching uid and gid range for which the
    6042                        backend is authoritative.
    61                         If the parameter is absent, Winbind fails over to use
    62                         the &quot;idmap uid&quot; and &quot;idmap gid&quot; options
    63                         from smb.conf.
    6443                </para></listitem>
    6544                </varlistentry>
    … …  
    7251        <para>
    7352        This example shows how tdb is used as a the default idmap backend.
    74         It configures the idmap range through the global options for all
    75         domains encountered. This same range is used for uid/gid allocation.
     53        This configured range is used for uid and gid allocation.
    7654        </para>
    7755
    7856        <programlisting>
    7957        [global]
    80         # "idmap backend = tdb" is redundant here since it is the default
    81         idmap backend = tdb
    82         idmap uid = 1000000-2000000
    83         idmap gid = 1000000-2000000
    84         </programlisting>
    85 
    86         <para>
    87         This (rather theoretical) example shows how tdb can be used as the
    88         allocating backend while ldap is the default backend used to store
    89         the mappings.
    90         It adds an explicit configuration for some domain DOM1, that
    91         uses the tdb idmap backend. Note that the same range as the
    92         default uid/gid range is used, since the allocator has to serve
    93         both the default backend and the explicitly configured domain DOM1.
    94         </para>
    95 
    96         <programlisting>
    97         [global]
    98         idmap backend = ldap
    99         idmap uid = 1000000-2000000
    100         idmap gid = 1000000-2000000
    101         # use a different uid/gid allocator:
    102         idmap alloc backend = tdb
    103 
    104         idmap config DOM1 : backend = tdb
    105         idmap config DOM1 : range = 1000000-2000000
     58        # "backend = tdb" is redundant here since it is the default
     59        idmap config * : backend = tdb
     60        idmap config * : range = 1000000-2000000
    10661        </programlisting>
    10762</refsect1>

  • trunk/server/docs-xml/manpages-3/idmap_tdb2.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2929        In contrast to read only backends like idmap_rid, it is an allocating
    3030        backend: This means that it needs to allocate new user and group IDs in
    31         order to create new mappings. The allocator can be provided by the
    32         idmap_tdb2 backend itself or by any other allocating backend like
    33         idmap_tdb or idmap_ldap. This is configured with the
    34         parameter <parameter>idmap alloc backend</parameter>.
    35         </para>
    36 
    37         <para>
    38         Note that in order for this (or any other allocating) backend to
    39         function at all, the default backend needs to be writeable.
    40         The ranges used for uid and gid allocation are the default ranges
    41         configured by &quot;idmap uid&quot; and &quot;idmap gid&quot;.
    42         </para>
    43 
    44         <para>
    45         Furthermore, since there is only one global allocating backend
    46         responsible for all domains using writeable idmap backends,
    47         any explicitly configured domain with idmap backend tdb2
    48         should have the same range as the default range, since it needs
    49         to use the global uid / gid allocator. See the example below.
     31        order to create new mappings.
    5032        </para>
    5133</refsynopsisdiv>
    … …  
    6042                        Defines the available matching uid and gid range for which the
    6143                        backend is authoritative.
    62                         If the parameter is absent, Winbind fails over to use
    63                         the &quot;idmap uid&quot; and &quot;idmap gid&quot; options
    64                         from smb.conf.
     44                </para></listitem>
     45                </varlistentry>
     46
     47                <varlistentry>
     48                <term>script</term>
     49                <listitem><para>
     50                        This option can be used to configure an external program
     51                        for performing id mappings instead of using the tdb
     52                        counter. The mappings are then stored int tdb2 idmap
     53                        database. For details see the section on IDMAP SCRIPT below.
    6554                </para></listitem>
    6655                </varlistentry>
    … …  
    7261
    7362        <para>
    74         The tdb2 idmap backend supports a script for performing id mappings
    75         through the smb.conf option <parameter>idmap : script</parameter>.
     63        The tdb2 idmap backend supports an external program for performing id mappings
     64        through the smb.conf option <parameter>idmap config * : script</parameter> or
     65        its deprecated legacy form <parameter>idmap : script</parameter>.
     66        </para>
     67
     68        <para>
     69        The mappings obtained by the script are then stored in the idmap tdb2
     70        database instead of mappings created by the incrementing id counters.
     71        It is therefore important that the script covers the complete range of
     72        SIDs that can be passed in for SID to Unix ID mapping, since otherwise
     73        SIDs unmapped by the script might get mapped to IDs that had
     74        previously been mapped by the script.
     75        </para>
     76
     77        <para>
    7678        The script should accept the following command line options.
    7779        </para>
    … …  
    9496        ERR:yyyy
    9597        </programlisting>
    96 
    97         <para>
    98         Note that the script should cover the complete range of SIDs
    99         that can be passed in for SID to Unix ID mapping, since otherwise
    100         SIDs unmapped by the script might get mapped to IDs that had
    101         previously been mapped by the script.
    102         </para>
    10398</refsect1>
    10499
    … …  
    108103        <para>
    109104        This example shows how tdb2 is used as a the default idmap backend.
    110         It configures the idmap range through the global options for all
    111         domains encountered. This same range is used for uid/gid allocation.
    112105        </para>
    113106
    114107        <programlisting>
    115108        [global]
    116         idmap backend = tdb2
    117         idmap uid = 1000000-2000000
    118         idmap gid = 1000000-2000000
     109        idmap config * : backend = tdb2
     110        idmap config * : range = 1000000-2000000
     111        </programlisting>
     112
     113        <para>
     114        This example shows how tdb2 is used as a the default idmap backend
     115        using an external program via the script parameter:
     116        </para>
     117
     118        <programlisting>
     119        [global]
     120        idmap config * : backend = tdb2
     121        idmap config * : range = 1000000-2000000
     122        idmap config * : script = /usr/local/samba/bin/idmap_script.sh
    119123        </programlisting>
    120124</refsect1>

  • trunk/server/docs-xml/manpages-3/libsmbclient.7.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">7</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/lmhosts.5.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/log2pcap.1.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/net.8.xml

    r480 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    796796
    797797</refsect3>
    798 
     798<refsect3>
     799<title>RPC TRUSTDOM LIST</title>
     800
     801<para>List all interdomain trust relationships.</para>
     802
     803</refsect3>
     804</refsect2>
     805
     806<refsect2>
     807<title>RPC TRUST</title>
     808
     809<refsect3>
     810<title>RPC TRUST CREATE</title>
     811
     812<para>Create a trust trust object by calling lsaCreateTrustedDomainEx2.
     813The can be done on a single server or on two servers at once with the
     814possibility to use a random trust password.</para>
     815
     816<variablelist><title>Options:</title>
     817<varlistentry>
     818<term>otherserver</term>
     819<listitem><para>Domain controller of the second domain</para></listitem>
     820</varlistentry>
     821
     822<varlistentry>
     823<term>otheruser</term>
     824<listitem><para>Admin user in the second domain</para></listitem>
     825</varlistentry>
     826
     827<varlistentry>
     828<term>otherdomainsid</term>
     829<listitem><para>SID of the second domain</para></listitem>
     830</varlistentry>
     831
     832<varlistentry>
     833<term>other_netbios_domain</term>
     834<listitem><para>NetBIOS (short) name of the second domain</para></listitem>
     835</varlistentry>
     836
     837<varlistentry>
     838<term>otherdomain</term>
     839<listitem><para>DNS (full) name of the second domain</para></listitem>
     840</varlistentry>
     841
     842<varlistentry>
     843<term>trustpw</term>
     844<listitem><para>Trust password</para></listitem>
     845</varlistentry>
     846</variablelist>
     847
     848<variablelist><title>Examples:</title>
     849<varlistentry>
     850<term>Create a trust object on srv1.dom1.dom for the domain dom2</term>
     851<listitem><literallayout>
     852net rpc trust create \
     853    otherdomainsid=S-x-x-xx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxx \
     854    other_netbios_domain=dom2 \
     855    otherdomain=dom2.dom \
     856    trustpw=12345678 \
     857    -S srv1.dom1.dom
     858</literallayout></listitem>
     859</varlistentry>
     860<varlistentry>
     861<term>Create a trust relationship between dom1 and dom2</term>
     862<listitem><literallayout>
     863net rpc trust create \
     864    otherserver=srv2.dom2.test \
     865    otheruser=dom2adm \
     866    -S srv1.dom1.dom
     867</literallayout></listitem>
     868</varlistentry>
     869</variablelist>
     870</refsect3>
     871
     872<refsect3>
     873<title>RPC TRUST DELETE</title>
     874
     875<para>Delete a trust trust object by calling lsaDeleteTrustedDomain.
     876The can be done on a single server or on two servers at once.</para>
     877
     878<variablelist><title>Options:</title>
     879<varlistentry>
     880<term>otherserver</term>
     881<listitem><para>Domain controller of the second domain</para></listitem>
     882</varlistentry>
     883
     884<varlistentry>
     885<term>otheruser</term>
     886<listitem><para>Admin user in the second domain</para></listitem>
     887</varlistentry>
     888
     889<varlistentry>
     890<term>otherdomainsid</term>
     891<listitem><para>SID of the second domain</para></listitem>
     892</varlistentry>
     893</variablelist>
     894
     895<variablelist><title>Examples:</title>
     896<varlistentry>
     897<term>Delete a trust object on srv1.dom1.dom for the domain dom2</term>
     898<listitem><literallayout>
     899net rpc trust delete \
     900    otherdomainsid=S-x-x-xx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxx \
     901    -S srv1.dom1.dom
     902</literallayout></listitem>
     903</varlistentry>
     904<varlistentry>
     905<term>Delete a trust relationship between dom1 and dom2</term>
     906<listitem><literallayout>
     907net rpc trust delete \
     908    otherserver=srv2.dom2.test \
     909    otheruser=dom2adm \
     910    -S srv1.dom1.dom
     911</literallayout></listitem>
     912</varlistentry>
     913</variablelist>
     914</refsect3>
     915
     916</refsect2>
     917
     918<refsect2>
    799919<refsect3>
    800920<title>RPC RIGHTS</title>
    … …  
    12681388
    12691389<refsect2>
    1270 <title>IDMAP SECRET &lt;DOMAIN&gt;|ALLOC &lt;secret&gt;</title>
     1390<title>IDMAP SECRET &lt;DOMAIN&gt; &lt;secret&gt;</title>
    12711391
    12721392<para>
    … …  
    12771397
    12781398</refsect2>
     1399
     1400<refsect2>
     1401
     1402<title>IDMAP DELETE [-f] [--db=&lt;DB&gt;] &lt;ID&gt;</title>
     1403
     1404<para>
     1405Delete a mapping sid &lt;-&gt; gid or sid &lt;-&gt; uid from the IDMAP database.
     1406The mapping is given by &lt;ID&gt; which may either be a sid: S-x-..., a gid: "GID number" or a uid: "UID number".
     1407Use -f to delete an invalid partial mapping &lt;ID&gt; -&gt; xx
     1408</para>
     1409<para>
     1410  Use "smbcontrol all idmap ..." to notify running smbd instances.
     1411  See the <citerefentry><refentrytitle>smbcontrol</refentrytitle>
     1412  <manvolnum>1</manvolnum></citerefentry> manpage for details.
     1413</para>
     1414</refsect2>
     1415
     1416<refsect2>
     1417
     1418<title>IDMAP CHECK [-v] [-r] [-a] [-T] [-f] [-l] [--db=&lt;DB&gt;]</title>
     1419
     1420<para>
     1421  Check and repair the IDMAP database. If no option is given a read only check
     1422  of the database is done. Among others an interactive or automatic repair mode
     1423  may be chosen with one of the following options:
     1424
     1425  <variablelist>
     1426    <varlistentry><term>-r|--repair</term>
     1427    <listitem><para>
     1428      Interactive repair mode, ask a lot of questions.
     1429    </para></listitem>
     1430    </varlistentry>
     1431
     1432    <varlistentry><term>-a|--auto</term>
     1433    <listitem><para>
     1434      Noninteractive repair mode, use default answers.
     1435    </para></listitem>
     1436    </varlistentry>
     1437
     1438    <varlistentry><term>-v|--verbose</term>
     1439      <listitem><para>
     1440        Produce more output.
     1441      </para></listitem>
     1442    </varlistentry>
     1443
     1444    <varlistentry><term>-f|--force</term>
     1445      <listitem><para>
     1446        Try to apply changes, even if they do not apply cleanly.
     1447      </para></listitem>
     1448    </varlistentry>
     1449
     1450    <varlistentry><term>-T|--test</term>
     1451      <listitem><para>
     1452        Dry run, show what changes would be made but don't touch anything.
     1453      </para></listitem>
     1454    </varlistentry>
     1455
     1456    <varlistentry><term>-l|--lock</term>
     1457      <listitem><para>
     1458        Lock the database while doing the check.
     1459      </para></listitem>
     1460    </varlistentry>
     1461
     1462    <varlistentry><term>--db &lt;DB&gt;</term>
     1463      <listitem><para>
     1464        Check the specified database.
     1465      </para></listitem>
     1466    </varlistentry>
     1467    <varlistentry><term></term>
     1468      <listitem><para>
     1469      </para></listitem>
     1470    </varlistentry>
     1471  </variablelist>
     1472
     1473  It reports about the finding of the following errors:
     1474
     1475  <variablelist>
     1476    <varlistentry><term>Missing reverse mapping:</term>
     1477    <listitem><para>
     1478      A record with mapping A-&gt;B where there is no B-&gt;A. Default action
     1479      in repair mode is to "fix" this by adding the reverse mapping.
     1480    </para></listitem>
     1481    </varlistentry>
     1482
     1483    <varlistentry><term>Invalid mapping:</term>
     1484    <listitem><para>
     1485      A record with mapping A-&gt;B where B-&gt;C. Default action
     1486      is to "delete" this record.
     1487    </para></listitem>
     1488  </varlistentry>
     1489
     1490  <varlistentry><term>Missing or invalid HWM:</term>
     1491    <listitem><para>
     1492      A high water mark is not at least equal to the largest ID in the
     1493      database. Default action is to "fix" this by setting it to the
     1494      largest ID found +1.
     1495    </para></listitem>
     1496  </varlistentry>
     1497
     1498  <varlistentry><term>Invalid record:</term>
     1499    <listitem><para>
     1500      Something we failed to parse. Default action is to "edit" it
     1501      in interactive and "delete" it in automatic mode.
     1502    </para></listitem>
     1503  </varlistentry>
     1504</variablelist>
     1505</para>
     1506</refsect2>
     1507
    12791508
    12801509<refsect2>
    … …  
    16181847
    16191848<refsect2>
     1849<title>REGISTRY</title>
     1850<para>
     1851Manipulate Samba's registry.
     1852</para>
     1853
     1854<para>The registry commands are:
     1855<simplelist>
     1856<member>net registry enumerate   - Enumerate registry keys and values.</member>
     1857<member>net registry enumerate_recursive - Enumerate registry key and its subkeys.</member>
     1858<member>net registry createkey   - Create a new registry key.</member>
     1859<member>net registry deletekey   - Delete a registry key.</member>
     1860<member>net registry deletekey_recursive - Delete a registry key with subkeys.</member>
     1861<member>net registry getvalue    - Print a registry value.</member>
     1862<member>net registry getvalueraw - Print a registry value (raw format).</member>
     1863<member>net registry setvalue    - Set a new registry value.</member>
     1864<member>net registry increment   - Increment a DWORD registry value under a lock.
     1865</member>
     1866<member>net registry deletevalue - Delete a registry value.</member>
     1867<member>net registry getsd       - Get security descriptor.</member>
     1868<member>net registry getsd_sdd1  - Get security descriptor in sddl format.
     1869</member>
     1870<member>net registry setsd_sdd1  - Set security descriptor from sddl format
     1871string.</member>
     1872<member>net registry import      - Import a registration entries (.reg) file.
     1873</member>
     1874<member>net registry export      - Export a registration entries (.reg) file.
     1875</member>
     1876<member>net registry convert     - Convert a registration entries (.reg) file.
     1877</member>
     1878</simplelist>
     1879</para>
     1880
     1881<refsect3>
     1882  <title>REGISTRY ENUMERATE <replaceable>key</replaceable> </title>
     1883  <para>Enumerate subkeys and values of <emphasis>key</emphasis>.
     1884  </para>
     1885</refsect3>
     1886
     1887<refsect3>
     1888  <title>REGISTRY ENUMERATE_RECURSIVE <replaceable>key</replaceable> </title>
     1889  <para>Enumerate values of <emphasis>key</emphasis> and its subkeys.
     1890  </para>
     1891</refsect3>
     1892
     1893<refsect3>
     1894  <title>REGISTRY CREATEKEY <replaceable>key</replaceable> </title>
     1895  <para>Create a new <emphasis>key</emphasis> if not yet existing.
     1896  </para>
     1897</refsect3>
     1898
     1899<refsect3>
     1900  <title>REGISTRY DELETEKEY <replaceable>key</replaceable> </title>
     1901  <para>Delete the given <emphasis>key</emphasis> and its
     1902  values from the registry, if it has no subkeys.
     1903  </para>
     1904</refsect3>
     1905
     1906<refsect3>
     1907  <title>REGISTRY DELETEKEY_RECURSIVE <replaceable>key</replaceable> </title>
     1908  <para>Delete the given <emphasis>key</emphasis> and all of its
     1909  subkeys and values from the registry.
     1910  </para>
     1911</refsect3>
     1912
     1913<refsect3>
     1914  <title>REGISTRY GETVALUE <replaceable>key</replaceable> <!--
     1915  --><replaceable>name</replaceable></title>
     1916
     1917  <para>Output type and actual value of the value <emphasis>name</emphasis>
     1918  of the given <emphasis>key</emphasis>.
     1919  </para>
     1920</refsect3>
     1921
     1922<refsect3>
     1923  <title>REGISTRY GETVALUERAW <replaceable>key</replaceable> <!--
     1924  --><replaceable>name</replaceable></title>
     1925  <para>Output the actual value of the value <emphasis>name</emphasis>
     1926  of the given <emphasis>key</emphasis>.
     1927  </para>
     1928</refsect3>
     1929
     1930<refsect3>
     1931  <title>REGISTRY SETVALUE <replaceable>key</replaceable> <!--
     1932  --><replaceable>name</replaceable> <replaceable>type</replaceable> <!--
     1933  --><replaceable>value</replaceable> ...<!--
     1934  --></title>
     1935
     1936  <para>Set the value <emphasis>name</emphasis>
     1937  of an existing <emphasis>key</emphasis>.
     1938  <emphasis>type</emphasis> may be one of
     1939  <emphasis>sz</emphasis>, <emphasis>multi_sz</emphasis> or
     1940  <emphasis>dword</emphasis>.
     1941  In case of <emphasis>multi_sz</emphasis> <replaceable>value</replaceable> may
     1942  be given multiple times.
     1943  </para>
     1944</refsect3>
     1945
     1946<refsect3>
     1947  <title>REGISTRY INCREMENT <replaceable>key</replaceable> <!--
     1948  --><replaceable>name</replaceable> <replaceable>[inc]</replaceable><!--
     1949  --></title>
     1950
     1951  <para>Increment the DWORD value <emphasis>name</emphasis>
     1952  of <emphasis>key</emphasis> by <replaceable>inc</replaceable>
     1953  while holding a g_lock.
     1954  <emphasis>inc</emphasis> defaults to 1.
     1955  </para>
     1956</refsect3>
     1957
     1958<refsect3>
     1959  <title>REGISTRY DELETEVALUE <replaceable>key</replaceable> <!--
     1960  --><replaceable>name</replaceable></title>
     1961
     1962  <para>Delete the value <emphasis>name</emphasis>
     1963  of the given <emphasis>key</emphasis>.
     1964  </para>
     1965</refsect3>
     1966
     1967<refsect3>
     1968  <title>REGISTRY GETSD <replaceable>key</replaceable></title>
     1969
     1970  <para>Get the security descriptor of the given <emphasis>key</emphasis>.
     1971  </para>
     1972</refsect3>
     1973
     1974<refsect3>
     1975  <title>REGISTRY GETSD_SDDL <replaceable>key</replaceable></title>
     1976
     1977  <para>Get the security descriptor of the given <emphasis>key</emphasis> as a
     1978  Security Descriptor Definition Language (SDDL) string.
     1979  </para>
     1980</refsect3>
     1981
     1982<refsect3>
     1983  <title>REGISTRY SETSD_SDDL <replaceable>key</replaceable><!--
     1984  --><replaceable>sd</replaceable></title>
     1985
     1986  <para>Set the security descriptor of the given <emphasis>key</emphasis> from a
     1987  Security Descriptor Definition Language (SDDL) string <emphasis>sd</emphasis>.
     1988  </para>
     1989</refsect3>
     1990
     1991<refsect3>
     1992  <title>REGISTRY IMPORT <replaceable>file</replaceable><!--
     1993  --><replaceable>[opt]</replaceable></title>
     1994
     1995  <para>Import a registration entries (.reg) <emphasis>file</emphasis>.
     1996  </para>
     1997</refsect3>
     1998
     1999<refsect3>
     2000  <title>REGISTRY EXPORT <replaceable>key</replaceable><!--
     2001  --><replaceable>file</replaceable><!--
     2002  --><replaceable>[opt]</replaceable></title>
     2003
     2004  <para>Export a <emphasis>key</emphasis> to a registration entries (.reg)
     2005  <emphasis>file</emphasis>.
     2006  </para>
     2007</refsect3>
     2008
     2009<refsect3>
     2010  <title>REGISTRY CONVERT <replaceable>in</replaceable> <!--
     2011  --><replaceable>out</replaceable> <!--
     2012  --><replaceable>[[inopt] outopt]</replaceable></title>
     2013
     2014  <para>Convert a registration entries (.reg) file <emphasis>in</emphasis>.
     2015  </para>
     2016</refsect3>
     2017
     2018
     2019</refsect2>
     2020
     2021<refsect2>
    16202022<title>EVENTLOG</title>
    16212023

  • trunk/server/docs-xml/manpages-3/nmbd.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/nmblookup.1.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/ntlm_auth.1.xml

    r480 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    157157                user). </para>
    158158
    159                 <para>Curently implemented parameters from the
     159                <para>Currently implemented parameters from the
    160160                external program to the helper are:</para>
    161161                <variablelist>

  • trunk/server/docs-xml/manpages-3/pam_winbind.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">8</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/pdbedit.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/profiles.1.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/rpcclient.1.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    6363
    6464                <varlistentry>
    65                 <term>-c|--command='command string'</term>
    66                 <listitem><para>execute semicolon separated commands (listed
    67                 below)) </para></listitem>
     65                <term>-c|--command=&lt;command string&gt;</term>
     66                <listitem><para>Execute semicolon separated commands (listed
     67                below) </para></listitem>
    6868                </varlistentry>
    6969
    … …  
    268268
    269269
    270                 <varlistentry><term>deldriver</term><listitem><para>Delete the
     270                <varlistentry><term>deldriver &lt;driver&gt;</term><listitem><para>Delete the
    271271                specified printer driver for all architectures.  This
    272272                does not delete the actual driver files from the server,

  • trunk/server/docs-xml/manpages-3/samba.7.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">Miscellanea</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/sharesec.1.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/smb.conf.5.xml

    r414 r745  
    77        <refmiscinfo class="source">Samba</refmiscinfo>
    88        <refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
    9         <refmiscinfo class="version">3.5</refmiscinfo>
     9        <refmiscinfo class="version">3.6</refmiscinfo>
    1010</refmeta>
    1111
    … …  
    489489                    machine.  It currently recognizes Samba (<constant>Samba</constant>),
    490490                    the Linux CIFS file system (<constant>CIFSFS</constant>), OS/2, (<constant>OS2</constant>),
    491                     Windows for Workgroups (<constant>WfWg</constant>), Windows 9x/ME
     491                    Mac OS X (<constant>OSX</constant>), Windows for Workgroups (<constant>WfWg</constant>), Windows 9x/ME
    492492                    (<constant>Win95</constant>), Windows NT (<constant>WinNT</constant>),
    493493                    Windows 2000 (<constant>Win2K</constant>),
    … …  
    504504                <term>%I</term>
    505505                <listitem><para>the IP address of the client machine.</para>
     506                <para>Before 3.6.0 it could contain IPv4 mapped IPv6 addresses,
     507                        now it only contains IPv4 or IPv6 addresses.</para>
    506508                </listitem>
    507509                </varlistentry>
    … …  
    510512                <term>%i</term>
    511513                <listitem><para>the local IP address to which a client connected.</para>
     514                <para>Before 3.6.0 it could contain IPv4 mapped IPv6 addresses,
     515                        now it only contains IPv4 or IPv6 addresses.</para>
    512516                </listitem>
    513517                </varlistentry>
    … …  
    629633                <listitem><para>
    630634                controls what the default case is for new filenames (ie. files that don't currently exist in the filesystem).
    631                 Default <emphasis>lower</emphasis>.  IMPORTANT NOTE: This option will be used to modify the case of
    632                 <emphasis>all</emphasis> incoming client filenames, not just new filenames if the options <smbconfoption
    633                 name="case sensitive">yes</smbconfoption>, <smbconfoption name="preserve case">No</smbconfoption>,
    634                 <smbconfoption name="short preserve case">No</smbconfoption> are set.  This change is needed as part of the
    635                 optimisations for directories containing large numbers of files.
     635                Default <emphasis>lower</emphasis>.  IMPORTANT NOTE: As part of the optimizations for directories containing
     636                large numbers of files, the following special case applies. If the options
     637                <smbconfoption  name="case sensitive">yes</smbconfoption>, <smbconfoption name="preserve case">No</smbconfoption>, and
     638                <smbconfoption name="short preserve case">No</smbconfoption> are set, then the case of <emphasis>all</emphasis>
     639                incoming client filenames, not just new filenames, will be modified. See additional notes below.
    636640                </para></listitem>
    637641                </varlistentry>

  • trunk/server/docs-xml/manpages-3/smbcacls.1.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2222                <arg choice="req">//server/share</arg>
    2323                <arg choice="req">filename</arg>
    24                 <arg choice="opt">-D acls</arg>
    25                 <arg choice="opt">-M acls</arg>
    26                 <arg choice="opt">-a acls</arg>
    27                 <arg choice="opt">-S acls</arg>
    28                 <arg choice="opt">-C name</arg>
    29                 <arg choice="opt">-G name</arg>
     24                <arg choice="opt">-D|--delete acls</arg>
     25                <arg choice="opt">-M|--modify acls</arg>
     26                <arg choice="opt">-a|--add acls</arg>
     27                <arg choice="opt">-S|--set acls</arg>
     28                <arg choice="opt">-C|--chown name</arg>
     29                <arg choice="opt">-G|--chgrp name</arg>
     30                <arg choice="opt">-I allow|romove|copy</arg>
    3031                <arg choice="opt">--numeric</arg>
    3132                <arg choice="opt">-t</arg>
    … …  
    118119               
    119120               
     121                <varlistentry>
     122                <term>-I|--inherit allow|remove|copy</term>
     123                <listitem><para>Set or unset the windows "Allow inheritable
     124                permissions" check box using the <parameter>-I</parameter>
     125                option.  To set the check box pass allow. To unset the check
     126                box pass either remove or copy. Remove will remove all
     127                inherited acls. Copy will copy all the inherited acls.
     128                </para></listitem>
     129
     130                </varlistentry>
     131
     132
     133
    120134                <varlistentry>
    121135                <term>--numeric</term>

  • trunk/server/docs-xml/manpages-3/smbclient.1.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    262262
    263263                <varlistentry>
    264                 <term>-P</term>
     264                <term>-P|--machine-pass</term>
    265265                <listitem><para>
    266266                Make queries to the external server using the machine account of the local server.
    … …  
    318318               
    319319                <varlistentry>
    320                 <term>-e</term>
     320                <term>-e|--encrypt</term>
    321321                <listitem><para>This command line parameter requires the remote
    322322                server support the UNIX extensions. Request that the connection be
    … …  
    470470               
    471471                <varlistentry>
    472                 <term>-c|--comand command string</term>
     472                <term>-c|--command command string</term>
    473473                <listitem><para>command string is a semicolon-separated list of
    474474                commands to be executed instead of prompting from stdin. <parameter>

  • trunk/server/docs-xml/manpages-3/smbcontrol.1.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    273273        </varlistentry>
    274274
     275        <varlistentry>
     276        <term>idmap</term>
     277        <listitem><para>Notify about changes of id mapping. Can be sent
     278        to <constant>smbd</constant> or (not implemented yet) <constant>winbindd</constant>.
     279        </para></listitem>
     280
     281        <variablelist>
     282          <varlistentry>
     283            <term>flush [uid|gid]</term>
     284            <listitem><para>Flush caches for sid &lt;-&gt; gid and/or sid &lt;-&gt; uid mapping.
     285            </para></listitem>
     286          </varlistentry>
     287          <varlistentry>
     288            <term>delete &lt;ID&gt;</term>
     289            <listitem><para>Remove a mapping from cache. The mapping is given by &lt;ID&gt;
     290            which may either be a sid: S-x-..., a gid: "GID number" or a uid: "UID number".
     291            </para></listitem>
     292          </varlistentry>
     293          <varlistentry>
     294            <term>kill &lt;ID&gt;</term>
     295            <listitem><para>Remove a mapping from cache. Terminate <constant>smbd</constant> if
     296            the id is currently in use.</para></listitem>
     297          </varlistentry>
     298        </variablelist>
     299        </varlistentry>
     300
    275301</variablelist>
    276302</refsect1>

  • trunk/server/docs-xml/manpages-3/smbcquotas.1.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/smbd.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/smbget.1.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    124124        <varlistentry>
    125125                <term>-f, --rcfile</term>
    126                 <listitem><para>Use specified rcfile. This will be loaded in the order it was specified - e.g. if you specify any options before this one, they might get overriden by the contents of the rcfile.</para></listitem>
     126                <listitem><para>Use specified rcfile. This will be loaded in the order it was specified - e.g. if you specify any options before this one, they might get overridden by the contents of the rcfile.</para></listitem>
    127127        </varlistentry>
    128128

  • trunk/server/docs-xml/manpages-3/smbgetrc.5.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/smbpasswd.5.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/smbpasswd.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/smbspool.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/smbstatus.1.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/smbtar.1.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/smbtree.1.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/swat.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/tdbbackup.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/tdbdump.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/tdbtool.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/testparm.1.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2424                <arg choice="opt">-h</arg>
    2525                <arg choice="opt">-v</arg>
    26                 <arg choice="opt">-L &lt;servername&gt;</arg>
    2726                <arg choice="opt">-t &lt;encoding&gt;</arg>
    2827                <arg choice="req">config filename</arg>
    … …  
    7473                &stdarg.version;
    7574               
    76                 <varlistentry>
    77                 <term>-L servername</term>
    78                 <listitem><para>Sets the value of the %L macro to <replaceable>servername</replaceable>.
    79                 This is useful for testing include files specified with the
    80                 %L macro. </para></listitem>
    81                 </varlistentry>
    82 
    8375                <varlistentry>
    8476                <term>-v</term>

  • trunk/server/docs-xml/manpages-3/vfs_acl_tdb.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_acl_xattr.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_audit.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_cacheprime.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_cap.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_catia.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_commit.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_default_quota.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_dirsort.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_extd_audit.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_fake_perms.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_fileid.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_full_audit.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    185185                <para>LIST is a list of VFS operations that should be
    186186                recorded if they succeed. Operations are specified using
    187                 the names listed above.
     187                the names listed above. Operations can be unset by prefixing
     188                the names with "!".
    188189                </para>
    189190
    … …  
    196197                <para>LIST is a list of VFS operations that should be
    197198                recorded if they failed. Operations are specified using
    198                 the names listed above.
     199                the names listed above. Operations can be unset by prefixing
     200                the names with "!".
    199201                </para>
    200202
    … …  
    233235        <para>Log file and directory open operations on the [records]
    234236        share using the LOCAL7 facility and ALERT priority, including
    235         the username and IP address:</para>
     237        the username and IP address. Logging excludes the open VFS function
     238        on failures:</para>
    236239
    237240<programlisting>
    … …  
    241244        <smbconfoption name="full_audit:prefix">%u|%I</smbconfoption>
    242245        <smbconfoption name="full_audit:success">open opendir</smbconfoption>
    243         <smbconfoption name="full_audit:failure">all</smbconfoption>
     246        <smbconfoption name="full_audit:failure">all !open</smbconfoption>
    244247        <smbconfoption name="full_audit:facility">LOCAL7</smbconfoption>
    245248        <smbconfoption name="full_audit:priority">ALERT</smbconfoption>

  • trunk/server/docs-xml/manpages-3/vfs_gpfs.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    6161                <varlistentry>
    6262
     63                <term>gpfs:sharemodes = [ yes | no ]</term>
     64                <listitem>
     65                <para>
     66                Enable/Disable cross node sharemode handling for GPFS.
     67                </para>
     68
     69                <itemizedlist>
     70                <listitem><para>
     71                <command>yes(default)</command> - propagate sharemodes across all GPFS nodes.
     72                </para></listitem>
     73                <listitem><para>
     74                <command>no</command> - do not propagate sharemodes across all GPFS nodes.
     75                This should only be used if the GPFS file system is
     76                exclusively exported by Samba. Access by local unix application or
     77                NFS exports could lead to corrupted files.
     78                </para></listitem>
     79                </itemizedlist>
     80                </listitem>
     81
     82                </varlistentry>
     83                <varlistentry>
     84
     85                <term>gpfs:leases = [ yes | no ]</term>
     86                <listitem>
     87                <para>
     88                Enable/Disable cross node leases (oplocks) for GPFS.
     89                You should also set the <command>oplocks</command> and <command>kernel oplocks</command>
     90                options to the same value.
     91                </para>
     92
     93                <itemizedlist>
     94                <listitem><para>
     95                <command>yes(default)</command> - propagate leases across all GPFS nodes.
     96                </para></listitem>
     97                <listitem><para>
     98                <command>no</command> - do not propagate leases across all GPFS nodes.
     99                This should only be used if the GPFS file system is
     100                exclusively exported by Samba. Access by local unix application or
     101                NFS exports could lead to corrupted files.
     102                </para></listitem>
     103                </itemizedlist>
     104                </listitem>
     105
     106                </varlistentry>
     107
     108                <varlistentry>
     109
     110                <term>gpfs:hsm = [ yes | no ]</term>
     111                <listitem>
     112                <para>
     113                Enable/Disable announcing if this FS has HSM enabled.
     114                </para>
     115
     116                <itemizedlist>
     117                <listitem><para>
     118                <command>no(default)</command> - Do not announce HSM.
     119                </para></listitem>
     120                <listitem><para>
     121                <command>no</command> - Announce HSM.
     122                </para></listitem>
     123                </itemizedlist>
     124                </listitem>
     125
     126                </varlistentry>
     127
     128                <varlistentry>
     129
     130                <term>gpfs:getrealfilename = [ yes | no ]</term>
     131                <listitem>
     132                <para>
     133                Enable/Disable usage of the <command>gpfs_get_realfilename_path()</command> function.
     134                This improves the casesensitive wildcard file name access.
     135                </para>
     136
     137                <itemizedlist>
     138                <listitem><para>
     139                <command>yes(default)</command> - use <command>gpfs_get_realfilename_path()</command>.
     140                </para></listitem>
     141                <listitem><para>
     142                <command>no</command> - do not use <command>gpfs_get_realfilename_path()</command>.
     143                It seems that <command>gpfs_get_realfilename_path()</command> doesn't work on AIX.
     144                </para></listitem>
     145                </itemizedlist>
     146                </listitem>
     147
     148                </varlistentry>
     149                <varlistentry>
     150
     151                <term>gpfs:winattr = [ yes | no ]</term>
     152                <listitem>
     153                <para>
     154                Enable/Disable usage of the windows attributes in GPFS.
     155                GPFS is able to store windows file attributes e.g. HIDDEN,
     156                READONLY, SYSTEM and others natively. That means Samba doesn't
     157                need to map them to permission bits or extended attributes.
     158                </para>
     159
     160                <itemizedlist>
     161                <listitem><para>
     162                <command>no(default)</command> - do not use GPFS windows attributes.
     163                </para></listitem>
     164                <listitem><para>
     165                <command>yes</command> - use GPFS windows attributes.
     166                </para></listitem>
     167                </itemizedlist>
     168                </listitem>
     169
     170                </varlistentry>
     171                <varlistentry>
     172
     173                <term>gpfs:merge_writeappend = [ yes | no ]</term>
     174                <listitem>
     175                <para>
     176                GPFS ACLs doesn't know about the 'APPEND' right.
     177                This optionen lets Samba map the 'APPEND' right to 'WRITE'.
     178                </para>
     179
     180                <itemizedlist>
     181                <listitem><para>
     182                <command>yes(default)</command> - map 'APPEND' to 'WRITE'.
     183                </para></listitem>
     184                <listitem><para>
     185                <command>no</command> - do not map 'APPEND' to 'WRITE'.
     186                </para></listitem>
     187                </itemizedlist>
     188                </listitem>
     189
     190                </varlistentry>
     191                <varlistentry>
     192
     193                <term>gpfs:refuse_dacl_protected = [ yes | no ]</term>
     194                <listitem>
     195                <para>
     196                As GPFS does not support the ACE4_FLAG_NO_PROPAGATE NFSv4 flag (which would be
     197                the mapping for the DESC_DACL_PROTECTED flag), the status of this flag is
     198                currently silently ignored by Samba. That means that if you deselect the "Allow
     199                inheritable permissions..." checkbox in Windows' ACL dialog and then apply the
     200                ACL, the flag will be back immediately.
     201                </para>
     202                <para>
     203                To make sure that automatic migration with e.g. robocopy does not lead to
     204                ACLs silently (and unintentionally) changed, you can set
     205                <command>gpfs:refuse_dacl_protected = yes</command> to enable an explicit
     206                check for this flag and if set, it will return NT_STATUS_NOT_SUPPORTED so
     207                errors are shown up on the Windows side and the Administrator is aware of
     208                the ACLs not being settable like intended
     209                </para>
     210
     211                <itemizedlist>
     212                <listitem><para>
     213                <command>no(default)</command> - ignore the DESC_DACL_PROTECTED flags.
     214                </para></listitem>
     215                <listitem><para>
     216                <command>yes</command> - reject ACLs with DESC_DACL_PROTECTED.
     217                </para></listitem>
     218                </itemizedlist>
     219                </listitem>
     220
     221                </varlistentry>
     222                <varlistentry>
     223
    63224                <term>nfs4:mode = [ simple | special ]</term>
    64225                <listitem>
    … …  
    112273                <listitem><para><command>yes</command> - Enable chown if as supported by the under filesystem</para></listitem>
    113274                <listitem><para><command>no (default)</command> - Disable chown</para></listitem>
     275                </itemizedlist>
     276                </listitem>
     277                </varlistentry>
     278
     279                <varlistentry>
     280                <term>gpfs:syncio = [yes|no]</term>
     281                <listitem>
     282                <para>This parameter makes Samba open all files with O_SYNC.
     283                  This triggers optimizations in GPFS for workloads that
     284                  heavily share files.</para>
     285
     286                <para>Following is the behaviour of Samba for different
     287                  values:
     288                </para>
     289                <itemizedlist>
     290                <listitem><para><command>yes</command>Open files with O_SYNC
     291                </para></listitem>
     292                <listitem><para><command>no (default)</command>Open files as
     293                    normal Samba would do
     294                </para></listitem>
    114295                </itemizedlist>
    115296                </listitem>
    … …  
    135316<refsect1>
    136317        <title>CAVEATS</title>
    137         <para>The gpfs gpl libraries are required by <command>gpfs</command> VFS
    138         module during both compilation and runtime.
    139         Also this VFS module is tested to work on SLES 9/10 and RHEL 4.4
     318        <para>
     319        Depending on the version of gpfs, the <command>libgpfs_gpl</command>
     320        library or the <command>libgpfs</command> library is needed at
     321        runtime by the <command>gpfs</command> VFS module:
     322        Starting with gpfs 3.2.1 PTF8, the complete <command>libgpfs</command>
     323        is available as open source and <command>libgpfs_gpl</command> does no
     324        longer exist. With earlier versions of gpfs, only the
     325        <command>libgpfs_gpl</command> library was open source and could be
     326        used at run time.
     327        </para>
     328        <para>
     329        At build time, only the header file <command>gpfs_gpl.h</command>
     330        is required , which is a symlink to <command>gpfs.h</command> in
     331        gpfs versions newer than 3.2.1 PTF8.
    140332        </para>
    141333</refsect1>

  • trunk/server/docs-xml/manpages-3/vfs_netatalk.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_notify_fam.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_prealloc.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_preopen.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_readahead.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_readonly.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_recycle.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_scannedonly.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    226226        <title>VERSION</title>
    227227
    228         <para>This man page is correct for version 3.5.0 of the Samba suite.
     228        <para>This man page is correct for version 3.6.0 of the Samba suite.
    229229        </para>
    230230</refsect1>

  • trunk/server/docs-xml/manpages-3/vfs_shadow_copy.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_shadow_copy2.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    108108
    109109                <varlistentry>
     110                <term>shadow:sort = asc/desc, or not specified for unsorted (default)
     111                </term>
     112                <listitem>
     113                <para>By this parameter one can specify that the shadow
     114                copy directories should be sorted before they are sent to the
     115                client.  This can be beneficial as unix filesystems are usually
     116                not listed alphabetically sorted. If enabled, you typically
     117                want to specify descending order.
     118                </para>
     119                </listitem>
     120                </varlistentry>
     121
     122                <varlistentry>
     123                <term>shadow:localtime = yes/no
     124                </term>
     125                <listitem>
     126                <para>This is an optional parameter that indicates whether the
     127                snapshot names are in UTC/GMT or in local time. By default
     128                UTC is expected.
     129                </para>
     130                </listitem>
     131                </varlistentry>
     132
     133                <varlistentry>
     134                <term>shadow:format = format specification for snapshot names
     135                </term>
     136                <listitem>
     137                <para>This is an optional parameter that specifies the format
     138                specification for the naming of snapshots.  The format must
     139                be compatible with the conversion specifications recognized
     140                by str[fp]time.  The default value is "@GMT-%Y.%m.%d-%H.%M.%S".
     141                </para>
     142                </listitem>
     143                </varlistentry>
     144
     145                <varlistentry>
    110146                <term>shadow:fixinodes = yes/no
    111147                </term>
    … …  
    134170        <smbconfoption name="shadow:snapdir">/data/snaphots</smbconfoption>
    135171        <smbconfoption name="shadow:basedir">/data/home</smbconfoption>
     172        <smbconfoption name="shadow:sort">desc</smbconfoption>
    136173</programlisting>
    137174

  • trunk/server/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    3232
    3333        <para>The <command>vfs_smb_traffic_analyzer</command> VFS module logs
    34         client write and read operations on a Samba server and sends this data
    35         over a socket to a helper program, which feeds a SQL database. More
     34        client file operations on a Samba server and sends this data
     35        over a socket to a helper program (in the following the "Receiver"),
     36        which feeds a SQL database. More
    3637        information on the helper programs can be obtained from the
    3738        homepage of the project at:
    3839        http://holger123.wordpress.com/smb-traffic-analyzer/
    39         </para>
    40         <para><command>vfs_smb_traffic_analyzer</command> currently is aware
    41         of the following VFS operations:</para>
     40        Since the VFS module depends on a receiver that is doing something with
     41        the data, it is evolving in it's development. Therefore, the module
     42        works with different protocol versions, and the receiver has to be able
     43        to decode the protocol that is used. The protocol version 1 was
     44        introduced to Samba at September 25, 2008. It was a very simple
     45        protocol, supporting only a small list of VFS operations, and had
     46        several drawbacks. The protocol version 2 is a try to solve the
     47        problems version 1 had while at the same time adding new features.
     48        With the release of Samba 3.6.0, the module will run protocol version 2
     49        by default.
     50        </para>
     51</refsect1>
     52
     53<refsect1>
     54        <title>Protocol version 1 documentation</title>
     55        <para><command>vfs_smb_traffic_analyzer</command> protocol version 1 is aware
     56                of the following VFS operations:</para>
    4257
    4358        <simplelist>
    … …  
    6580        <listitem><para><command>FILENAME</command> - the name of the file that was used by the VFS operation</para></listitem>
    6681        <listitem><para><command>TIMESTAMP</command> - a timestamp, formatted as "yyyy-mm-dd hh-mm-ss.ms" indicating when the VFS operation occured</para></listitem>
     82        <listitem><para><command>IP</command> - The IP Address (v4 or v6) of the client machine that initiated the VFS operation.</para></listitem>
    6783        </itemizedlist>
    6884
    … …  
    7389</refsect1>
    7490
    75 
    76 <refsect1>
    77         <title>OPTIONS</title>
     91<refsect1>
     92        <title>Drawbacks of protocol version 1</title>
     93        <para>Several drawbacks have been seen with protocol version 1 over time.</para>
     94        <itemizedlist>
     95        <listitem>
     96                <para>
     97                        <command>Problematic parsing - </command>
     98                        Protocol version 1 uses hyphen and comma to seperate blocks of data. Once there is a
     99                        filename with a hyphen, you will run into problems because the receiver decodes the
     100                        data in a wrong way.
     101                </para>
     102        </listitem>
     103        <listitem>
     104                <para>
     105                        <command>Insecure network transfer - </command>
     106                        Protocol version 1 sends all it's data as plaintext over the network.
     107                </para>
     108        </listitem>
     109        <listitem>
     110                <para>
     111                        <command>Limited set of supported VFS operations - </command>
     112                        Protocol version 1 supports only four VFS operations.
     113                </para>
     114        </listitem>
     115        <listitem>
     116                <para>
     117                        <command>No subreleases of the protocol - </command>
     118                        Protocol version 1 is fixed on it's version, making it unable to introduce new
     119                        features or bugfixes through compatible sub-releases.
     120                </para>
     121        </listitem>
     122        </itemizedlist>
     123</refsect1>
     124<refsect1>
     125        <title>Version 2 of the protocol</title>
     126        <para>Protocol version 2 is an approach to solve the problems introduced with protcol v1.
     127        From the users perspective, the following changes are most prominent among other enhancements:
     128        </para>
     129        <itemizedlist>
     130                <listitem>
     131                <para>
     132                The data from the module may be send encrypted, with a key stored in secrets.tdb. The
     133                Receiver then has to use the same key. The module does AES block encryption over the
     134                data to send.
     135                </para>
     136                </listitem>
     137                <listitem>
     138                <para>
     139                The module now can identify itself against the receiver with a sub-release number, where
     140                the receiver may run with a different sub-release number than the module. However, as
     141                long as both run on the V2.x protocol, the receiver will not crash, even if the module
     142                uses features only implemented in the newer subrelease. If the module uses
     143                a new feature from a newer subrelease, and the receiver runs an older protocol, it is just
     144                ignoring the functionality. Of course it is best to have both the receiver and the module
     145                running the same subrelease of the protocol.
     146                </para>
     147                </listitem>
     148                <listitem>
     149                <para>
     150                The parsing problems of protocol V1 can no longer happen, because V2 is marshalling the
     151                data packages in a proper way.
     152                </para>
     153                </listitem>
     154                <listitem>
     155                <para>
     156                The module now potientially has the ability to create data on every VFS function. As of
     157                protocol V2.0, there is support for 8 VFS functions, namely write,read,pread,pwrite,
     158                rename,chdir,mkdir and rmdir. Supporting more VFS functions is one of the targets for the
     159                upcoming sub-releases.
     160                </para>
     161                </listitem>
     162        </itemizedlist>
     163        <para>
     164                To enable protocol V2, the protocol_version vfs option has to be used (see OPTIONS).
     165        </para>
     166               
     167</refsect1>             
     168
     169<refsect1>
     170        <title>OPTIONS with protocol V1 and V2.x</title>
    78171
    79172        <variablelist>
    … …  
    112205                <listitem>
    113206                <para>The module will replace the user names with a prefix
    114                 given by STRING and a simple hash number.
     207                given by STRING and a simple hash number. In version 2.x
     208                of the protocol, the users SID will also be anonymized.
    115209                </para>
    116210
    … …  
    126220                an additional hash number. This means that any transfer data
    127221                will be mapped to a single user, leading to a total
    128                 anonymization of user related data.</para>
     222                anonymization of user related data. In version 2.x of the
     223                protocol, the users SID will also be anonymized.</para>
     224                </listitem>
     225                </varlistentry>
     226
     227                <varlistentry>
     228                <term>smb_traffic_analyzer:protocol_version = STRING</term>
     229                <listitem>
     230                <para>If STRING matches to V1, the module will use version 1 of the
     231                protocol. If STRING is not given, the module will use version 2 of the
     232                protocol, which is the default.
     233                </para>
    129234                </listitem>
    130235                </varlistentry>
    … …  
    135240<refsect1>
    136241        <title>EXAMPLES</title>
     242        <para>Running protocol V2 on share "example_share", using an internet socket.</para>
     243        <programlisting>
     244        <smbconfsection name="[example_share]"/>
     245        <smbconfoption name="path">/data/example</smbconfoption>
     246        <smbconfoption name="vfs_objects">smb_traffic_analyzer</smbconfoption>
     247        <smbconfoption name="smb_traffic_analyzer:host">examplehost</smbconfoption>
     248        <smbconfoption name="smb_traffic_analyzer:port">3491</smbconfoption>
     249        </programlisting>
    137250
    138251        <para>The module running on share "example_share", using a unix domain socket</para>
    … …  
    184297        helper tools were created by Holger Hetterich.</para>
    185298</refsect1>
    186 
    187299</refentry>

  • trunk/server/docs-xml/manpages-3/vfs_streams_depot.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_streams_xattr.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfs_xattr_tdb.8.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/vfstest.1.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/wbinfo.1.xml

    r599 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    5151                <arg choice="opt">-r user</arg>
    5252                <arg choide="opt">-R|--lookup-rids</arg>
    53                 <arg choice="opt">--remove-uid-mapping uid,sid</arg>
    54                 <arg choice="opt">--remove-gid-mapping gid,sid</arg>
    5553                <arg choice="opt">-s sid</arg>
    5654                <arg choice="opt">--separator</arg>
    57                 <arg choice="opt">--sequence</arg>
    5855                <arg choice="opt">--set-auth-user user%password</arg>
    59                 <arg choice="opt">--set-uid-mapping uid,sid</arg>
    60                 <arg choice="opt">--set-gid-mapping gid,sid</arg>
    6156                <arg choice="opt">-S sid</arg>
    6257                <arg choide="opt">--sid-aliases</arg>
    … …  
    152147                the current domain to which <citerefentry><refentrytitle>winbindd</refentrytitle>
    153148                <manvolnum>8</manvolnum></citerefentry> belongs.  Currently only the
    154                 <option>--sequence</option>,
    155149                <option>-u</option>, and <option>-g</option> options honor this parameter.
    156150                </para></listitem>
    … …  
    312306
    313307                <varlistentry>
     308                <term>-P|--ping-dc</term>
     309                <listitem><para>Issue a no-effect command to our DC. This
     310                    checks if our secure channel connection to our domain
     311                    controller is still alive. It has much less impact than
     312                    wbinfo -t.
     313                </para></listitem>
     314                </varlistentry>
     315
     316                <varlistentry>
    314317                <term>-r|--user-groups <replaceable>username</replaceable></term>
    315318                <listitem><para>Try to obtain the list of UNIX group ids
    … …  
    338341                <term>--separator</term>
    339342                <listitem><para>Get the active winbind separator.
    340                 </para></listitem>
    341 
    342                 </varlistentry>
    343                 <varlistentry>
    344                 <term>--sequence</term>
    345                 <listitem><para>Show sequence numbers of all known domains.
    346343                </para></listitem>
    347344                </varlistentry>
    … …  
    427424                <listitem><para>Try to convert a UNIX user id to a Windows NT
    428425                SID.  If the uid specified does not refer to one within
    429                 the idmap uid range then the operation will fail. </para></listitem>
     426                the idmap range then the operation will fail. </para></listitem>
    430427                </varlistentry>
    431428
    … …  
    445442                </varlistentry>
    446443
    447                 <varlistentry>
    448                 <term>--remove-uid-mapping uid,sid</term>
    449                 <listitem><para>Remove an existing uid to sid mapping
    450                 entry from the IDmap backend.</para></listitem>
    451                 </varlistentry>
    452 
    453                 <varlistentry>
    454                 <term>--remove-gid-mapping gid,sid</term>
    455                 <listitem><para>Remove an existing gid to sid
    456                 mapping entry from the IDmap backend.</para></listitem>
    457                 </varlistentry>
    458 
    459                 <varlistentry>
    460                 <term>--set-uid-mapping uid,sid</term>
    461                 <listitem><para>Create a new or modify an existing uid to sid
    462                 mapping in the IDmap backend.</para></listitem>
    463                 </varlistentry>
    464 
    465                 <varlistentry>
    466                 <term>--set-gid-mapping gid,sid</term>
    467                 <listitem><para>Create a new or modify an existing gid to sid
    468                 mapping in the IDmap backend.</para></listitem>
    469                 </varlistentry>
    470 
    471444                &stdarg.version;
    472445                &stdarg.help;

  • trunk/server/docs-xml/manpages-3/winbind_krb5_locator.7.xml

    r414 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">7</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212

  • trunk/server/docs-xml/manpages-3/winbindd.8.xml

    r480 r745  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.5</refmiscinfo>
     10        <refmiscinfo class="version">3.6</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    4646        service to <command>smbd</command>, <command>ntlm_auth</command>
    4747        and the <command>pam_winbind.so</command> PAM module, by managing connections to
    48         domain controllers.  In this configuraiton the
    49         <smbconfoption name="idmap uid"/> and
    50         <smbconfoption name="idmap gid"/>
    51         parameters are not required. (This is known as `netlogon proxy only mode'.)</para>
     48        domain controllers.  In this configuration the
     49        <smbconfoption name="idmap config * : range"/>
     50        parameter is not required. (This is known as `netlogon proxy only mode'.)</para>
    5251
    5352        <para> The Name Service Switch allows user
    … …  
    247246                <smbconfoption name="winbind separator"/></para></listitem>
    248247                <listitem><para>
    249                 <smbconfoption name="idmap uid"/></para></listitem>
    250                 <listitem><para>
    251                 <smbconfoption name="idmap gid"/></para></listitem>
    252                 <listitem><para>
    253                 <smbconfoption name="idmap backend"/></para></listitem>
     248                <smbconfoption name="idmap config * : range"/></para></listitem>
     249                <listitem><para>
     250                <smbconfoption name="idmap config * : backend"/></para></listitem>
    254251                <listitem><para>
    255252                <smbconfoption name="winbind cache time"/></para></listitem>
    … …  
    341338        template shell = /bin/bash
    342339        template homedir = /home/%D/%U
    343         idmap uid = 10000-20000
    344         idmap gid = 10000-20000
     340        idmap config * : range = 10000-20000
    345341        workgroup = DOMAIN
    346342        security = domain
    … …  
    375371        then in general the user and groups ids allocated by winbindd will not
    376372        be the same.  The user and group ids will only be valid for the local
    377         machine, unless a shared <smbconfoption name="idmap backend"/> is configured.</para>
     373        machine, unless a shared <smbconfoption name="idmap config * : backend"/> is configured.</para>
    378374
    379375        <para>If the the Windows NT SID to UNIX user and group id mapping
Note: See TracChangeset for help on using the changeset viewer.