Ignore:
Timestamp:
Nov 24, 2016, 1:14:11 PM (9 years ago)
Author:
Silvan Scherrer
Message:

Samba Server: update vendor to version 4.4.3

Location:
vendor/current/docs-xml/manpages
Files:
22 added
9 deleted
73 edited
1 moved

Legend:

Unmodified
Added
Removed

  • vendor/current/docs-xml/manpages/dbwrap_tool.1.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2020        <cmdsynopsis>
    2121                <command>dbwrap_tool</command>
     22                <arg choice="opt">--persistent</arg>
     23                <arg choice="opt">--non-persistent</arg>
     24                <arg choice="opt">-d &lt;debug level&gt;</arg>
     25                <arg choice="opt">-s &lt;config file&gt;</arg>
     26                <arg choice="opt">-l &lt;log file base&gt;</arg>
     27                <arg choice="opt">-V</arg>
     28                <arg choice="opt">--option=&lt;name&gt;=&lt;value&gt;</arg>
    2229                <arg choice="req">&lt;database&gt;</arg>
    2330                <arg choice="req">&lt;operation&gt;</arg>
    2431                <arg choice="opt">&lt;key&gt;
    2532                        <arg choice="opt">&lt;type&gt;
    26                                 <arg choice="opt">&lt;value&gt;</arg>
    27                         </arg>
    28                 </arg>
     33                                <arg choice="opt">&lt;value&gt;</arg></arg></arg>
    2934        </cmdsynopsis>
    3035</refsynopsisdiv>
    … …  
    4449                <listitem><para>store: create or modify a record</para></listitem>
    4550                <listitem><para>delete: remove a record</para></listitem>
     51                <listitem><para>exists: test for existence of a record</para></listitem>
    4652                <listitem><para>erase: remove all records</para></listitem>
    4753                <listitem><para>listkeys: list all available records</para></listitem>
     54                <listitem><para>listwatchers: list processes, which are waiting for changes in a record</para></listitem>
    4855        </itemizedlist>
    4956        </para>
    … …  
    5360                <listitem><para>uint32: unsigned 32bit integer</para></listitem>
    5461                <listitem><para>string: "hello world"</para></listitem>
     62                <listitem><para>hex: hex strings like "68656C6C6F20776F726C6400" ("hello world")</para></listitem>
    5563        </itemizedlist>
    5664        </para>
    … …  
    6068        <title>OPTIONS</title>
    6169
    62         <para>None.</para>
     70        <variablelist>
     71                <varlistentry>
     72                        <term>--persistent</term>
     73                        <listitem><para>Open the database as a persistent database.
     74                        </para>
     75                        <para>
     76                        Exactly one of --persistent and --non-persistent must be
     77                        specified.
     78                        </para></listitem>
     79                </varlistentry>
     80                <varlistentry>
     81                        <term>--non-persistent</term>
     82                        <listitem><para>Open the database as a non-persistent database.
     83                        </para>
     84                        <para>
     85                        Caveat: opening a database as non-persistent when there
     86                        is currently no other opener will wipe the database.
     87                        </para>
     88                        <para>
     89                        Exactly one of --persistent and --non-persistent must be
     90                        specified.
     91                        </para></listitem>
     92                </varlistentry>
     93                &popt.common.samba.client;
     94                &popt.autohelp;
     95        </variablelist>
    6396</refsect1>
    6497
    … …  
    84117        </refsect2>
    85118        <refsect2>
     119                <title>exists</title>
     120                <cmdsynopsis>
     121                        <command>dbwrap_tool</command> &lt;database&gt; exists &lt;key&gt;
     122                </cmdsynopsis>
     123        </refsect2>
     124        <refsect2>
    86125                <title>erase</title>
    87126                <cmdsynopsis>
    88                         <command>dbwrap_tool</command> &lt;database&gt; erase
    89                 </cmdsynopsis>
     127                        <command>dbwrap_tool</command> &lt;database&gt; erase </cmdsynopsis>
    90128        </refsect2>
    91129        <refsect2>
    … …  
    93131                <cmdsynopsis>
    94132                        <command>dbwrap_tool</command> &lt;database&gt; listkeys
     133                </cmdsynopsis>
     134        </refsect2>
     135        <refsect2>
     136                <title>listwatchers</title>
     137                <cmdsynopsis>
     138                        <command>dbwrap_tool</command> &lt;database&gt; listwatchers
    95139                </cmdsynopsis>
    96140        </refsect2>
    … …  
    101145        <variablelist>
    102146                <varlistentry><term>List all keys from winbindd_idmap.tdb</term>
    103                         <listitem><para><command>dbwrap_tool</command> winbindd_idmap.tdb listkeys</para></listitem>
     147                        <listitem><para><command>dbwrap_tool</command> --persistent winbindd_idmap.tdb listkeys</para></listitem>
    104148                </varlistentry>
    105149                <varlistentry><term>Fetch record with key "USER HWM" as uint32</term>
    106                         <listitem><para><command>dbwrap_tool</command> winbindd_idmap.tdb fetch "USER HWM" uint32</para></listitem>
     150                        <listitem><para><command>dbwrap_tool</command> --persistent winbindd_idmap.tdb fetch "USER HWM" uint32</para></listitem>
    107151                </varlistentry>
    108152                <varlistentry><term>Remove record with key "USER HWM"</term>
    109                         <listitem><para><command>dbwrap_tool</command> winbindd_idmap.tdb remove "USER HWM"</para></listitem>
     153                        <listitem><para><command>dbwrap_tool</command> --persistent winbindd_idmap.tdb remove "USER HWM"</para></listitem>
    110154                </varlistentry>
    111155                <varlistentry><term>Store and overwrite record "USER HWM" with value 214</term>
    112                         <listitem><para><command>dbwrap_tool</command> winbindd_idmap.tdb store "USER HWM" uint32 214</para></listitem>
     156                        <listitem><para>uint32: <command>dbwrap_tool</command> --persistent winbindd_idmap.tdb store "USER HWM" uint32 214</para></listitem>
     157                        <listitem><para>hex: <command>dbwrap_tool</command> --persistent winbindd_idmap.tdb store "USER HWM" hex D6000000</para></listitem>
    113158                </varlistentry>
    114159        </variablelist>

  • vendor/current/docs-xml/manpages/eventlogadm.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/findsmb.1.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/idmap_ad.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    3131
    3232        <para>
    33         Note that the idmap_ad module has changed considerably since
    34         Samba versions 3.0 and 3.2.
    3533        Currently, the <parameter>ad</parameter> backend
    36         does not work as the the default idmap backend, but one has
     34        does not work as the default idmap backend, but one has
    3735        to configure it separately for each domain for which one wants
    3836        to use it, using disjoint ranges. One usually needs to configure
    … …  
    6462                </varlistentry>
    6563                <varlistentry>
    66                 <term>schema_mode = &lt;rfc2307 | sfu &gt;</term>
     64                <term>schema_mode = &lt;rfc2307 | sfu | sfu20&gt;</term>
    6765                <listitem><para>
    6866                        Defines the schema that idmap_ad should use when querying
    … …  
    7068                        This can be either the RFC2307 schema support included
    7169                        in Windows 2003 R2 or the Service for Unix (SFU) schema.
     70                        For SFU 3.0 or 3.5 please choose "sfu", for SFU 2.0
     71                        please choose "sfu20".
     72
     73                        Please note that primary group membership is currently always calculated
     74                        via the "primaryGroupID" LDAP attribute.
    7275                </para></listitem>
    7376                </varlistentry>
    … …  
    8992        <programlisting>
    9093        [global]
     94        workgroup = CORP
     95
    9196        idmap config * : backend = tdb
    9297        idmap config * : range = 1000000-1999999

  • vendor/current/docs-xml/manpages/idmap_autorid.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    3939        <variablelist>
    4040                <varlistentry>
     41                <term>range = low - high</term>
     42                <listitem><para>
     43                        Defines the available matching uid and gid
     44                        range for which the backend is
     45                        authoritative. Note that the range acts as a
     46                        filter.  If algorithmically determined UID or
     47                        GID fall outside the range, they are ignored
     48                        and the corresponding map is discarded.  It is
     49                        intended as a way to avoid accidental UID/GID
     50                        overlaps between local and remotely defined
     51                        IDs.
     52                </para></listitem>
     53                </varlistentry>
     54
     55                <varlistentry>
    4156                <term>rangesize = numberofidsperdomain</term>
    4257                <listitem><para>
    43                         Defines the available number of uids/gids per domain. The
    44                         minimum needed value is 2000. SIDs with RIDs larger than this
    45                         value cannot be mapped, are ignored and the corresponding map
    46                         is discarded. Choose this value carefully, as this should
    47                         not be changed after the first ranges for domains have been
    48                         defined, otherwise mappings between domains will get intermixed
    49                         leading to unpredictable results. Please note that RIDs in Windows
    50                         Domains usually start with 500 for builtin users and 1000
    51                         for regular users. As the parameter cannot be changed later, please
    52                         plan accordingly for your expected number of users in a domain
    53                         with safety margins.
     58                        Defines the number of uids/gids available per
     59                        domain range. The minimum needed value is 2000.
     60                        SIDs with RIDs larger than this value will be mapped
     61                        into extension ranges depending upon number of available
     62                        ranges. If the autorid backend runs out of available
     63                        ranges, mapping requests for new domains (or new
     64                        extension ranges for domains already known) are ignored
     65                        and the corresponding map is discarded.
    5466                        </para>
    55                         <para>One range will be used for local users and groups.
     67                        <para>
     68                        Example: with rangesize set to 10000, users/groups with
     69                        a RID up to 10000 will be put into the first range for the
     70                        domain. When attempting to map the an object with a RID
     71                        of 25000, an extension range will be allocated that
     72                        will then be used to map all RIDs from 20000-29999.
     73                        </para>
     74                        <para>One range will be used for local users and groups and for
     75                        non-domain well-known SIDs like Everyone (S-1-1-0) or Creator Owner (S-1-3-0).
     76                        A chosen list of well-known SIDs will be preallocated on first start
     77                        to create deterministic mappings for those.</para>
     78                        <para>
    5679                        Thus the number of local users and groups that can be created is
    5780                        limited by this option as well. If you plan to create a large amount
    … …  
    5982                        </para>
    6083                <para>The default value is 100000.</para>
     84                </listitem>
     85                </varlistentry>
     86                <varlistentry>
     87                <term>read only = [ yes | no ]</term>
     88                <listitem><para>Turn the module into read-only mode. No new ranges will be allocated
     89                        nor will new mappings be created in the idmap pool. Defaults to no.</para>
     90                </listitem>
     91                </varlistentry>
     92                <varlistentry>
     93                <term>ignore builtin = [ yes | no ]</term>
     94                <listitem><para>Ignore any mapping requests for the BUILTIN domain.
     95                        Defaults to no.</para>
    6196                </listitem>
    6297                </varlistentry>
    … …  
    69104                The Unix ID for a RID is calculated this way:
    70105                <programlisting>
    71                         ID = IDMAP UID LOW VALUE + DOMAINRANGENUMBER * RANGESIZE + RID
     106                        ID =  REDUCED RID + IDMAP RANGE LOW VALUE + RANGE NUMBER * RANGE SIZE
    72107                </programlisting>
     108                where REDUCED RID = RID % RANGE_SIZE
     109                and a DOMAIN RANGE INDEX = RID / RANGE_SIZE is used together with the
     110                domain sid to determine the RANGE NUMBER (stored in the database).
    73111        </para>
    74112        <para>
    … …  
    76114                given Unix ID is this:
    77115                <programlisting>
    78                         RID = ID - IDMAP UID LOW VALUE - DOMAINRANGENUMBER * RANGESIZE
     116                        RID = (ID - LOW ID) % RANGE SIZE + DOMAIN RANGE INDEX * RANGE SIZE
    79117                </programlisting>
     118                Where the DOMAIN RANGE INDEX is retrieved from the database along with the
     119                domain sid by the RANGE NUMBER = (ID - LOW ID) / RANGE SIZE .
    80120        </para>
    81121</refsect1>
    … …  
    85125        <para>
    86126                This example shows you the minimal configuration that will
    87                 work for the principial domain and 19 trusted domains.
     127                work for the principal domain and 19 trusted domains / range
     128                extensions.
    88129        </para>
    89130

  • vendor/current/docs-xml/manpages/idmap_hash.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/idmap_ldap.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/idmap_nss.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/idmap_rid.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2929        domain that should use the idmap_rid backend, using disjoint ranges.
    3030        One usually needs to define a writeable default idmap range, using
    31         a backent like <parameter>tdb</parameter> or <parameter>ldap</parameter>
     31        a backend like <parameter>tdb</parameter> or <parameter>ldap</parameter>
    3232        that can create unix ids, in order to be able to map the BUILTIN sids
    3333        and other domains, and also in order to be able to create group mappings.
    … …  
    6666                        The default is not to restrict the allowed rids at all,
    6767                        i.e. a base_rid value of 0.
    68                         A good value for the base_rid can be 1000, since user
    69                         RIDs by default start at 1000 (512 hexadecimal).
    7068                </para>
    7169                <para>
    … …  
    115113        idmap config TRUSTED : backend  = rid
    116114        idmap config TRUSTED : range    = 50000 - 99999
    117         idmap config TRUSTED : base_rid = 1000
    118115        </programlisting>
    119116</refsect1>

  • vendor/current/docs-xml/manpages/idmap_tdb.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/idmap_tdb2.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/libsmbclient.7.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">7</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/lmhosts.5.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/log2pcap.1.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/net.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2323                <command>net</command>
    2424                <arg choice="req">&lt;ads|rap|rpc&gt;</arg>
    25                 <arg choice="opt">-h</arg>
    26                 <arg choice="opt">-w workgroup</arg>
    27                 <arg choice="opt">-W myworkgroup</arg>
    28                 <arg choice="opt">-U user</arg>
    29                 <arg choice="opt">-I ip-address</arg>
    30                 <arg choice="opt">-p port</arg>
     25                <arg choice="opt">-h|--help</arg>
     26                <arg choice="opt">-w|--workgroup workgroup</arg>
     27                <arg choice="opt">-W|--myworkgroup myworkgroup</arg>
     28                <arg choice="opt">-U|--user user</arg>
     29                <arg choice="opt">-I|--ipaddress ip-address</arg>
     30                <arg choice="opt">-p|--port port</arg>
    3131                <arg choice="opt">-n myname</arg>
    3232                <arg choice="opt">-s conffile</arg>
    33                 <arg choice="opt">-S server</arg>
    34                 <arg choice="opt">-l</arg>
    35                 <arg choice="opt">-P</arg>
     33                <arg choice="opt">-S|--server server</arg>
     34                <arg choice="opt">-l|--long</arg>
     35                <arg choice="opt">-v|--verbose</arg>
     36                <arg choice="opt">-f|--force</arg>
     37                <arg choice="opt">-P|--machine-pass</arg>
    3638                <arg choice="opt">-d debuglevel</arg>
    3739                <arg choice="opt">-V</arg>
    3840                <arg choice="opt">--request-timeout seconds</arg>
     41                <arg choice="opt">-t|--timeout seconds</arg>
     42                <arg choice="opt">-i|--stdin</arg>
     43                <arg choice="opt">--tallocreport</arg>
    3944        </cmdsynopsis>
    4045</refsynopsisdiv>
    … …  
    6570               
    6671                <varlistentry>
    67                 <term>-w target-workgroup</term>
     72                <term>-w|--workgroup target-workgroup</term>
    6873                <listitem><para>
    6974                Sets target workgroup or domain. You have to specify
    … …  
    7378
    7479                <varlistentry>
    75                 <term>-W workgroup</term>
     80                <term>-W|--myworkgroup workgroup</term>
    7681                <listitem><para>
    7782                Sets client workgroup or domain
    … …  
    8085
    8186                <varlistentry>
    82                 <term>-U user</term>
     87                <term>-U|--user user</term>
    8388                <listitem><para>
    8489                User name to use
    … …  
    8792
    8893                <varlistentry>
    89                 <term>-I ip-address</term>
     94                <term>-I|--ipaddress ip-address</term>
    9095                <listitem><para>
    9196                IP address of target server to use. You have to
    … …  
    96101
    97102                <varlistentry>
    98                 <term>-p port</term>
     103                <term>-p|--port port</term>
    99104                <listitem><para>
    100105                Port on the target server to connect to (usually 139 or 445).
    … …  
    107112
    108113                <varlistentry>
    109                 <term>-S server</term>
     114                <term>-S|--server server</term>
    110115                <listitem><para>
    111116                Name of target server. You should specify either
    … …  
    115120
    116121                <varlistentry>
    117                 <term>-l</term>
     122                <term>-l|--long</term>
    118123                <listitem><para>
    119124                When listing data, give more information on each item.
    … …  
    122127
    123128                <varlistentry>
    124                 <term>-P</term>
     129                <term>-v|--verbose</term>
     130                <listitem><para>
     131                When listing data, give more verbose information on each item.
     132                </para></listitem>
     133                </varlistentry>
     134
     135                <varlistentry>
     136                <term>-f|--force</term>
     137                <listitem><para>
     138                                Enforcing a net command.
     139                </para></listitem>
     140                </varlistentry>
     141
     142                <varlistentry>
     143                <term>-P|--machine-pass</term>
    125144                <listitem><para>
    126145                Make queries to the external server using the machine account of the local server.
    … …  
    136155                </varlistentry>
    137156
    138                 &stdarg.server.debug;
     157                <varlistentry>
     158                <term>-t|--timeout 30</term>
     159                <listitem><para>
     160                                Set timeout for client operations to 30 seconds.
     161                </para></listitem>
     162                </varlistentry>
     163
     164                <varlistentry>
     165                <term>--use-ccache</term>
     166                <listitem><para>
     167                Try to use the credentials cached by winbind.
     168                </para></listitem>
     169                </varlistentry>
     170
     171                <varlistentry>
     172                <term>-i|--stdin</term>
     173                <listitem><para>
     174                                Take input for net commands from standard input.
     175                </para></listitem>
     176                </varlistentry>
     177
     178                <varlistentry>
     179                <term>--tallocreport</term>
     180                <listitem><para>
     181                                Generate a talloc report while processing a net
     182                                command.
     183                </para></listitem>
     184                </varlistentry>
     185
     186                <varlistentry>
     187                <term>-T|--test</term>
     188                <listitem><para>Only test command sequence, dry-run.
     189                </para></listitem>
     190                </varlistentry>
     191
     192                <varlistentry>
     193                <term>-F|--flags FLAGS</term>
     194                <listitem><para>Pass down integer flags to a net subcommand.
     195                </para></listitem>
     196                </varlistentry>
     197
     198                <varlistentry>
     199                <term>-C|--comment COMMENT</term>
     200                <listitem><para>Pass down a comment string to a net subcommand.
     201                </para></listitem>
     202                </varlistentry>
     203
     204                <varlistentry>
     205                <term>-n|--myname MYNAME</term>
     206                <listitem><para>Use MYNAME as a requester name for a net subcommand.
     207                </para></listitem>
     208                </varlistentry>
     209
     210                <varlistentry>
     211                <term>-c|--container CONTAINER</term>
     212                <listitem><para>Use a specific AD container for net ads operations.
     213                </para></listitem>
     214                </varlistentry>
     215
     216                <varlistentry>
     217                <term>-M|--maxusers MAXUSERS</term>
     218                <listitem><para>Fill in the maxusers field in net rpc share operations.
     219                </para></listitem>
     220                </varlistentry>
     221
     222                <varlistentry>
     223                <term>-r|--reboot</term>
     224                <listitem><para>Reboot a remote machine after a command has been successfully executed (e.g. in remote join operations).
     225                </para></listitem>
     226                </varlistentry>
     227
     228                <!-- Options for net rpc vampire -->
     229
     230                <varlistentry>
     231                <term>--force-full-repl</term>
     232                <listitem><para>
     233                                When calling "net rpc vampire keytab" this option
     234                                enforces a full re-creation of the generated keytab file.
     235                </para></listitem>
     236                </varlistentry>
     237
     238                <varlistentry>
     239                <term>--single-obj-repl</term>
     240                <listitem><para>
     241                                When calling "net rpc vampire keytab" this option
     242                                allows one to replicate just a single object to the generated keytab file.
     243                </para></listitem>
     244                </varlistentry>
     245
     246                <varlistentry>
     247                <term>--clean-old-entries</term>
     248                <listitem><para>
     249                                When calling "net rpc vampire keytab" this option
     250                                allows one to cleanup old entries from the generated keytab file.
     251                </para></listitem>
     252                </varlistentry>
     253
     254                <!-- Options for net idmap -->
     255
     256                <varlistentry>
     257                <term>--db</term>
     258                <listitem><para>Define dbfile for "net idmap" commands.
     259                </para></listitem>
     260                </varlistentry>
     261
     262                <varlistentry>
     263                <term>--lock</term>
     264                <listitem><para>Activates locking of the dbfile for "net idmap check" command.
     265                </para></listitem>
     266                </varlistentry>
     267
     268                <varlistentry>
     269                <term>-a|--auto</term>
     270                <listitem><para>Activates noninteractive mode in "net idmap check".
     271                </para></listitem>
     272                </varlistentry>
     273
     274                <varlistentry>
     275                <term>--repair</term>
     276                <listitem><para>Activates repair mode in "net idmap check".
     277                </para></listitem>
     278                </varlistentry>
     279
     280                <!-- Options for net rpc share migrate -->
     281
     282                <varlistentry>
     283                <term>--acls</term>
     284                <listitem><para>Includes ACLs to be copied in "net rpc share migrate".
     285                </para></listitem>
     286                </varlistentry>
     287
     288                <varlistentry>
     289                <term>--attrs</term>
     290                <listitem><para>Includes file attributes to be copied in "net rpc share migrate".
     291                </para></listitem>
     292                </varlistentry>
     293
     294                <varlistentry>
     295                <term>--timestamps</term>
     296                <listitem><para>Includes timestamps to be copied in "net rpc share migrate".
     297                </para></listitem>
     298                </varlistentry>
     299
     300                <varlistentry>
     301                <term>-X|--exclude DIRECTORY</term>
     302                <listitem><para>Allows one to exclude directories when copying with "net rpc share migrate".
     303                </para></listitem>
     304                </varlistentry>
     305
     306                <varlistentry>
     307                <term>--destination SERVERNAME</term>
     308                <listitem><para>Defines the target servername of migration process (defaults to localhost).
     309                </para></listitem>
     310                </varlistentry>
     311
     312                <!-- Options for net groupmap set -->
     313
     314                <varlistentry>
     315                <term>-L|--local</term>
     316                <listitem><para>Sets the type of group mapping to local
     317                                (used in "net groupmap set").
     318                </para></listitem>
     319                </varlistentry>
     320
     321                <varlistentry>
     322                <term>-D|--domain</term>
     323                <listitem><para>Sets the type of group mapping to domain
     324                                (used in "net groupmap set").
     325                </para></listitem>
     326                </varlistentry>
     327
     328                <varlistentry>
     329                <term>-N|--ntname NTNAME</term>
     330                <listitem><para>Sets the ntname of a group mapping
     331                                (used in "net groupmap set").
     332                </para></listitem>
     333                </varlistentry>
     334
     335                <varlistentry>
     336                <term>-R|--rid RID</term>
     337                <listitem><para>Sets the rid of a group mapping
     338                                (used in "net groupmap set").
     339                </para></listitem>
     340                </varlistentry>
     341
     342                <!-- Options for net registry check -->
     343
     344                <varlistentry>
     345                <term>--reg-version REG_VERSION</term>
     346                <listitem><para>Assume database version {n|1,2,3}
     347                                (used in "net registry check").
     348                </para></listitem>
     349                </varlistentry>
     350
     351                <varlistentry>
     352                <term>-o|--output FILENAME</term>
     353                <listitem><para>Output database file
     354                                (used in "net registry check").
     355                </para></listitem>
     356                </varlistentry>
     357
     358                <varlistentry>
     359                <term>--wipe</term>
     360                <listitem><para>Create a new database from scratch
     361                                (used in "net registry check").
     362                </para></listitem>
     363                </varlistentry>
     364
     365                <!-- Options for net registry import -->
     366
     367                <varlistentry>
     368                <term>--precheck PRECHECK_DB_FILENAME</term>
     369                <listitem><para>Defines filename for database prechecking
     370                                (used in "net registry import").
     371                </para></listitem>
     372                </varlistentry>
     373
     374                <varlistentry>
     375                <term>--no-dns-updates</term>
     376                <listitem><para>Do not perform DNS updates as part of
     377                "net ads join".
     378                </para></listitem>
     379                </varlistentry>
     380
     381                &stdarg.encrypt;
     382                &popt.common.samba.client;
     383
    139384        </variablelist>
    140385</refsect1>
    … …  
    167412
    168413<para>Without any options, the <command>NET TIME</command> command
    169 displays the time on the remote server.
     414displays the time on the remote server. The remote server must be
     415specified with the -S option.
    170416</para>
    171417
    … …  
    175421<title>TIME SYSTEM</title>
    176422
    177 <para>Displays the time on the remote server in a format ready for <command>/bin/date</command>.</para>
     423<para>Displays the time on the remote server in a format ready for <command>/bin/date</command>.
     424The remote server must be specified with the -S option.
     425</para>
    178426
    179427</refsect3>
    … …  
    182430<title>TIME SET</title>
    183431<para>Tries to set the date and time of the local server to that on
    184 the remote server using <command>/bin/date</command>. </para>
     432the remote server using <command>/bin/date</command>.
     433The remote server must be specified with the -S option.
     434</para>
    185435
    186436</refsect3>
    … …  
    189439<title>TIME ZONE</title>
    190440
    191 <para>Displays the timezone in hours from GMT on the remote computer.</para>
    192 
    193 </refsect3>
    194 </refsect2>
    195 
    196 <refsect2>
    197 <title>[RPC|ADS] JOIN [TYPE] [-U username[%password]] [createupn=UPN] [createcomputer=OU] [options]</title>
     441<para>Displays the timezone in hours from GMT on the remote server.
     442The remote server must be specified with the -S option.
     443</para>
     444
     445</refsect3>
     446</refsect2>
     447
     448<refsect2>
     449<title>[RPC|ADS] JOIN [TYPE] [--no-dns-updates] [-U username[%password]]
     450[createupn=UPN] [createcomputer=OU] [machinepass=PASS]
     451[osName=string osVer=string] [options]</title>
    198452
    199453<para>
    … …  
    220474and ldap, so it may need to be doubled or quadrupled to pass through,
    221475and it is not used as a delimiter.
     476</para>
     477<para>
     478[PASS] (ADS only) Set a specific password on the computer account
     479being created by the join.
     480</para>
     481<para>
     482[osName=string osVer=String] (ADS only) Set the operatingSystem and
     483operatingSystemVersion attribute during the join.  Both parameters
     484must be specified for either to take effect.
    222485</para>
    223486</refsect2>
    … …  
    687950<title>GROUPMAP MODIFY</title>
    688951
    689 <para>Update en existing group entry.</para>
     952<para>Update an existing group entry.</para>
    690953
    691954<para>
    … …  
    7971060
    7981061</refsect3>
    799 <refsect3>
    800 <title>RPC TRUSTDOM LIST</title>
    801 
    802 <para>List all interdomain trust relationships.</para>
    803 
    804 </refsect3>
    8051062</refsect2>
    8061063
    … …  
    8111068<title>RPC TRUST CREATE</title>
    8121069
    813 <para>Create a trust trust object by calling lsaCreateTrustedDomainEx2.
     1070<para>Create a trust object by calling lsaCreateTrustedDomainEx2.
    8141071The can be done on a single server or on two servers at once with the
    8151072possibility to use a random trust password.</para>
    … …  
    8741131<title>RPC TRUST DELETE</title>
    8751132
    876 <para>Delete a trust trust object by calling lsaDeleteTrustedDomain.
     1133<para>Delete a trust object by calling lsaDeleteTrustedDomain.
    8771134The can be done on a single server or on two servers at once.</para>
    8781135
    … …  
    9881245<para>Export users, aliases and groups from remote server to
    9891246local server.  You need to run this against the PDC, from a Samba machine joined as a BDC.
     1247This vampire command cannot be used against an Active Directory, only
     1248against an NT4 Domain Controller.
    9901249</para>
    9911250</refsect2>
    … …  
    10871346
    10881347</refsect2>
     1348
     1349<refsect2>
     1350        <title>ADS ENCTYPES</title>
     1351
     1352<para>
     1353        List, modify or delete the value of the "msDS-SupportedEncryptionTypes" attribute of an account in AD.
     1354</para>
     1355
     1356<para>
     1357        This attribute allows one to control which Kerberos encryption types are used for the generation of initial and service tickets. The value consists of an integer bitmask with the following values:
     1358</para>
     1359
     1360<para>0x00000001 DES-CBC-CRC</para>
     1361<para>0x00000002 DES-CBC-MD5</para>
     1362<para>0x00000004 RC4-HMAC</para>
     1363<para>0x00000008 AES128-CTS-HMAC-SHA1-96</para>
     1364<para>0x00000010 AES256-CTS-HMAC-SHA1-96</para>
     1365
     1366</refsect2>
     1367
     1368<refsect2>
     1369        <title>ADS ENCTYPES LIST <replaceable>&lt;ACCOUNTNAME&gt;</replaceable></title>
     1370
     1371<para>
     1372        List the value of the "msDS-SupportedEncryptionTypes" attribute of a given account.
     1373</para>
     1374
     1375<para>Example: <userinput>net ads enctypes list Computername</userinput></para>
     1376
     1377</refsect2>
     1378
     1379<refsect2>
     1380        <title>ADS ENCTYPES SET <replaceable>&lt;ACCOUNTNAME&gt;</replaceable> <replaceable>[enctypes]</replaceable></title>
     1381
     1382<para>
     1383        Set the value of the "msDS-SupportedEncryptionTypes" attribute of the LDAP object of ACCOUNTNAME to a given value. If the value is omitted, the value is set to 31 which enables all the currently supported encryption types.
     1384</para>
     1385
     1386<para>Example: <userinput>net ads enctypes set Computername 24</userinput></para>
     1387
     1388</refsect2>
     1389
     1390<refsect2>
     1391        <title>ADS ENCTYPES DELETE <replaceable>&lt;ACCOUNTNAME&gt;</replaceable></title>
     1392
     1393<para>
     1394        Deletes the "msDS-SupportedEncryptionTypes" attribute of the LDAP object of ACCOUNTNAME.
     1395</para>
     1396
     1397<para>Example: <userinput>net ads enctypes set Computername 24</userinput></para>
     1398
     1399</refsect2>
     1400
    10891401
    10901402<refsect2>
    … …  
    13891701
    13901702<refsect2>
    1391 <title>IDMAP SECRET &lt;DOMAIN&gt; &lt;secret&gt;</title>
     1703<title>IDMAP SET SECRET &lt;DOMAIN&gt; &lt;secret&gt;</title>
    13921704
    13931705<para>
    … …  
    14001712
    14011713<refsect2>
    1402 
    1403 <title>IDMAP DELETE [-f] [--db=&lt;DB&gt;] &lt;ID&gt;</title>
     1714<title>IDMAP SET RANGE &lt;RANGE&gt; &lt;SID&gt; [index] [--db=&lt;DB&gt;]</title>
     1715
     1716<para>
     1717Store a domain-range mapping for a given domain (and index) in autorid database.
     1718</para>
     1719
     1720</refsect2>
     1721
     1722<refsect2>
     1723<title>IDMAP SET CONFIG &lt;config&gt; [--db=&lt;DB&gt;]</title>
     1724
     1725<para>
     1726Update CONFIG entry in autorid database.
     1727</para>
     1728
     1729</refsect2>
     1730
     1731<refsect2>
     1732<title>IDMAP GET RANGE &lt;SID&gt; [index] [--db=&lt;DB&gt;]</title>
     1733
     1734<para>
     1735Get the range for a given domain and index from autorid database.
     1736</para>
     1737
     1738</refsect2>
     1739
     1740<refsect2>
     1741<title>IDMAP GET RANGES [&lt;SID&gt;] [--db=&lt;DB&gt;]</title>
     1742
     1743<para>
     1744Get ranges for all domains or for one identified by given SID.
     1745</para>
     1746
     1747</refsect2>
     1748
     1749<refsect2>
     1750<title>IDMAP GET CONFIG [--db=&lt;DB&gt;]</title>
     1751
     1752<para>
     1753Get CONFIG entry from autorid database.
     1754</para>
     1755
     1756</refsect2>
     1757
     1758<refsect2>
     1759
     1760<title>IDMAP DELETE MAPPING [-f] [--db=&lt;DB&gt;] &lt;ID&gt;</title>
    14041761
    14051762<para>
    … …  
    14131770  <manvolnum>1</manvolnum></citerefentry> manpage for details.
    14141771</para>
     1772</refsect2>
     1773
     1774<refsect2>
     1775<title>IDMAP DELETE RANGE [-f] [--db=&lt;TDB&gt;] &lt;RANGE&gt;|(&lt;SID&gt; [&lt;INDEX&gt;])</title>
     1776
     1777<para>
     1778Delete a domain range mapping identified by 'RANGE' or "domain SID and INDEX" from autorid database.
     1779Use -f to delete invalid mappings.
     1780</para>
     1781
     1782</refsect2>
     1783
     1784<refsect2>
     1785<title>IDMAP DELETE RANGES [-f] [--db=&lt;TDB&gt;] &lt;SID&gt;</title>
     1786
     1787<para>
     1788Delete all domain range mappings for a domain identified by SID.
     1789Use -f to delete invalid mappings.
     1790</para>
     1791
    14151792</refsect2>
    14161793
    … …  
    16642041
    16652042<refsect2>
    1666 <title>CONF</title>
     2043<title>[RPC] CONF</title>
    16672044
    16682045<para>Starting with version 3.2.0, a Samba server can be configured by data
    16692046stored in registry. This configuration data can be edited with the new "net
    1670 conf" commands.
     2047conf" commands. There is also the possibility to configure a remote Samba server
     2048by enabling the RPC conf mode and specifying the address of the remote server.
    16712049</para>
    16722050
    … …  
    16862064<para>The conf commands are:
    16872065<simplelist>
    1688 <member>net conf list - Dump the complete configuration in smb.conf like
     2066<member>net [rpc] conf list - Dump the complete configuration in smb.conf like
    16892067format.</member>
    1690 <member>net conf import - Import configuration from file in smb.conf
     2068<member>net [rpc] conf import - Import configuration from file in smb.conf
    16912069format.</member>
    1692 <member>net conf listshares - List the registry shares.</member>
    1693 <member>net conf drop - Delete the complete configuration from
     2070<member>net [rpc] conf listshares - List the registry shares.</member>
     2071<member>net [rpc] conf drop - Delete the complete configuration from
    16942072registry.</member>
    1695 <member>net conf showshare - Show the definition of a registry share.</member>
    1696 <member>net conf addshare - Create a new registry share.</member>
    1697 <member>net conf delshare - Delete a registry share.</member>
    1698 <member>net conf setparm - Store a parameter.</member>
    1699 <member>net conf getparm - Retrieve the value of a parameter.</member>
    1700 <member>net conf delparm - Delete a parameter.</member>
    1701 <member>net conf getincludes - Show the includes of a share definition.</member>
    1702 <member>net conf setincludes - Set includes for a share.</member>
    1703 <member>net conf delincludes - Delete includes from a share definition.</member>
     2073<member>net [rpc] conf showshare - Show the definition of a registry share.</member>
     2074<member>net [rpc] conf addshare - Create a new registry share.</member>
     2075<member>net [rpc] conf delshare - Delete a registry share.</member>
     2076<member>net [rpc] conf setparm - Store a parameter.</member>
     2077<member>net [rpc] conf getparm - Retrieve the value of a parameter.</member>
     2078<member>net [rpc] conf delparm - Delete a parameter.</member>
     2079<member>net [rpc] conf getincludes - Show the includes of a share definition.</member>
     2080<member>net [rpc] conf setincludes - Set includes for a share.</member>
     2081<member>net [rpc] conf delincludes - Delete includes from a share definition.</member>
    17042082</simplelist>
    17052083</para>
    17062084
    17072085<refsect3>
    1708 <title>CONF LIST</title>
     2086<title>[RPC] CONF LIST</title>
    17092087
    17102088<para>
    … …  
    17152093
    17162094<refsect3>
    1717 <title>CONF IMPORT <replaceable>[--test|-T]</replaceable> <replaceable>filename</replaceable> <replaceable>[section]</replaceable></title>
     2095<title>[RPC] CONF IMPORT <replaceable>[--test|-T]</replaceable> <replaceable>filename</replaceable> <replaceable>[section]</replaceable></title>
    17182096
    17192097<para>
    … …  
    17312109
    17322110<refsect3>
    1733 <title>CONF LISTSHARES</title>
     2111<title>[RPC] CONF LISTSHARES</title>
    17342112
    17352113<para>
    … …  
    17392117
    17402118<refsect3>
    1741 <title>CONF DROP</title>
     2119<title>[RPC] CONF DROP</title>
    17422120
    17432121<para>
    … …  
    17472125
    17482126<refsect3>
    1749 <title>CONF SHOWSHARE <replaceable>sharename</replaceable></title>
     2127<title>[RPC] CONF SHOWSHARE <replaceable>sharename</replaceable></title>
    17502128
    17512129<para>
    … …  
    17572135
    17582136<refsect3>
    1759 <title>CONF ADDSHARE <replaceable>sharename</replaceable> <replaceable>path</replaceable> [<replaceable>writeable={y|N}</replaceable> [<replaceable>guest_ok={y|N}</replaceable> [<replaceable>comment</replaceable>]]] </title>
     2137<title>[RPC] CONF ADDSHARE <replaceable>sharename</replaceable> <replaceable>path</replaceable> [<replaceable>writeable={y|N}</replaceable> [<replaceable>guest_ok={y|N}</replaceable> [<replaceable>comment</replaceable>]]] </title>
    17602138
    17612139<para>Create a new share definition in registry.
    … …  
    17692147
    17702148<refsect3>
    1771 <title>CONF DELSHARE <replaceable>sharename</replaceable></title>
     2149<title>[RPC] CONF DELSHARE <replaceable>sharename</replaceable></title>
    17722150
    17732151<para>
    … …  
    17772155
    17782156<refsect3>
    1779 <title>CONF SETPARM <replaceable>section</replaceable> <replaceable>parameter</replaceable> <replaceable>value</replaceable></title>
     2157<title>[RPC] CONF SETPARM <replaceable>section</replaceable> <replaceable>parameter</replaceable> <replaceable>value</replaceable></title>
    17802158
    17812159<para>
    … …  
    17862164
    17872165<refsect3>
    1788 <title>CONF GETPARM <replaceable>section</replaceable> <replaceable>parameter</replaceable></title>
     2166<title>[RPC] CONF GETPARM <replaceable>section</replaceable> <replaceable>parameter</replaceable></title>
    17892167
    17902168<para>
    … …  
    17942172
    17952173<refsect3>
    1796 <title>CONF DELPARM <replaceable>section</replaceable> <replaceable>parameter</replaceable></title>
     2174<title>[RPC] CONF DELPARM <replaceable>section</replaceable> <replaceable>parameter</replaceable></title>
    17972175
    17982176<para>
    … …  
    18022180
    18032181<refsect3>
    1804 <title>CONF GETINCLUDES <replaceable>section</replaceable></title>
     2182<title>[RPC] CONF GETINCLUDES <replaceable>section</replaceable></title>
    18052183
    18062184<para>
    … …  
    18282206
    18292207<refsect3>
    1830 <title>CONF SETINCLUDES <replaceable>section</replaceable> [<replaceable>filename</replaceable>]+</title>
     2208<title>[RPC] CONF SETINCLUDES <replaceable>section</replaceable> [<replaceable>filename</replaceable>]+</title>
    18312209
    18322210<para>
    … …  
    18382216
    18392217<refsect3>
    1840 <title>CONF DELINCLUDES <replaceable>section</replaceable></title>
     2218<title>[RPC] CONF DELINCLUDES <replaceable>section</replaceable></title>
    18412219
    18422220<para>
    … …  
    18772255<member>net registry convert     - Convert a registration entries (.reg) file.
    18782256</member>
     2257<member>net registry check       - Check and repair a registry database.
     2258</member>
    18792259</simplelist>
    18802260</para>
    … …  
    19922372<refsect3>
    19932373  <title>REGISTRY IMPORT <replaceable>file</replaceable><!--
    1994   --><replaceable>[opt]</replaceable></title>
    1995 
    1996   <para>Import a registration entries (.reg) <emphasis>file</emphasis>.
    1997   </para>
     2374  --><replaceable> [--precheck &lt;check-file&gt;] [opt]</replaceable></title>
     2375  <para>Import a registration entries (.reg) <emphasis>file</emphasis>.</para>
     2376  <para>The following options are available:</para>
     2377  <variablelist>
     2378    <varlistentry><term>--precheck <replaceable>check-file</replaceable></term>
     2379    <listitem><para>
     2380      This is a mechanism to check the existence or non-existence of
     2381      certain keys or values specified in a precheck file before applying
     2382      the import file.
     2383      The import file will only be applied if the precheck succeeds.
     2384    </para>
     2385    <para>
     2386      The check-file follows the normal registry file syntax with the
     2387      following semantics:
     2388    </para>
     2389      <itemizedlist>
     2390        <listitem><para>&lt;value name&gt;=&lt;value&gt; checks whether the
     2391          value exists and has the given value.</para></listitem>
     2392        <listitem><para>&lt;value name&gt;=- checks whether the value does
     2393          not exist.</para></listitem>
     2394        <listitem><para>[key] checks whether the key exists.</para>
     2395        </listitem>
     2396        <listitem><para>[-key] checks whether the key does not exist.</para>
     2397        </listitem>
     2398      </itemizedlist>
     2399    </listitem>
     2400    </varlistentry>
     2401  </variablelist>
    19982402</refsect3>
    19992403
    … …  
    20172421</refsect3>
    20182422
     2423<refsect3>
     2424  <title>REGISTRY CHECK [-ravTl] [-o &lt;ODB&gt;] [--wipe] [&lt;DB&gt;]</title>
     2425  <para>Check and repair the registry database. If no option is given a read only check of the database is done. Among others an interactive or automatic repair mode may be chosen with one of the following options
     2426
     2427  <variablelist>
     2428    <varlistentry><term>-r|--repair</term>
     2429    <listitem><para>
     2430      Interactive repair mode, ask a lot of questions.
     2431    </para></listitem>
     2432    </varlistentry>
     2433
     2434    <varlistentry><term>-a|--auto</term>
     2435    <listitem><para>
     2436      Noninteractive repair mode, use default answers.
     2437    </para></listitem>
     2438    </varlistentry>
     2439
     2440    <varlistentry><term>-v|--verbose</term>
     2441      <listitem><para>
     2442        Produce more output.
     2443      </para></listitem>
     2444    </varlistentry>
     2445
     2446    <varlistentry><term>-T|--test</term>
     2447      <listitem><para>
     2448        Dry run, show what changes would be made but don't touch anything.
     2449      </para></listitem>
     2450    </varlistentry>
     2451
     2452    <varlistentry><term>-l|--lock</term>
     2453      <listitem><para>
     2454        Lock the database while doing the check.
     2455      </para></listitem>
     2456    </varlistentry>
     2457
     2458   <varlistentry><term>--reg-version={1,2,3}</term>
     2459      <listitem><para>
     2460        Specify the format of the registry database. If not given it defaults to
     2461        the value of the binary or, if an registry.tdb is explizitly stated at
     2462        the commandline, to the value found in the INFO/version record.
     2463      </para></listitem>
     2464    </varlistentry>
     2465
     2466    <varlistentry><term>[--db] &lt;DB&gt;</term>
     2467      <listitem><para>
     2468        Check the specified database.
     2469      </para></listitem>
     2470    </varlistentry>
     2471
     2472    <varlistentry><term>-o|--output &lt;ODB&gt;</term>
     2473      <listitem><para>
     2474        Create a new registry database &lt;ODB&gt; instead of modifying the
     2475        input. If &lt;ODB&gt; is already existing --wipe may be used to
     2476        overwrite it.
     2477      </para></listitem>
     2478    </varlistentry>
     2479
     2480   <varlistentry><term>--wipe</term>
     2481      <listitem><para>
     2482        Replace the registry database instead of modifying the input or
     2483        overwrite an existing output database.
     2484      </para></listitem>
     2485    </varlistentry>
     2486
     2487    <varlistentry><term></term>
     2488      <listitem><para>
     2489      </para></listitem>
     2490    </varlistentry>
     2491  </variablelist>
     2492  </para>
     2493</refsect3>
    20192494
    20202495</refsect2>

  • vendor/current/docs-xml/manpages/nmbd.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2121        <cmdsynopsis>
    2222                <command>nmbd</command>
    23                 <arg choice="opt">-D</arg>
    24                 <arg choice="opt">-F</arg>
    25                 <arg choice="opt">-S</arg>
    26                 <arg choice="opt">-a</arg>
    27                 <arg choice="opt">-i</arg>
    28                 <arg choice="opt">-o</arg>
    29                 <arg choice="opt">-h</arg>
     23                <arg choice="opt">-D|--daemon</arg>
     24                <arg choice="opt">-F|--foreground</arg>
     25                <arg choice="opt">-S|--log-stdout</arg>
     26                <arg choice="opt">-i|--interactive</arg>
    3027                <arg choice="opt">-V</arg>
    3128                <arg choice="opt">-d &lt;debug level&gt;</arg>
    32                 <arg choice="opt">-H &lt;lmhosts file&gt;</arg>
     29                <arg choice="opt">-H|--hosts &lt;lmhosts file&gt;</arg>
    3330                <arg choice="opt">-l &lt;log directory&gt;</arg>
    34                 <arg choice="opt">-p &lt;port number&gt;</arg>
     31                <arg choice="opt">-p|--port &lt;port number&gt;</arg>
    3532                <arg choice="opt">-s &lt;configuration file&gt;</arg>
     33                <arg choice="opt">--no-process-group</arg>
    3634        </cmdsynopsis>
    3735</refsynopsisdiv>
    … …  
    8280        <variablelist>
    8381                <varlistentry>
    84                 <term>-D</term>
     82                <term>-D|--daemon</term>
    8583                <listitem><para>If specified, this parameter causes
    8684                <command>nmbd</command> to operate as a daemon. That is,
    … …  
    9492
    9593                <varlistentry>
    96                 <term>-F</term>
     94                <term>-F|--foreground</term>
    9795                <listitem><para>If specified, this parameter causes
    9896                the main <command>nmbd</command> process to not daemonize,
    … …  
    109107
    110108                <varlistentry>
    111                 <term>-S</term>
     109                <term>-S|--log-stdout</term>
    112110                <listitem><para>If specified, this parameter causes
    113111                <command>nmbd</command> to log to standard output rather
    … …  
    116114
    117115                <varlistentry>
    118                 <term>-i</term>
     116                <term>-i|--interactive</term>
    119117                <listitem><para>If this parameter is specified it causes the
    120118                server to run "interactively", not as a daemon, even if the
    … …  
    126124                </varlistentry>
    127125
    128                 &stdarg.help;
     126                &popt.autohelp;
    129127               
    130128                <varlistentry>
    131                 <term>-H &lt;filename&gt;</term>
     129                <term>-H|--hosts &lt;filename&gt;</term>
    132130                <listitem><para>NetBIOS lmhosts file.  The lmhosts
    133131                file is a list of NetBIOS names to IP addresses that
    … …  
    153151               
    154152                <varlistentry>
    155                 <term>-p &lt;UDP port number&gt;</term>
     153                <term>-p|--port &lt;UDP port number&gt;</term>
    156154                <listitem><para>UDP port number is a positive integer value.
    157155                This option changes the default UDP port number (normally 137)
    … …  
    159157                use this option unless you are an expert, in which case you
    160158                won't need help!</para></listitem>
     159                </varlistentry>
     160
     161                <varlistentry>
     162                <term>--no-process-group</term>
     163                <listitem><para>Do not create a new process group for nmbd.
     164                </para></listitem>
    161165                </varlistentry>
    162166
    … …  
    267271        <manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
    268272        <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testparm</refentrytitle>
    269         <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testprns</refentrytitle>
    270273        <manvolnum>1</manvolnum></citerefentry>, and the Internet
    271274        RFC's <filename>rfc1001.txt</filename>, <filename>rfc1002.txt</filename>.

  • vendor/current/docs-xml/manpages/nmblookup.1.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2121        <cmdsynopsis>
    2222                <command>nmblookup</command>
    23                 <arg choice="opt">-M</arg>
    24                 <arg choice="opt">-R</arg>
    25                 <arg choice="opt">-S</arg>
    26                 <arg choice="opt">-r</arg>
    27                 <arg choice="opt">-A</arg>
    28                 <arg choice="opt">-h</arg>
    29                 <arg choice="opt">-B &lt;broadcast address&gt;</arg>
    30                 <arg choice="opt">-U &lt;unicast address&gt;</arg>
     23                <arg choice="opt">-M|--master-browser</arg>
     24                <arg choice="opt">-R|--recursion</arg>
     25                <arg choice="opt">-S|--status</arg>
     26                <arg choice="opt">-r|--root-port</arg>
     27                <arg choice="opt">-A|--lookup-by-ip</arg>
     28                <arg choice="opt">-B|--broadcast &lt;broadcast address&gt;</arg>
     29                <arg choice="opt">-U|--unicast &lt;unicast address&gt;</arg>
    3130                <arg choice="opt">-d &lt;debug level&gt;</arg>
    3231                <arg choice="opt">-s &lt;smb config file&gt;</arg>
    3332                <arg choice="opt">-i &lt;NetBIOS scope&gt;</arg>
    34                 <arg choice="opt">-T</arg>
    35                 <arg choice="opt">-f</arg>
     33                <arg choice="opt">-T|--translate</arg>
     34                <arg choice="opt">-f|--flags</arg>
    3635                <arg choice="req">name</arg>
    3736        </cmdsynopsis>
    … …  
    5655        <variablelist>
    5756                <varlistentry>
    58                 <term>-M</term>
    59                 <listitem><para>Searches for a master browser by looking 
    60                 up the  NetBIOS name <replaceable>name</replaceable> with a
     57                <term>-M|--master-browser</term>
     58                <listitem><para>Searches for a master browser by looking
     59                up the NetBIOS <replaceable>name</replaceable> with a
    6160                type of <constant>0x1d</constant>. If <replaceable>
    6261                name</replaceable> is "-" then it does a lookup on the special name
    … …  
    6867               
    6968                <varlistentry>
    70                 <term>-R</term>
     69                <term>-R|--recursion</term>
    7170                <listitem><para>Set the recursion desired bit in the packet
    7271                to do a recursive lookup. This is used when sending a name
    … …  
    7978               
    8079                <varlistentry>
    81                 <term>-S</term>
     80                <term>-S|--status</term>
    8281                <listitem><para>Once the name query has returned an IP
    8382                address then do a node status query as well. A node status
    … …  
    8887
    8988                <varlistentry>
    90                 <term>-r</term>
     89                <term>-r|--root-port</term>
    9190                <listitem><para>Try and bind to UDP port 137 to send and receive UDP
    9291                datagrams. The reason for this option is a bug in Windows 95
    … …  
    101100
    102101                <varlistentry>
    103                 <term>-A</term>
     102                <term>-A|--lookup-by-ip</term>
    104103                <listitem><para>Interpret <replaceable>name</replaceable> as
    105104                an IP Address and do a node status query on this address.</para>
    … …  
    110109
    111110                &popt.common.connection;
    112                 &stdarg.help;
    113 
    114                 <varlistentry>
    115                 <term>-B &lt;broadcast address&gt;</term>
     111                &popt.autohelp;
     112
     113                <varlistentry>
     114                <term>-B|--broadcast &lt;broadcast address&gt;</term>
    116115                <listitem><para>Send the query to the given broadcast address. Without
    117116                this option the default behavior of nmblookup is to send the
    … …  
    127126
    128127                <varlistentry>
    129                 <term>-U &lt;unicast address&gt;</term>
     128                <term>-U|--unicast &lt;unicast address&gt;</term>
    130129                <listitem><para>Do a unicast query to the specified address or
    131130                host <replaceable>unicast address</replaceable>. This option
    … …  
    138137
    139138                <varlistentry>
    140                 <term>-T</term>
     139                <term>-T|--translate</term>
    141140                <listitem><para>This causes any IP addresses found in the
    142141                lookup to be looked up via a reverse DNS lookup into a
    … …  
    149148
    150149                <varlistentry>
    151                 <term>-f</term>
     150                <term>-f|--flags</term>
    152151                <listitem><para>
    153152                Show which flags apply to the name that has been looked up. Possible

  • vendor/current/docs-xml/manpages/ntlm_auth.1.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2020        <cmdsynopsis>
    2121                <command>ntlm_auth</command>
    22                 <arg choice="opt">-d debuglevel</arg>
    23                 <arg choice="opt">-l logdir</arg>
    24                 <arg choice="opt">-s &lt;smb config file&gt;</arg>
    2522        </cmdsynopsis>
    2623</refsynopsisdiv>
    … …  
    364361        </varlistentry>
    365362
    366           &stdarg.server.debug;
    367           &popt.common.samba;
    368           &stdarg.help;
    369        
     363        <varlistentry>
     364        <term>--pam-winbind-conf=FILENAME</term>
     365        <listitem><para>Define the path to the pam_winbind.conf file.</para></listitem>
     366        </varlistentry>
     367
     368        <varlistentry>
     369        <term>--target-hostname=HOSTNAME</term>
     370        <listitem><para>Define the target hostname.</para></listitem>
     371        </varlistentry>
     372
     373        <varlistentry>
     374        <term>--target-service=SERVICE</term>
     375        <listitem><para>Define the target service.</para></listitem>
     376        </varlistentry>
     377
     378        <varlistentry>
     379        <term>--use-cached-creds</term>
     380        <listitem><para>Whether to use credentials cached by winbindd.</para></listitem>
     381        </varlistentry>
     382
     383        <varlistentry>
     384        <term>--offline-logon</term>
     385        <listitem><para>Allow offline logons for plain text auth.
     386        </para></listitem>
     387        </varlistentry>
     388
     389        <varlistentry>
     390        <term>--configfile=&lt;configuration file&gt;</term>
     391        <listitem><para>The file specified contains the
     392        configuration details required by the server.  The
     393        information in this file includes server-specific
     394        information such as what printcap file to use, as well
     395        as descriptions of all the services that the server is
     396        to provide. See &smb.conf; for more information.
     397        The default configuration file name is determined at
     398        compile time.</para></listitem>
     399        </varlistentry>
     400
     401        &stdarg.version;
     402        &popt.autohelp;
     403
    370404        </variablelist>
    371405</refsect1>

  • vendor/current/docs-xml/manpages/pam_winbind.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">8</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    8888                NAME may not contain any spaces. It is thus recommended to only use SIDs. You can verify the list of SIDs a
    8989                user is a member of with <command>wbinfo --user-sids=SID</command>.
    90                 </para></listitem>
     90                </para>
     91
     92                <para>
     93                This option must only be specified on a auth
     94                module declaration, as it only operates in conjunction
     95                with password authentication.
     96                </para>
     97                </listitem>
    9198                </varlistentry>
    9299
    … …  
    154161                <term>cached_login</term>
    155162                <listitem><para>
    156                 Winbind allows to logon using cached credentials when <parameter>winbind offline logon</parameter> is enabled. To use this feature from the PAM module this option must be set.
     163                Winbind allows one to logon using cached credentials when <parameter>winbind offline logon</parameter> is enabled. To use this feature from the PAM module this option must be set.
    157164                </para></listitem>
    158165                </varlistentry>

  • vendor/current/docs-xml/manpages/pam_winbind.conf.5.xml

    r414 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">5</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    7373                NAME may not contain any spaces. It is thus recommended to only use SIDs. You can verify the list of SIDs a
    7474                user is a member of with <command>wbinfo --user-sids=SID</command>. This setting is empty by default.
    75                 </para></listitem>
     75                </para>
     76                <para>This option only operates during password authentication, and will not restrict access if a password is not required for any reason (such as SSH key-based login).</para>
     77                </listitem>
    7678                </varlistentry>
    7779
    … …  
    110112                by enabling the <parameter>krb5_auth</parameter> option, it can
    111113                store the retrieved Ticket Granting Ticket (TGT) in a
    112                 credential cache. The type of credential cache can be set with
    113                 this option. Currently the only supported value is:
    114                 <parameter>FILE</parameter>. In that case a credential cache in
    115                 the form of /tmp/krb5cc_UID will be created, where UID is
    116                 replaced with the numeric user id.  Leave empty to just do
    117                 kerberos authentication without having a ticket cache after the
    118                 logon has succeeded. This setting is empty by default.
     114                credential cache. The type of credential cache can be
     115                controlled with this option.  The supported values are:
     116                <parameter>KEYRING</parameter> (when supported by the system's
     117                Kerberos library and Kernel), <parameter>FILE</parameter> and
     118                <parameter>DIR</parameter> (when the DIR type is supported by
     119                the system's Kerberos library). In case of FILE a credential
     120                cache in the form of /tmp/krb5cc_UID will be created -  in case
     121                of DIR you NEED to specify a directory. UID is replaced with
     122                the numeric user id.</para>
     123
     124                <para>When using the KEYRING type, the supported mechanism is
     125                <quote>KEYRING:persistent:UID</quote>, which uses the Linux
     126                kernel keyring to store credentials on a per-UID basis. This is
     127                the recommended choice on latest Linux distributions, as it is
     128                the most secure and predictable method.</para>
     129
     130                <para>It is also possible to define custom filepaths and use the "%u"
     131                pattern in order to substitue the numeric user id.
     132                Examples:</para>
     133
     134                <variablelist>
     135                        <varlistentry>
     136                                <term>krb5_ccache_type = DIR:/run/user/%u/krb5cc</term>
     137                                        <listitem><para>This will create a credential cache file in the specified directory.</para></listitem>
     138                        </varlistentry>
     139                        <varlistentry>
     140                                <term>krb5_ccache_type = FILE:/tmp/krb5cc_%u</term>
     141                                        <listitem><para>This will create a credential cache file.</para></listitem>
     142                        </varlistentry>
     143                </variablelist>
     144
     145                <para> Leave empty to just do kerberos authentication without
     146                        having a ticket cache after the logon has succeeded.
     147                        This setting is empty by default.
    119148
    120149                </para></listitem>
    … …  
    124153                <term>cached_login = yes|no</term>
    125154                <listitem><para>
    126                 Winbind allows to logon using cached credentials when <parameter>winbind offline logon</parameter> is enabled. To use this feature from the PAM module this option must be set. Defaults to "no".
     155                Winbind allows one to logon using cached credentials when <parameter>winbind offline logon</parameter> is enabled. To use this feature from the PAM module this option must be set. Defaults to "no".
    127156                </para></listitem>
    128157                </varlistentry>

  • vendor/current/docs-xml/manpages/pdbedit.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    4444                <arg choice="opt">-s configfile</arg>
    4545                <arg choice="opt">-S script</arg>
     46                <arg choice="opt">--set-nt-hash</arg>
    4647                <arg choice="opt">-t</arg>
    4748                <arg choice="opt">--time-format</arg>
    … …  
    100101                <listitem><para>This option enables the verbose listing format.
    101102                It causes pdbedit to list the users in the database, printing
    102                 out the account fields in a descriptive format.</para>
     103                out the account fields in a descriptive format. Used together
     104                with -w also shows passwords hashes.</para>
    103105
    104106                <para>Example: <command>pdbedit -L -v</command></para>
    … …  
    135137                <filename>smbpasswd</filename> file format. (see the
    136138                <citerefentry><refentrytitle>smbpasswd</refentrytitle>
    137                 <manvolnum>5</manvolnum></citerefentry> for details)</para>
     139                <manvolnum>5</manvolnum></citerefentry> for details).
     140                Instead used together with (-v) displays the passwords
     141                hashes in verbose output.</para>
    138142
    139143                <para>Example: <command>pdbedit -L -w</command></para>
    … …  
    205209               
    206210               
     211                <varlistentry>
     212                <term>--set-nt-hash</term>
     213                <listitem><para>This option can be used while modifying
     214                a user account. It will set the user's password using
     215                the nt-hash value given as hexadecimal string.
     216                Useful to synchronize passwords.</para>
     217       
     218                <para>Example: <command>--set-nt-hash 8846F7EAEE8FB117AD06BDD830B7586C</command>
     219                </para>
     220                </listitem>
     221                </varlistentry>
     222
    207223                <varlistentry>
    208224                <term>-p|--profile profile</term>
    … …  
    290306</para>
    291307
    292                 <note><para>pdbedit does not call the unix password syncronisation
     308                <note><para>pdbedit does not call the unix password synchronization
    293309                                script if <smbconfoption name="unix password sync"/>
    294310                                has been set. It only updates the data in the Samba
    … …  
    429445                applies to the account policies instead of the user database.</para>
    430446
    431                 <para>This option will allow to migrate account policies from their default
     447                <para>This option will allow one to migrate account policies from their default
    432448                tdb-store into a passdb backend, e.g. an LDAP directory server.</para>
    433449
    … …  
    504520                </varlistentry>
    505521
    506                 &stdarg.help;
     522                &popt.autohelp;
    507523                &stdarg.server.debug;
    508524                &popt.common.samba;

  • vendor/current/docs-xml/manpages/profiles.1.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2222                <command>profiles</command>
    2323                <arg choice="opt">-v</arg>
    24                 <arg choice="opt">-c SID</arg>
    25                 <arg choice="opt">-n SID</arg>
     24                <arg choice="opt">-c|--change-sid SID</arg>
     25                <arg choice="opt">-n|--new-sid SID</arg>
    2626                <arg choice="req">file</arg>
    2727        </cmdsynopsis>
    … …  
    5959                <varlistentry>
    6060                <term>-c SID1 -n SID2</term>
     61                <term>--change-sid SID1 --new-sid SID2</term>
    6162                <listitem><para>Change all occurrences of SID1 in <filename>file</filename> by SID2.
    6263                </para></listitem>
    6364                </varlistentry>
    6465
    65                 &stdarg.help;
    66                
     66                &popt.common.samba.client;
     67                &popt.autohelp;
     68
    6769        </variablelist>
    6870</refsect1>

  • vendor/current/docs-xml/manpages/rpcclient.1.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2424                <arg choice="opt">-c &lt;command string&gt;</arg>
    2525                <arg choice="opt">-d debuglevel</arg>
    26                 <arg choice="opt">-h</arg>
    2726                <arg choice="opt">-l logdir</arg>
    2827                <arg choice="opt">-N</arg>
    … …  
    9998                &popt.common.credentials;               
    10099                &popt.common.connection;
    101                 &stdarg.help;
     100                &popt.autohelp;
    102101        </variablelist>
    103102</refsect1>
    … …  
    121120                </para></listitem></varlistentry>
    122121               
    123                 <varlistentry><term>enumtrusts</term><listitem><para>Enumerate trusted domains</para></listitem></varlistentry>
     122                <varlistentry><term>enumtrust</term><listitem><para>Enumerate trusted domains</para></listitem></varlistentry>
    124123
    125124                <varlistentry><term>enumprivs</term><listitem><para>Enumerate privileges</para></listitem></varlistentry>
    … …  
    180179        <variablelist>
    181180                <varlistentry><term>srvinfo</term><listitem><para>Server query info</para></listitem></varlistentry>
    182                
    183181                <varlistentry><term>netshareenum</term><listitem><para>Enumerate shares</para></listitem></varlistentry>
    184 
     182                <varlistentry><term>netshareenumall</term><listitem><para>Enumerate all shares</para></listitem></varlistentry>
     183                <varlistentry><term>netsharegetinfo</term><listitem><para>Get Share Info</para></listitem></varlistentry>
     184                <varlistentry><term>netsharesetinfo</term><listitem><para>Set Share Info</para></listitem></varlistentry>
     185                <varlistentry><term>netsharesetdfsflags</term><listitem><para>Set DFS flags</para></listitem></varlistentry>
    185186                <varlistentry><term>netfileenum</term><listitem><para>Enumerate open files</para></listitem></varlistentry>
    186                
    187187                <varlistentry><term>netremotetod</term><listitem><para>Fetch remote time of day</para></listitem></varlistentry>
    188                
     188                <varlistentry><term>netnamevalidate</term><listitem><para>Validate sharename</para></listitem></varlistentry>
     189                <varlistentry><term>netfilegetsec</term><listitem><para>Get File security</para></listitem></varlistentry>
     190                <varlistentry><term>netsessdel</term><listitem><para>Delete Session</para></listitem></varlistentry>
     191                <varlistentry><term>netsessenum</term><listitem><para>Enumerate Sessions</para></listitem></varlistentry>
     192                <varlistentry><term>netdiskenum</term><listitem><para>Enumerate Disks</para></listitem></varlistentry>
     193                <varlistentry><term>netconnenum</term><listitem><para>Enumerate Connections</para></listitem></varlistentry>
     194                <varlistentry><term>netshareadd</term><listitem><para>Add share</para></listitem></varlistentry>
     195                <varlistentry><term>netsharedel</term><listitem><para>Delete share</para></listitem></varlistentry>
    189196        </variablelist>
    190197
    … …  
    232239               
    233240<para><programlisting>
    234 Long Printer Name:\
     241Long Driver Name:\
    235242Driver File Name:\
    236243Data File Name:\
    … …  
    274281                </para></listitem></varlistentry>
    275282
    276                 <varlistentry><term>deldriverex &lt;driver&gt; [architecture] [version]
    277                 </term><listitem><para>Delete the specified printer driver including driver files.
    278                 You can limit this action to a specific architecture and a specific version.
    279                 If no architecure is given, all driver files of that driver will be deleted.
     283                <varlistentry><term>deldriverex &lt;driver&gt; [architecture] [version] [flags]
     284                </term><listitem><para>Delete the specified printer driver and optionally files
     285                associated with the driver.
     286                You can limit this action to a specific architecture and a specific version.
     287                If no architecture is given, all driver files of that driver will be deleted.
     288                <parameter>flags</parameter> correspond to numeric DPD_* values, i.e. a value
     289                of 3 requests (DPD_DELETE_UNUSED_FILES | DPD_DELETE_SPECIFIC_VERSION).
    280290                </para></listitem></varlistentry>
    281291
    … …  
    419429        <varlistentry><term>samlogon</term>
    420430        <listitem><para>Sam Logon</para></listitem>
     431        </varlistentry>
     432
     433        </variablelist>
     434        </refsect2>
     435
     436        <refsect2>
     437        <title>FSRVP</title>
     438        <variablelist>
     439
     440        <varlistentry><term>fss_is_path_sup &lt;share&gt;</term>
     441                <listitem>
     442                        <para>Check whether a share supports shadow-copy
     443                        requests</para>
     444                </listitem>
     445        </varlistentry>
     446        <varlistentry><term>fss_get_sup_version</term>
     447                <listitem>
     448                        <para>Get supported FSRVP version from server</para>
     449                </listitem>
     450        </varlistentry>
     451        <varlistentry><term>fss_create_expose &lt;context&gt; &lt;[ro|rw]&gt;
     452                                              &lt;share1&gt;
     453                                              [share2] ... [shareN]</term>
     454                <listitem>
     455                        <para>Request shadow-copy creation and exposure as a
     456                        new share</para>
     457                </listitem>
     458        </varlistentry>
     459        <varlistentry><term>fss_delete &lt;base_share&gt;
     460                                       &lt;shadow_copy_set_id&gt;
     461                                       &lt;shadow_copy_id&gt;</term>
     462                <listitem>
     463                        <para>Request shadow-copy share deletion</para>
     464        </listitem>
     465        </varlistentry>
     466        <varlistentry><term>fss_has_shadow_copy &lt;base_share&gt;</term>
     467                <listitem>
     468                        <para>Check for an associated share shadow-copy</para>
     469                </listitem>
     470        </varlistentry>
     471        <varlistentry><term>fss_get_mapping &lt;base_share&gt;
     472                                            &lt;shadow_copy_set_id&gt;
     473                                            &lt;shadow_copy_id&gt;</term>
     474                <listitem>
     475                        <para>Get shadow-copy share mapping information</para>
     476                </listitem>
     477        </varlistentry>
     478        <varlistentry><term>fss_recovery_complete &lt;shadow_copy_set_id&gt;</term>
     479                <listitem>
     480                        <para>Flag read-write shadow-copy as recovery complete,
     481                        allowing further shadow-copy requests</para>
     482                </listitem>
    421483        </varlistentry>
    422484

  • vendor/current/docs-xml/manpages/samba.7.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">Miscellanea</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    1414<refnamediv>
    1515        <refname>samba</refname>
    16         <refpurpose>A Windows SMB/CIFS fileserver for UNIX</refpurpose>
     16        <refpurpose>A Windows AD and SMB/CIFS fileserver for UNIX</refpurpose>
    1717</refnamediv>
    1818
    … …  
    2323<refsect1>
    2424        <title>DESCRIPTION</title>
    25        
    26         <para>The Samba software suite is a collection of programs
    27         that implements the Server Message Block (commonly abbreviated
    28         as SMB) protocol for UNIX systems. This protocol is sometimes
    29         also referred to as the Common Internet File System (CIFS). For a
    30         more thorough description, see <ulink url="http://www.ubiqx.org/cifs/">
     25
     26        <para>The Samba software suite is a collection of programs
     27        that implements the Server Message Block (commonly abbreviated
     28        as SMB) protocol for UNIX systems and provides Active Directory
     29        services. This protocol is sometimes also referred to as the
     30        Common Internet File System (CIFS). For a more thorough description,
     31        see <ulink url="http://www.ubiqx.org/cifs/">
    3132        http://www.ubiqx.org/cifs/</ulink>. Samba also implements the NetBIOS
    3233        protocol in nmbd.</para>
    33        
     34
    3435        <variablelist>
    3536                <varlistentry>
     37                <term><citerefentry><refentrytitle>samba</refentrytitle>
     38                <manvolnum>8</manvolnum></citerefentry></term>
     39                <listitem><para>The <command>samba</command> daemon provides the
     40                Active Directory services and file and print services to
     41                SMB clients. The configuration file
     42                for this daemon is described in <citerefentry><refentrytitle>smb.conf</refentrytitle>
     43                <manvolnum>5</manvolnum></citerefentry>.
     44                </para></listitem>
     45                </varlistentry>
     46
     47                <varlistentry>
    3648                <term><citerefentry><refentrytitle>smbd</refentrytitle>
    3749                <manvolnum>8</manvolnum></citerefentry></term>
    38                 <listitem><para>The <command>smbd</command> daemon provides the file and print services to 
    39                 SMB clients, such as Windows 95/98, Windows NT, Windows 
    40                 for Workgroups or LanManager. The configuration file 
     50                <listitem><para>The <command>smbd</command> daemon provides the file and print services to
     51                SMB clients, such as Windows 95/98, Windows NT, Windows
     52                for Workgroups or LanManager. The configuration file
    4153                for this daemon is described in <citerefentry><refentrytitle>smb.conf</refentrytitle>
    42                 <manvolnum>5</manvolnum></citerefentry>
    43                 </para></listitem>
    44                 </varlistentry>
    45                
     54                <manvolnum>5</manvolnum></citerefentry>.
     55                </para></listitem>
     56                </varlistentry>
     57
    4658                <varlistentry>
    4759                <term><citerefentry><refentrytitle>nmbd</refentrytitle>
    … …  
    4961                <listitem><para>The <command>nmbd</command>
    5062                daemon provides NetBIOS nameservice and browsing
    51                 support. The configuration file for this daemon 
     63                support. The configuration file for this daemon
    5264                is described in <citerefentry><refentrytitle>smb.conf</refentrytitle>
    53                 <manvolnum>5</manvolnum></citerefentry></para>
    54                 </listitem>
     65                <manvolnum>5</manvolnum></citerefentry>.</para>
     66                </listitem>
     67                </varlistentry>
     68
     69                <varlistentry>
     70                <term><citerefentry><refentrytitle>winbindd</refentrytitle>
     71                <manvolnum>8</manvolnum></citerefentry></term>
     72                <listitem><para><command>winbindd</command> is a daemon
     73                that is used for integrating authentication and
     74                the user database into unix.</para></listitem>
    5575                </varlistentry>
    5676
    … …  
    5979                <manvolnum>1</manvolnum></citerefentry></term>
    6080                <listitem><para>The <command>smbclient</command>
    61                 program implements a simple ftp-like client. This 
     81                program implements a simple ftp-like client. This
    6282                is useful for accessing SMB shares on other compatible
    63                 servers (such as Windows NT), and can also be used 
    64                 to allow a UNIX box to print to a printer attached to 
     83                servers (such as Windows NT), and can also be used
     84                to allow a UNIX box to print to a printer attached to
    6585                any SMB server (such as a PC running Windows NT).</para>
     86                </listitem>
     87                </varlistentry>
     88
     89                <varlistentry>
     90                <term><citerefentry><refentrytitle>samba-tool</refentrytitle>
     91                <manvolnum>8</manvolnum></citerefentry></term>
     92                <listitem><para>The <command>samba-tool</command>
     93                is the main Samba Administration tool regarding
     94                Active Directory services.</para>
    6695                </listitem>
    6796                </varlistentry>
    … …  
    77106
    78107                <varlistentry>
    79                 <term><citerefentry><refentrytitle>testprns</refentrytitle>
    80                 <manvolnum>1</manvolnum></citerefentry></term>
    81                 <listitem><para>The <command>testprns</command>
    82                 utility supports testing printer names defined
    83                 in your <filename>printcap</filename> file used
    84                 by Samba.</para>
    85                 </listitem>
    86                 </varlistentry>
    87 
    88                 <varlistentry>
    89108                <term><citerefentry><refentrytitle>smbstatus</refentrytitle>
    90109                <manvolnum>1</manvolnum></citerefentry></term>
    91110                <listitem><para>The <command>smbstatus</command>
    92                 tool provides access to information about the 
     111                tool provides access to information about the
    93112                current connections to <command>smbd</command>.</para>
    94113                </listitem>
    … …  
    99118                <manvolnum>1</manvolnum></citerefentry></term>
    100119                <listitem><para>The <command>nmblookup</command>
    101                 tools allows NetBIOS name queries to be made 
     120                tools allows NetBIOS name queries to be made
    102121                from a UNIX host.</para>
    103122                </listitem>
    … …  
    108127                <manvolnum>8</manvolnum></citerefentry></term>
    109128                <listitem><para>The <command>smbpasswd</command>
    110                 command is a tool for changing LanMan and Windows NT 
     129                command is a tool for changing LanMan and Windows NT
    111130                password hashes on Samba and Windows NT servers.</para>
    112131                </listitem>
    … …  
    116135                <term><citerefentry><refentrytitle>smbcacls</refentrytitle>
    117136                <manvolnum>1</manvolnum></citerefentry></term>
    118                 <listitem><para>The <command>smbcacls</command> command is 
     137                <listitem><para>The <command>smbcacls</command> command is
    119138                a tool to set ACL's on remote CIFS servers. </para>
    120139                </listitem>
    … …  
    122141
    123142                <varlistentry>
    124                 <term><citerefentry><refentrytitle>smbsh</refentrytitle>
    125                 <manvolnum>1</manvolnum></citerefentry></term>
    126                 <listitem><para>The <command>smbsh</command> command is
    127                 a program that allows you to run a unix shell with
    128                 with an overloaded VFS.</para></listitem>
    129                 </varlistentry>
    130 
    131                 <varlistentry>
    132143                <term><citerefentry><refentrytitle>smbtree</refentrytitle>
    133144                <manvolnum>1</manvolnum></citerefentry></term>
    134                 <listitem><para>The <command>smbtree</command> command 
     145                <listitem><para>The <command>smbtree</command> command
    135146                is a text-based network neighborhood tool.</para></listitem>
    136147                </varlistentry>
    … …  
    139150                <term><citerefentry><refentrytitle>smbtar</refentrytitle>
    140151                <manvolnum>1</manvolnum></citerefentry></term>
    141                 <listitem><para>The <command>smbtar</command> can make 
     152                <listitem><para>The <command>smbtar</command> can make
    142153                backups of data on CIFS/SMB servers.</para></listitem>
    143154                </varlistentry>
    … …  
    146157                <term><citerefentry><refentrytitle>smbspool</refentrytitle>
    147158                <manvolnum>8</manvolnum></citerefentry></term>
    148                 <listitem><para><command>smbspool</command> is a 
    149                 helper utility for printing on printers connected 
     159                <listitem><para><command>smbspool</command> is a
     160                helper utility for printing on printers connected
    150161                to CIFS servers. </para></listitem>
    151162                </varlistentry>
    … …  
    155166                <manvolnum>1</manvolnum></citerefentry></term>
    156167                <listitem><para><command>smbcontrol</command> is a utility
    157                 that can change the behaviour of running samba daemons.
     168                that can change the behaviour of running
     169                <command>smbd</command>, <command>nmbd</command> and
     170                <command>winbindd</command> daemons.
    158171                </para></listitem>
    159172                </varlistentry>
    … …  
    163176                <manvolnum>1</manvolnum></citerefentry></term>
    164177                <listitem><para><command>rpcclient</command> is a utility
    165                 that can be used to execute RPC commands on remote 
     178                that can be used to execute RPC commands on remote
    166179                CIFS servers.</para></listitem>
    167180                </varlistentry>
    … …  
    170183                <term><citerefentry><refentrytitle>pdbedit</refentrytitle>
    171184                <manvolnum>8</manvolnum></citerefentry></term>
    172                 <listitem><para>The <command>pdbedit</command> command 
    173                 can be used to maintain the local user database on 
     185                <listitem><para>The <command>pdbedit</command> command
     186                can be used to maintain the local user database on
    174187                a samba server.</para></listitem></varlistentry>
    175188
    … …  
    177190                <term><citerefentry><refentrytitle>findsmb</refentrytitle>
    178191                <manvolnum>1</manvolnum></citerefentry></term>
    179                 <listitem><para>The <command>findsmb</command> command 
     192                <listitem><para>The <command>findsmb</command> command
    180193                can be used to find SMB servers on the local network.
    181194                </para></listitem></varlistentry>
    … …  
    184197                <term><citerefentry><refentrytitle>net</refentrytitle>
    185198                <manvolnum>8</manvolnum></citerefentry></term>
    186                 <listitem><para>The <command>net</command> command 
     199                <listitem><para>The <command>net</command> command
    187200                is supposed to work similar to the DOS/Windows
    188201                NET.EXE command.</para></listitem>
    … …  
    190203
    191204                <varlistentry>
    192                 <term><citerefentry><refentrytitle>swat</refentrytitle>
    193                 <manvolnum>8</manvolnum></citerefentry></term>
    194                 <listitem><para><command>swat</command> is a web-based
    195                 interface to configuring <filename>smb.conf</filename>.
    196                 </para></listitem>
    197                 </varlistentry>
    198 
    199                 <varlistentry>
    200                 <term><citerefentry><refentrytitle>winbindd</refentrytitle>
    201                 <manvolnum>8</manvolnum></citerefentry></term>
    202                 <listitem><para><command>winbindd</command> is a daemon
    203                 that is used for integrating authentication and
    204                 the user database into unix.</para></listitem>
    205                 </varlistentry>
    206 
    207                 <varlistentry>
    208205                <term><citerefentry><refentrytitle>wbinfo</refentrytitle>
    209206                <manvolnum>1</manvolnum></citerefentry></term>
    210                 <listitem><para><command>wbinfo</command> is a utility 
     207                <listitem><para><command>wbinfo</command> is a utility
    211208                that retrieves and stores information related to winbind.
    212209                </para></listitem>
    … …  
    225222                <term><citerefentry><refentrytitle>log2pcap</refentrytitle>
    226223                                <manvolnum>1</manvolnum></citerefentry></term>
    227                 <listitem><para><command>log2pcap</command> is a utility 
    228                                 for generating pcap trace files from Samba log 
     224                <listitem><para><command>log2pcap</command> is a utility
     225                                for generating pcap trace files from Samba log
    229226                                files.</para></listitem>
    230227                </varlistentry>
    … …  
    245242
    246243                <varlistentry>
    247                         <term>
    248 <citerefentry><refentrytitle>smbmount</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
    249 <citerefentry><refentrytitle>smbumount</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
    250 <citerefentry><refentrytitle>smbmnt</refentrytitle><manvolnum>8</manvolnum></citerefentry></term>
    251                 <listitem><para><command>smbmount</command>,<command>smbumount</command> and <command>smbmnt</command> are commands that can be used to
    252                 mount CIFS/SMB shares on Linux.
    253                 </para></listitem>
    254                 </varlistentry>
    255 
    256                 <varlistentry>
    257244                <term><citerefentry><refentrytitle>smbcquotas</refentrytitle>
    258245                <manvolnum>1</manvolnum></citerefentry></term>
    259                 <listitem><para><command>smbcquotas</command> is a tool that 
     246                <listitem><para><command>smbcquotas</command> is a tool that
    260247                can set remote QUOTA's on server with NTFS 5. </para>
    261248                </listitem>
    … …  
    266253<refsect1>
    267254        <title>COMPONENTS</title>
    268        
    269         <para>The Samba suite is made up of several components. Each 
    270         component is described in a separate manual page. It is strongly 
    271         recommended that you read the documentation that comes with Samba 
    272         and the manual pages of those components that you use. If the 
     255
     256        <para>The Samba suite is made up of several components. Each
     257        component is described in a separate manual page. It is strongly
     258        recommended that you read the documentation that comes with Samba
     259        and the manual pages of those components that you use. If the
    273260        manual pages and documents aren't clear enough then please visit
    274261        <ulink url="http://devel.samba.org/">http://devel.samba.org</ulink>
    … …  
    283270<refsect1>
    284271        <title>AVAILABILITY</title>
    285        
    286         <para>The Samba software suite is licensed under the 
    287         GNU Public License(GPL). A copy of that license should 
    288         have come with the package in the file COPYING. You are 
    289         encouraged to distribute copies of the Samba suite, but 
     272
     273        <para>The Samba software suite is licensed under the
     274        GNU Public License(GPL). A copy of that license should
     275        have come with the package in the file COPYING. You are
     276        encouraged to distribute copies of the Samba suite, but
    290277        please obey the terms of this license.</para>
    291278
    292         <para>The latest version of the Samba suite can be 
     279        <para>The latest version of the Samba suite can be
    293280        obtained via anonymous ftp from samba.org in the
    294         directory pub/samba/. It is also available on several 
     281        directory pub/samba/. It is also available on several
    295282        mirror sites worldwide.</para>
    296        
    297         <para>You may also find useful information about Samba 
     283
     284        <para>You may also find useful information about Samba
    298285        on the newsgroup <ulink url="news:comp.protocols.smb">
    299         comp.protocol.smb</ulink> and the Samba mailing 
    300         list. Details on how to join the mailing list are given in 
     286        comp.protocol.smb</ulink> and the Samba mailing
     287        list. Details on how to join the mailing list are given in
    301288        the README file that comes with Samba.</para>
    302        
     289
    303290        <para>If you have access to a WWW viewer (such as Mozilla
    304         or Konqueror) then you will also find lots of useful information, 
     291        or Konqueror) then you will also find lots of useful information,
    305292        including back issues of the Samba mailing list, at
    306293        <ulink url="http://lists.samba.org/">http://lists.samba.org</ulink>.</para>
    … …  
    309296<refsect1>
    310297        <title>VERSION</title>
    311        
    312         <para>This man page is correct for version 3 of the
     298
     299        <para>This man page is correct for version 4 of the
    313300        Samba suite. </para>
    314301</refsect1>
    … …  
    316303<refsect1>
    317304        <title>CONTRIBUTIONS</title>
    318        
    319         <para>If you wish to contribute to the Samba project, 
    320         then I suggest you join the Samba mailing list at 
     305
     306        <para>If you wish to contribute to the Samba project,
     307        then I suggest you join the Samba mailing list at
    321308        <ulink url="http://lists.samba.org/">http://lists.samba.org</ulink>.
    322309        </para>
    … …  
    324311        <para>If you have patches to submit, visit
    325312        <ulink url="http://devel.samba.org/">http://devel.samba.org/</ulink>
    326         for information on how to do it properly. We prefer patches 
    327         in <command>diff -u</command> format.</para>
     313        for information on how to do it properly. We prefer patches
     314        in <command>git format-patch</command> format.</para>
    328315</refsect1>
    329316
    330317<refsect1>
    331318        <title>CONTRIBUTORS</title>
    332        
    333         <para>Contributors to the project are now too numerous 
    334         to mention here but all deserve the thanks of all Samba 
     319
     320        <para>Contributors to the project are now too numerous
     321        to mention here but all deserve the thanks of all Samba
    335322        users. To see a full list, look at the
    336         <filename>change-log</filename> in the source package 
    337         for the pre-CVS changes and at <ulink 
    338         url="http://cvs.samba.org/">
    339         http://cvs.samba.org/</ulink>
    340         for the contributors to Samba post-CVS. CVS is the Open Source
    341         source code control system used by the Samba Team to develop 
     323        <filename>change-log</filename> in the source package
     324        for the pre-CVS changes and at <ulink
     325        url="http://git.samba.org/">
     326        http://git.samba.org/</ulink>
     327        for the contributors to Samba post-GIT. GIT is the Open Source
     328        source code control system used by the Samba Team to develop
    342329        Samba. The project would have been unmanageable without it.</para>
    343330</refsect1>
    … …  
    345332<refsect1>
    346333        <title>AUTHOR</title>
    347        
    348         <para>The original Samba software and related utilities 
     334
     335        <para>The original Samba software and related utilities
    349336        were created by Andrew Tridgell. Samba is now developed
    350         by the Samba Team as an Open Source project similar 
     337        by the Samba Team as an Open Source project similar
    351338        to the way the Linux kernel is developed.</para>
    352        
    353         <para>The original Samba man pages were written by Karl Auer. 
    354         The man page sources were converted to YODL format (another 
     339
     340        <para>The original Samba man pages were written by Karl Auer.
     341        The man page sources were converted to YODL format (another
    355342        excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
    356         ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0 
    357         release by Jeremy Allison.  The conversion to DocBook for 
     343        ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
     344        release by Jeremy Allison.  The conversion to DocBook for
    358345        Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML
    359346        4.2 for Samba 3.0 was done by Alexander Bokovoy.</para>

  • vendor/current/docs-xml/manpages/sharesec.1.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2727                <arg choice="opt">-D, --delete</arg>
    2828                <arg choice="opt">-v, --view</arg>
     29                <arg choice="opt">--view-all</arg>
    2930                <arg choice="opt">-M, --machine-sid</arg>
    3031                <arg choice="opt">-F, --force</arg>
    … …  
    3233                <arg choice="opt">-s, --configfile=CONFIGFILE</arg>
    3334                <arg choice="opt">-l, --log-basename=LOGFILEBASE</arg>
    34                 <arg choice="opt">-V, --version</arg>
     35                <arg choice="opt">--version</arg>
    3536                <arg choice="opt">-?, --help</arg>
    3637                <arg choice="opt">--usage</arg>
     38                <arg choice="opt">-S, --setsddl=STRING</arg>
     39                <arg choice="opt">-V, --viewsddl</arg>
    3740        </cmdsynopsis>
    3841</refsynopsisdiv>
    … …  
    9699                <listitem><para>
    97100                Overwrite an existing share permission ACL.
     101                </para></listitem>
     102                </varlistentry>
     103
     104                <varlistentry>
     105                <term>-v|--view</term>
     106                <listitem><para>
     107                List a share acl
     108                </para></listitem>
     109                </varlistentry>
     110
     111                <varlistentry>
     112                <term>--view-all</term>
     113                <listitem><para>
     114                List all share acls
     115                </para></listitem>
     116                </varlistentry>
     117
     118                <varlistentry>
     119                <term>-S|--setsddl=STRING</term>
     120                <listitem><para>
     121                Set security descriptor by providing ACL in SDDL format.
     122                </para></listitem>
     123                </varlistentry>
     124
     125                <varlistentry>
     126                <term>-V|--viewsddl</term>
     127                <listitem><para>
     128                List a share acl in SDDL format.
    98129                </para></listitem>
    99130                </varlistentry>
    … …  
    124155        cause strange behaviour.</para>
    125156
    126         <para>The owner and group specify the owner and group SIDs for the
    127         object. If a SID in the format S-1-x-y-z is specified this is used,
    128         otherwise the name specified is resolved using the server on which
    129         the file or directory resides.</para>
     157        <para>The owner and group specify the owner and group SIDs for
     158        the object. Share ACLs do not specify an owner or a group, so
     159        these fields are empty.</para>
    130160
    131161        <para>ACLs specify permissions granted to the SID. This SID
    … …  
    197227        host:~ # sharesec share -v
    198228        REVISION:1
    199         OWNER:(NULL SID)
    200         GROUP:(NULL SID)
    201         ACL:S-1-1-0:ALLOWED/0/0x101f01ff
    202         ACL:S-1-5-21-1866488690-1365729215-3963860297-17724:ALLOWED/0/FULL
     229        CONTROL:SR|DP
     230        OWNER:
     231        GROUP:
     232        ACL:S-1-1-0:ALLOWED/0x0/FULL
     233        ACL:S-1-5-21-1866488690-1365729215-3963860297-17724:ALLOWED/0x0/FULL
    203234        </programlisting>
    204235</refsect1>

  • vendor/current/docs-xml/manpages/smb.conf.5.xml

    r860 r988  
    77        <refmiscinfo class="source">Samba</refmiscinfo>
    88        <refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
    9         <refmiscinfo class="version">3.6</refmiscinfo>
     9        <refmiscinfo class="version">4.4</refmiscinfo>
    1010</refmeta>
    1111
    … …  
    2222        The <filename moreinfo="none">smb.conf</filename> file is a configuration  file for the Samba suite. <filename
    2323        moreinfo="none">smb.conf</filename> contains  runtime configuration information for the Samba programs. The
    24          <filename moreinfo="none">smb.conf</filename> file is designed to be configured and administered by the
    25          <citerefentry><refentrytitle>swat</refentrytitle> <manvolnum>8</manvolnum></citerefentry> program. The
    2624        complete description of the file format and possible parameters held within are here for reference purposes.
    27         </para> 
     25        </para>
    2826</refsect1>
    2927
    … …  
    473471                <varlistentry>
    474472                <term>%R</term>
    475                 <listitem><para>the selected protocol level after protocol negotiation. It can be one of CORE, COREPLUS,
    476                         LANMAN1, LANMAN2 or NT1.</para></listitem>
     473                <listitem><para>the selected protocol level after protocol negotiation. It can be one of
     474                        CORE, COREPLUS, LANMAN1, LANMAN2, NT1,
     475                        SMB2_02, SMB2_10, SMB2_22, SMB2_24,
     476                        SMB3_00, SMB3_02, SMB3_10, SMB3_11
     477                        or SMB2_FF.</para></listitem>
    477478                </varlistentry>
    478479
    … …  
    504505                <term>%I</term>
    505506                <listitem><para>the IP address of the client machine.</para>
    506                 <para>Before 3.6.0 it could contain IPv4 mapped IPv6 addresses,
     507                <para>Before 4.0.0 it could contain IPv4 mapped IPv6 addresses,
    507508                        now it only contains IPv4 or IPv6 addresses.</para>
    508509                </listitem>
    … …  
    512513                <term>%i</term>
    513514                <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                <para>Before 4.0.0 it could contain IPv4 mapped IPv6 addresses,
    515516                        now it only contains IPv4 or IPv6 addresses.</para>
    516517                </listitem>
    … …  
    671672</refsect1>
    672673
    673 <refsect1 id="VALIDATIONSECT">
    674         <title>NOTE ABOUT USERNAME/PASSWORD VALIDATION</title>
    675 
    676         <para>
    677         There are a number of ways in which a user can connect to a service. The server uses the following steps
    678         in determining if it will allow a connection to a specified service. If all the steps fail, the connection
    679         request is rejected.  However, if one of the steps succeeds, the following steps are not checked.
    680         </para>
    681 
    682         <para>
    683         If the service is marked <quote>guest only = yes</quote> and the server is running with share-level
    684         security (<quote>security = share</quote>, steps 1 to 5 are skipped.
    685         </para>
    686 
    687 
    688         <orderedlist continuation="restarts" inheritnum="ignore" numeration="arabic">
    689                 <listitem><para>
    690                 If the client has passed a username/password pair and that username/password pair is validated by the UNIX
    691                 system's password programs, the connection is made as that username. This includes the
    692                 <literal>\\server\service</literal>%<replaceable>username</replaceable> method of passing a username.
    693                 </para></listitem>
    694 
    695                 <listitem><para>
    696                 If the client has previously registered a username with the system and now supplies a correct password for that
    697                 username, the connection is allowed.
    698                 </para></listitem>
    699                
    700                 <listitem><para>
    701                 The client's NetBIOS name and any previously used usernames are checked against the supplied password. If
    702                 they match, the connection is allowed as the corresponding user.
    703                 </para></listitem>
    704                
    705                 <listitem><para>
    706                 If the client has previously validated a username/password pair with the server and the client has passed
    707                 the validation token, that username is used.
    708                 </para></listitem>
    709 
    710                 <listitem><para>
    711                 If a <literal>user = </literal> field is given in the <filename moreinfo="none">smb.conf</filename> file for the
    712                 service and the client has supplied a password, and that password matches (according to the UNIX system's
    713                 password checking) with one of the usernames from the <literal>user =</literal> field, the connection is made as
    714                 the username in the <literal>user =</literal> line. If one of the usernames in the <literal>user =</literal> list
    715                 begins with a <literal>@</literal>, that name expands to a list of names in the group of the same name.
    716                 </para></listitem>
    717 
    718                 <listitem><para>
    719                 If the service is a guest service, a connection is made as the username given in the <literal>guest account
    720                 =</literal> for the service, irrespective of the supplied password.
    721                 </para></listitem>
    722         </orderedlist>
    723 
    724 </refsect1>
    725 
    726674<refsect1>
    727675        <title>REGISTRY-BASED CONFIGURATION</title>
    … …  
    811759       
    812760        <samba:parameterlist>
    813                 <xi:include href="../smbdotconf/parameters.all.xml" parse="xml"/>
     761                <!-- The URI below is resolved to local generated version of parameters.all.xml //-->
     762                <!-- WAF build places it in bin/default/docs-xml/smbdotconf/parameters.all.xml //-->
     763                <!-- and we redirect there via use of XML_CATALOG_FILES, see docs-xml/build/catalog.xml.in //-->
     764                <xi:include href="http://www.samba.org/samba/smbdotconf/parameters.all.xml" parse="xml"/>
    814765        </samba:parameterlist>
    815766
    … …  
    843794        <title>VERSION</title>
    844795
    845         <para>This man page is correct for version 3 of the Samba suite.</para>
     796        <para>This man page is correct for version 4 of the Samba suite.</para>
    846797</refsect1>
    847798
    … …  
    851802        <citerefentry><refentrytitle>samba</refentrytitle>
    852803        <manvolnum>7</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbpasswd</refentrytitle>
    853         <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>swat</refentrytitle>
    854804        <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbd</refentrytitle>
    855805        <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmbd</refentrytitle>
     806        <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>winbindd</refentrytitle>
     807        <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>samba</refentrytitle>
     808        <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>samba-tool</refentrytitle>
    856809        <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
    857810        <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmblookup</refentrytitle>
    858811        <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testparm</refentrytitle>
    859         <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testprns</refentrytitle>
    860812        <manvolnum>1</manvolnum></citerefentry>.</para>
    861813</refsect1>

  • vendor/current/docs-xml/manpages/smbcacls.1.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2222                <arg choice="req">//server/share</arg>
    2323                <arg choice="req">/filename</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>
     24                <arg choice="opt">-D|--delete acl</arg>
     25                <arg choice="opt">-M|--modify acl</arg>
     26                <arg choice="opt">-a|--add acl</arg>
     27                <arg choice="opt">-S|--set acl</arg>
    2828                <arg choice="opt">-C|--chown name</arg>
    2929                <arg choice="opt">-G|--chgrp name</arg>
    30                 <arg choice="opt">-I allow|romove|copy</arg>
     30                <arg choice="opt">-I allow|remove|copy</arg>
    3131                <arg choice="opt">--numeric</arg>
    3232                <arg choice="opt">-t</arg>
    3333                <arg choice="opt">-U username</arg>
    34                 <arg choice="opt">-h</arg>
    3534                <arg choice="opt">-d</arg>
     35                <arg choice="opt">-e</arg>
     36                <arg choice="opt">-m|--max-protocol LEVEL</arg>
     37                <arg choice="opt">--query-security-info FLAGS</arg>
     38                <arg choice="opt">--set-security-info FLAGS</arg>
     39                <arg choice="opt">--sddl</arg>
     40                <arg choice="opt">--domain-sid SID</arg>
    3641        </cmdsynopsis>
    3742</refsynopsisdiv>
    … …  
    4449
    4550        <para>The <command>smbcacls</command> program manipulates NT Access Control
    46         Lists (ACLs) on SMB file shares. </para>
     51        Lists (ACLs) on SMB file shares. An ACL is comprised zero or more Access
     52        Control Entries (ACEs), which define access restrictions for a specific
     53        user or group.</para>
    4754</refsect1>
    4855
    … …  
    5764        <variablelist>
    5865                <varlistentry>
    59                 <term>-a|--add acls</term>
    60                 <listitem><para>Add the ACLs specified to the ACL list.  Existing
    61                 access control entries are unchanged. </para></listitem>
    62                 </varlistentry>
    63                
    64                
    65                
    66                 <varlistentry>
    67                 <term>-M|--modify acls</term>
    68                 <listitem><para>Modify the mask value (permissions) for the ACLs
     66                <term>-a|--add acl</term>
     67                <listitem><para>Add the entries specified to the ACL.  Existing
     68                access control entries are unchanged.</para></listitem>
     69                </varlistentry>
     70               
     71               
     72               
     73                <varlistentry>
     74                <term>-M|--modify acl</term>
     75                <listitem><para>Modify the mask value (permissions) for the ACEs
    6976                specified on the command line.  An error will be printed for each
    70                 ACL specified that was not already present in the ACL list
    71                 </para></listitem>
    72                 </varlistentry>
    73                
    74                
    75                
    76                 <varlistentry>
    77                 <term>-D|--delete acls</term>
    78                 <listitem><para>Delete any ACLs specified on the command line. 
    79                 An error will be printed for each ACL specified that was not
    80                 already present in the ACL list. </para></listitem>
    81                 </varlistentry>
    82                
    83                
    84                
    85                 <varlistentry>
    86                 <term>-S|--set acls</term>
    87                 <listitem><para>This command sets the ACLs on the file with
    88                 only the ones specified on the command line.  All other ACLs are
    89                 erased. Note that the ACL specified must contain at least a revision,
     77                ACE specified that was not already present in the object's ACL.
     78                </para></listitem>
     79                </varlistentry>
     80               
     81               
     82               
     83                <varlistentry>
     84                <term>-D|--delete acl</term>
     85                <listitem><para>Delete any ACEs specified on the command line.
     86                An error will be printed for each ACE specified that was not
     87                already present in the object's ACL. </para></listitem>
     88                </varlistentry>
     89               
     90               
     91               
     92                <varlistentry>
     93                <term>-S|--set acl</term>
     94                <listitem><para>This command sets the ACL on the object with
     95                only what is specified on the command line.  Any existing ACL
     96                is erased. Note that the ACL specified must contain at least a revision,
    9097                type, owner and group for the call to succeed. </para></listitem>
    9198                </varlistentry>
    … …  
    131138
    132139
    133 
    134140                <varlistentry>
    135141                <term>--numeric</term>
    … …  
    140146               
    141147                <varlistentry>
     148                <term>-m|--max-protocol PROTOCOL_NAME</term>
     149                <listitem><para>This allows the user to select the
     150                highest SMB protocol level that smbcacls will use to
     151                connect to the server. By default this is set to
     152                NT1, which is the highest available SMB1 protocol.
     153                To connect using SMB2 or SMB3 protocol, use the
     154                strings SMB2 or SMB3 respectively. Note that to connect
     155                to a Windows 2012 server with encrypted transport selecting
     156                a max-protocol of SMB3 is required.
     157                </para></listitem>
     158                </varlistentry>
     159
     160                <varlistentry>
    142161                <term>-t|--test-args</term>
    143162                <listitem><para>
    … …  
    146165                </para></listitem>
    147166                </varlistentry>
    148                                
    149                 &stdarg.help;
     167
     168                <varlistentry>
     169                <term>--query-security-info FLAGS</term>
     170                <listitem><para>The security-info flags for queries.
     171                </para></listitem>
     172                </varlistentry>
     173
     174                <varlistentry>
     175                <term>--set-security-info FLAGS</term>
     176                <listitem><para>The security-info flags for queries.
     177                </para></listitem>
     178                </varlistentry>
     179
     180                <varlistentry>
     181                <term>--sddl</term>
     182                <listitem><para>Output and input acls in sddl format.
     183                </para></listitem>
     184                </varlistentry>
     185
     186                <varlistentry>
     187                <term>--domain-sid SID</term>
     188                <listitem><para>SID used for sddl processing.
     189                </para></listitem>
     190                </varlistentry>
     191
    150192                &stdarg.server.debug;
    151193                &popt.common.samba;
    152194                &popt.common.credentials;
     195                &popt.common.connection;
     196                &popt.autohelp;
    153197        </variablelist>
    154198</refsect1>
    … …  
    158202        <title>ACL FORMAT</title>
    159203
    160         <para>The format of an ACL is one or more ACL entries separated by
     204        <para>The format of an ACL is one or more entries separated by
    161205        either commas or newlines.  An ACL entry is one of the following: </para>
    162206
    … …  
    179223        the file or directory resides. </para>
    180224
    181         <para>ACLs specify permissions granted to the SID.  This SID again
    182         can be specified in S-1-x-y-z format or as a name in which case
    183         it is resolved against the server on which the file or directory
    184         resides.  The type, flags and mask values determine the type of
    185         access granted to the SID. </para>
     225        <para>ACEs are specified with an "ACL:" prefix, and define permissions
     226        granted to an SID.  The SID again can be specified in S-1-x-y-z format
     227        or as a name in which case it is resolved against the server on which
     228        the file or directory resides.  The type, flags and mask values
     229        determine the type of access granted to the SID. </para>
    186230
    187231        <para>The type can be either ALLOWED or DENIED to allow/deny access
    188         to the SID. The flags values are generally zero for file ACLs and
    189         either 9 or 2 for directory ACLs.  Some common flags are: </para>
     232        to the SID. The flags values are generally zero for file ACEs and
     233        either 9 or 2 for directory ACEs.  Some common flags are: </para>
    190234
    191235        <itemizedlist>
    … …  
    196240        </itemizedlist>
    197241 
    198         <para>At present flags can only be specified as decimal or
     242        <para>At present, flags can only be specified as decimal or
    199243        hexadecimal values.</para>
    200244 
    … …  
    244288        <title>VERSION</title>
    245289
    246         <para>This man page is correct for version 3 of the Samba suite.</para>
     290        <para>This man page is correct for version 4 of the Samba suite.</para>
    247291</refsect1>
    248292

  • vendor/current/docs-xml/manpages/smbclient.1.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    3838                <arg choice="opt">-R &lt;name resolve order&gt;</arg>
    3939                <arg choice="opt">-s &lt;smb config file&gt;</arg>
     40                <arg choice="opt">-t &lt;per-operation timeout in seconds&gt;</arg>
    4041                <arg choice="opt">-k</arg>
    4142                <arg choice="opt">-P</arg>
    … …  
    6869                <arg choice="opt">-R &lt;name resolve order&gt;</arg>
    6970                <arg choice="opt">-s &lt;smb config file&gt;</arg>
     71                <arg choice="opt">-t &lt;per-operation timeout in seconds&gt;</arg>
    7072                <arg choice="opt">-T&lt;c|x&gt;IXFqgbNan</arg>
    7173                <arg choice="opt">-k</arg>
    … …  
    7981        <manvolnum>7</manvolnum></citerefentry> suite.</para>
    8082
    81         <para><command>smbclient</command> is a client that can 
     83        <para><command>smbclient</command> is a client that can
    8284        'talk' to an SMB/CIFS server. It offers an interface
    8385        similar to that of the ftp program (see <citerefentry><refentrytitle>ftp</refentrytitle>
    84         <manvolnum>1</manvolnum></citerefentry>). 
    85         Operations include things like getting files from the server 
    86         to the local machine, putting files from the local machine to 
    87         the server, retrieving directory information from the server 
     86        <manvolnum>1</manvolnum></citerefentry>).
     87        Operations include things like getting files from the server
     88        to the local machine, putting files from the local machine to
     89        the server, retrieving directory information from the server
    8890        and so on. </para>
    8991</refsect1>
    … …  
    9294<refsect1>
    9395        <title>OPTIONS</title>
    94        
     96
    9597        <variablelist>
    9698                <varlistentry>
    9799                <term>servicename</term>
    98                 <listitem><para>servicename is the name of the service 
     100                <listitem><para>servicename is the name of the service
    99101                you want to use on the server. A service name takes the form
    100102                <filename>//server/service</filename> where <parameter>server
    101                 </parameter> is the NetBIOS name of the SMB/CIFS server 
    102                 offering the desired service and <parameter>service</parameter> 
    103                 is the name of the service offered.  Thus to connect to
     103                </parameter> is the NetBIOS name of the SMB/CIFS server
     104                offering the desired service and <parameter>service</parameter>
     105                is the name of the service offered.      Thus to connect to
    104106                the service "printer" on the SMB/CIFS server "smbserver",
    105107                you would use the servicename <filename>//smbserver/printer
    106108                </filename></para>
    107109
    108                 <para>Note that the server name required is NOT necessarily 
    109                 the IP (DNS) host name of the server !  The name required is
     110                <para>Note that the server name required is NOT necessarily
     111                the IP (DNS) host name of the server !  The name required is
    110112                a NetBIOS server name, which may or may not be the
    111113                same as the IP hostname of the machine running the server.
    112114                </para>
    113115
    114                 <para>The server name is looked up according to either 
    115                 the <parameter>-R</parameter> parameter to <command>smbclient</command> or 
    116                 using the name resolve order parameter in 
     116                <para>The server name is looked up according to either
     117                the <parameter>-R</parameter> parameter to <command>smbclient</command> or
     118                using the name resolve order parameter in
    117119                the <citerefentry><refentrytitle>smb.conf</refentrytitle>
    118                 <manvolnum>5</manvolnum></citerefentry> file, 
    119                 allowing an administrator to change the order and methods 
     120                <manvolnum>5</manvolnum></citerefentry> file,
     121                allowing an administrator to change the order and methods
    120122                by which server names are looked up. </para></listitem>
    121123                </varlistentry>
    … …  
    123125                <varlistentry>
    124126                <term>password</term>
    125                 <listitem><para>The password required to access the specified 
    126                 service on the specified server. If this parameter is 
    127                 supplied, the <parameter>-N</parameter> option (suppress 
     127                <listitem><para>The password required to access the specified
     128                service on the specified server. If this parameter is
     129                supplied, the <parameter>-N</parameter> option (suppress
    128130                password prompt) is assumed. </para>
    129131
    130                 <para>There is no default password. If no password is supplied 
    131                 on the command line (either by using this parameter or adding 
    132                 a password to the <parameter>-U</parameter> option (see 
    133                 below)) and the <parameter>-N</parameter> option is not 
    134                 specified, the client will prompt for a password, even if 
    135                 the desired service does not require one. (If no password is 
     132                <para>There is no default password. If no password is supplied
     133                on the command line (either by using this parameter or adding
     134                a password to the <parameter>-U</parameter> option (see
     135                below)) and the <parameter>-N</parameter> option is not
     136                specified, the client will prompt for a password, even if
     137                the desired service does not require one. (If no password is
    136138                required, simply press ENTER to provide a null password.)
    137139                </para>
    138140
    139                 <para>Note: Some servers (including OS/2 and Windows for 
    140                 Workgroups) insist on an uppercase password. Lowercase 
    141                 or mixed case passwords may be rejected by these servers.               
     141                <para>Note: Some servers (including OS/2 and Windows for
     142                Workgroups) insist on an uppercase password. Lowercase
     143                or mixed case passwords may be rejected by these servers.
    142144                </para>
    143145
    … …  
    145147                </para></listitem>
    146148                </varlistentry>
    147                
     149
    148150                <varlistentry>
    149151                <term>-R|--name-resolve &lt;name resolve order&gt;</term>
    150                 <listitem><para>This option is used by the programs in the Samba 
    151                 suite to determine what naming services and in what order to resolve 
    152                 host names to IP addresses. The option takes a space-separated 
     152                <listitem><para>This option is used by the programs in the Samba
     153                suite to determine what naming services and in what order to resolve
     154                host names to IP addresses. The option takes a space-separated
    153155                string of different name resolution options.</para>
    154156
    155                 <para>The options are :"lmhosts", "host", "wins" and "bcast". They 
     157                <para>The options are :"lmhosts", "host", "wins" and "bcast". They
    156158                cause names to be resolved as follows:</para>
    157159
    158160                <itemizedlist>
    159                         <listitem><para><constant>lmhosts</constant>: Lookup an IP 
    160                         address in the Samba lmhosts file. If the line in lmhosts has 
    161                         no name type attached to the NetBIOS name (see 
     161                        <listitem><para><constant>lmhosts</constant>: Lookup an IP
     162                        address in the Samba lmhosts file. If the line in lmhosts has
     163                        no name type attached to the NetBIOS name (see
    162164                        the <citerefentry><refentrytitle>lmhosts</refentrytitle>
    163165                        <manvolnum>5</manvolnum></citerefentry> for details) then
    164166                        any name type matches for lookup.</para>
    165167                        </listitem>
    166                        
    167                         <listitem><para><constant>host</constant>: Do a standard host 
     168
     169                        <listitem><para><constant>host</constant>: Do a standard host
    168170                        name to IP address resolution, using the system <filename>/etc/hosts
    169                         </filename>, NIS, or DNS lookups. This method of name resolution 
    170                         is operating system dependent, for instance on IRIX or Solaris this 
    171                         may be controlled by the <filename>/etc/nsswitch.conf</filename> 
    172                         file).  Note that this method is only used if the NetBIOS name
    173                         type being queried is the 0x20 (server) name type, otherwise 
     171                        </filename>, NIS, or DNS lookups. This method of name resolution
     172                        is operating system dependent, for instance on IRIX or Solaris this
     173                        may be controlled by the <filename>/etc/nsswitch.conf</filename>
     174                        file).  Note that this method is only used if the NetBIOS name
     175                        type being queried is the 0x20 (server) name type, otherwise
    174176                        it is ignored.</para>
    175177                        </listitem>
    176                        
    177                         <listitem><para><constant>wins</constant>: Query a name with 
     178
     179                        <listitem><para><constant>wins</constant>: Query a name with
    178180                        the IP address listed in the <parameter>wins server</parameter>
    179                         parameter.  If no WINS server has
     181                        parameter.      If no WINS server has
    180182                        been specified this method will be ignored.</para>
    181183                        </listitem>
    182                        
    183                         <listitem><para><constant>bcast</constant>: Do a broadcast on 
    184                         each of the known local interfaces listed in the 
     184
     185                        <listitem><para><constant>bcast</constant>: Do a broadcast on
     186                        each of the known local interfaces listed in the
    185187                        <parameter>interfaces</parameter>
    186                         parameter. This is the least reliable of the name resolution 
    187                         methods as it depends on the target host being on a locally 
     188                        parameter. This is the least reliable of the name resolution
     189                        methods as it depends on the target host being on a locally
    188190                        connected subnet.</para>
    189191                        </listitem>
    190192                </itemizedlist>
    191193
    192                 <para>If this parameter is not set then the name resolve order 
     194                <para>If this parameter is not set then the name resolve order
    193195                defined in the <citerefentry><refentrytitle>smb.conf</refentrytitle>
    194                 <manvolnum>5</manvolnum></citerefentry> file parameter 
     196                <manvolnum>5</manvolnum></citerefentry> file parameter
    195197                (name resolve order) will be used. </para>
    196198
    197                 <para>The default order is lmhosts, host, wins, bcast and without 
     199                <para>The default order is lmhosts, host, wins, bcast and without
    198200                this parameter or any entry in the <parameter>name resolve order
    199201                </parameter> parameter of the <citerefentry><refentrytitle>smb.conf</refentrytitle>
    … …  
    201203                methods will be attempted in this order. </para></listitem>
    202204                </varlistentry>
    203                
    204                
     205
     206
    205207                <varlistentry>
    206208                <term>-M|--message NetBIOS name</term>
    207                 <listitem><para>This options allows you to send messages, using 
    208                 the "WinPopup" protocol, to another computer. Once a connection is 
    209                 established you then type your message, pressing ^D (control-D) to 
     209                <listitem><para>This options allows you to send messages, using
     210                the "WinPopup" protocol, to another computer. Once a connection is
     211                established you then type your message, pressing ^D (control-D) to
    210212                end. </para>
    211213
    212                 <para>If the receiving computer is running WinPopup the user will 
    213                 receive the message and probably a beep. If they are not running 
    214                 WinPopup the message will be lost, and no error message will 
     214                <para>If the receiving computer is running WinPopup the user will
     215                receive the message and probably a beep. If they are not running
     216                WinPopup the message will be lost, and no error message will
    215217                occur. </para>
    216218
    217                 <para>The message is also automatically truncated if the message 
    218                 is over 1600 bytes, as this is the limit of the protocol. 
     219                <para>The message is also automatically truncated if the message
     220                is over 1600 bytes, as this is the limit of the protocol.
    219221                </para>
    220222
    221223                <para>
    222                 One useful trick is to pipe the message through <command>smbclient</command>. 
    223                 For example: smbclient -M FRED &lt; mymessage.txt will send the 
    224                 message in the file <filename>mymessage.txt</filename> to the 
     224                One useful trick is to pipe the message through <command>smbclient</command>.
     225                For example: smbclient -M FRED &lt; mymessage.txt will send the
     226                message in the file <filename>mymessage.txt</filename> to the
    225227                machine FRED.
    226228                </para>
    227229
    228                 <para>You may also find the <parameter>-U</parameter> and 
    229                 <parameter>-I</parameter> options useful, as they allow you to 
     230                <para>You may also find the <parameter>-U</parameter> and
     231                <parameter>-I</parameter> options useful, as they allow you to
    230232                control the FROM and TO parts of the message. </para>
    231233
    232234                <para>See the <parameter>message command</parameter> parameter in the <citerefentry><refentrytitle>smb.conf</refentrytitle>
    233                 <manvolnum>5</manvolnum></citerefentry> for a description of how to handle incoming 
     235                <manvolnum>5</manvolnum></citerefentry> for a description of how to handle incoming
    234236                WinPopup messages in Samba. </para>
    235237
    236                 <para><emphasis>Note</emphasis>: Copy WinPopup into the startup group 
    237                 on your WfWg PCs if you want them to always be able to receive 
     238                <para><emphasis>Note</emphasis>: Copy WinPopup into the startup group
     239                on your WfWg PCs if you want them to always be able to receive
    238240                messages. </para></listitem>
    239241                </varlistentry>
    … …  
    241243                <varlistentry>
    242244                <term>-p|--port port</term>
    243                 <listitem><para>This number is the TCP port number that will be used 
     245                <listitem><para>This number is the TCP port number that will be used
    244246                when making connections to the server. The standard (well-known)
    245                 TCP port number for an SMB/CIFS server is 139, which is the 
     247                TCP port number for an SMB/CIFS server is 139, which is the
    246248                default. </para></listitem>
    247249                </varlistentry>
    … …  
    257259                <varlistentry>
    258260                <term>-m|--max-protocol protocol</term>
    259                 <listitem><para>This parameter sets the maximum protocol version announced by the client.
     261                <listitem><para>This allows the user to select the
     262                highest SMB protocol level that smbclient will use to
     263                connect to the server. By default this is set to
     264                NT1, which is the highest available SMB1 protocol.
     265                To connect using SMB2 or SMB3 protocol, use the
     266                strings SMB2 or SMB3 respectively. Note that to connect
     267                to a Windows 2012 server with encrypted transport selecting
     268                a max-protocol of SMB3 is required.
    260269                </para></listitem>
    261270                </varlistentry>
    … …  
    268277                </varlistentry>
    269278
    270                 &stdarg.help;
    271 
    272279                <varlistentry>
    273280                <term>-I|--ip-address IP-address</term>
    … …  
    275282                It should be specified in standard "a.b.c.d" notation. </para>
    276283
    277                 <para>Normally the client would attempt to locate a named 
    278                 SMB/CIFS server by looking it up via the NetBIOS name resolution 
    279                 mechanism described above in the <parameter>name resolve order</parameter> 
     284                <para>Normally the client would attempt to locate a named
     285                SMB/CIFS server by looking it up via the NetBIOS name resolution
     286                mechanism described above in the <parameter>name resolve order</parameter>
    280287                parameter above. Using this parameter will force the client
    281                 to assume that the server is on the machine with the specified IP 
    282                 address and the NetBIOS name component of the resource being 
     288                to assume that the server is on the machine with the specified IP
     289                address and the NetBIOS name component of the resource being
    283290                connected to will be ignored. </para>
    284291
    285                 <para>There is no default for this parameter. If not supplied, 
    286                 it will be determined automatically by the client as described 
     292                <para>There is no default for this parameter. If not supplied,
     293                it will be determined automatically by the client as described
    287294                above. </para></listitem>
    288295                </varlistentry>
    289                
     296
    290297                <varlistentry>
    291298                <term>-E|--stderr</term>
    292                 <listitem><para>This parameter causes the client to write messages 
    293                 to the standard error stream (stderr) rather than to the standard 
     299                <listitem><para>This parameter causes the client to write messages
     300                to the standard error stream (stderr) rather than to the standard
    294301                output stream. </para>
    295                
    296                 <para>By default, the client writes messages to standard output 
     302
     303                <para>By default, the client writes messages to standard output
    297304                - typically the user's tty. </para></listitem>
    298305                </varlistentry>
    299                
     306
    300307                <varlistentry>
    301308                <term>-L|--list</term>
    302                 <listitem><para>This option allows you to look at what services 
    303                 are available on a server. You use it as <command>smbclient -L 
     309                <listitem><para>This option allows you to look at what services
     310                are available on a server. You use it as <command>smbclient -L
    304311                host</command> and a list should appear.  The <parameter>-I
    305                 </parameter> option may be useful if your NetBIOS names don't 
    306                 match your TCP/IP DNS host names or if you are trying to reach a 
     312                </parameter> option may be useful if your NetBIOS names don't
     313                match your TCP/IP DNS host names or if you are trying to reach a
    307314                host on another network. </para></listitem>
    308315                </varlistentry>
    309                
    310                 <varlistentry> 
     316
     317                <varlistentry>
    311318                <term>-b|--send-buffer buffersize</term>
    312                 <listitem><para>This option changes the transmit/send buffer
    313                 size when getting or putting a file from/to the server. The default
    314                 is 65520 bytes. Setting this value smaller (to 1200 bytes) has been
    315                 observed to speed up file transfers to and from a Win9x server.
    316                 </para></listitem>
    317                 </varlistentry>
    318                
    319                 <varlistentry>
    320                 <term>-e|--encrypt</term>
    321                 <listitem><para>This command line parameter requires the remote
    322                 server support the UNIX extensions. Request that the connection be
    323                 encrypted. This is new for Samba 3.2 and will only work with Samba
    324                 3.2 or above servers. Negotiates SMB encryption using GSSAPI. Uses
    325                 the given credentials for the encryption negotiation (either kerberos
    326                 or NTLMv1/v2 if given domain/username/password triple. Fails the
    327                 connection if encryption cannot be negotiated.
    328                 </para></listitem>
    329                 </varlistentry>
    330                
     319                <listitem><para>
     320                When sending or receiving files, smbclient uses an
     321                internal buffer sized by the maximum number of allowed requests
     322                to the connected server. This command allows this size to be set to any
     323                range between 0 (which means use the default server controlled size) bytes
     324                and 16776960 (0xFFFF00) bytes. Using the server controlled size is the
     325                most efficient as smbclient will pipeline as many simultaneous reads or
     326                writes needed to keep the server as busy as possible. Setting this to
     327                any other size will slow down the transfer. This can also be set
     328                using the <command>iosize</command> command inside smbclient.
     329                </para></listitem>
     330                </varlistentry>
     331
     332                <varlistentry>
     333                <term>-B|--browse</term>
     334                <listitem><para>Browse SMB servers using DNS.</para>
     335                </listitem>
     336                </varlistentry>
     337
    331338                &stdarg.client.debug;
    332339                &popt.common.samba;
    333340                &popt.common.credentials;
    334341                &popt.common.connection;
    335                
     342                &popt.autohelp;
     343
     344                <varlistentry>
     345                <term>-t|--timeout &lt;timeout-seconds&gt;</term>
     346                <listitem><para>This allows the user to tune the default
     347                timeout used for each SMB request. The default setting is
     348                20 seconds. Increase it if requests to the server sometimes
     349                time out. This can happen when SMB3 encryption is selected
     350                and smbclient is overwhelming the server with requests.
     351                This can also be set using the <command>timeout</command>
     352                command inside smbclient.
     353                </para></listitem>
     354                </varlistentry>
     355
    336356                <varlistentry>
    337357                <term>-T|--tar tar options</term>
    338358                <listitem><para>smbclient may be used to create <command>tar(1)
    339359                </command> compatible backups of all the files on an SMB/CIFS
    340                 share. The secondary tar flags that can be given to this option 
    341                 are : </para>
    342                
     360                share. The secondary tar flags that can be given to this option
     361                are:</para>
     362
    343363                <itemizedlist>
    344                         <listitem><para><parameter>c</parameter> - Create a tar file on UNIX.
    345                         Must be followed by the name of a tar file, tape device
    346                         or "-" for standard output. If using standard output you must
    347                         turn the log level to its lowest value -d0 to avoid corrupting
    348                         your tar file. This flag is mutually exclusive with the
     364                        <listitem><para><parameter>c</parameter> - Create a tar
     365                        backup archive on the local system.      Must be followed by
     366                        the name of a tar file, tape device or "-" for standard
     367                        output. If using standard output you must turn the log
     368                        level to its lowest value -d0 to avoid corrupting your tar
     369                        file. This flag is mutually exclusive with the
    349370                        <parameter>x</parameter> flag. </para></listitem>
    350                        
    351                         <listitem><para><parameter>x</parameter> - Extract (restore) a local 
    352                         tar file back to a share. Unless the -D option is given, the tar 
    353                         files will be restored from the top level of the share. Must be 
    354                         followed by the name of the tar file, device or "-" for standard 
    355                         input. Mutually exclusive with the <parameter>c</parameter> flag. 
     371
     372                        <listitem><para><parameter>x</parameter> - Extract (restore) a local
     373                        tar file back to a share. Unless the -D option is given, the tar
     374                        files will be restored from the top level of the share. Must be
     375                        followed by the name of the tar file, device or "-" for standard
     376                        input. Mutually exclusive with the <parameter>c</parameter> flag.
    356377                        Restored files have their creation times (mtime) set to the
    357                         date saved in the tar file. Directories currently do not get 
     378                        date saved in the tar file. Directories currently do not get
    358379                        their creation dates restored properly. </para></listitem>
    359                        
    360                         <listitem><para><parameter>I</parameter> - Include files and directories. 
    361                         Is the default behavior when filenames are specified above. Causes 
    362                         files to be included in an extract or create (and therefore 
    363                         everything else to be excluded). See example below.  Filename globbing
    364                         works  in one of two ways.  See <parameter>r</parameter> below. </para></listitem>
    365                        
    366                         <listitem><para><parameter>X</parameter> - Exclude files and directories. 
    367                         Causes files to be excluded from an extract or create. See 
    368                         example below.  Filename globbing works in one of two ways now.
     380
     381                        <listitem><para><parameter>I</parameter> - Include files and directories.
     382                        Is the default behavior when filenames are specified above. Causes
     383                        files to be included in an extract or create (and therefore
     384                        everything else to be excluded). See example below.      Filename globbing
     385                        works  in one of two ways.      See <parameter>r</parameter> below. </para></listitem>
     386
     387                        <listitem><para><parameter>X</parameter> - Exclude files and directories.
     388                        Causes files to be excluded from an extract or create. See
     389                        example below.  Filename globbing works in one of two ways.
    369390                        See <parameter>r</parameter> below. </para></listitem>
    370                        
     391
    371392                        <listitem><para><parameter>F</parameter> - File containing a list of files and directories.
    372393                        The <parameter>F</parameter> causes the name following the tarfile to
    373                         create to be read as a filename that contains a list of files and directories to 
     394                        create to be read as a filename that contains a list of files and directories to
    374395                        be included in an extract or create (and therefore everything else to be excluded).
    375396                        See example below. Filename globbing works in one of two ways.
    376397                        See <parameter>r</parameter> below.
    377398                        </para></listitem>
    378                        
    379                         <listitem><para><parameter>b</parameter> - Blocksize. Must be followed 
    380                         by a valid (greater than zero) blocksize.  Causes tar file to be 
    381                         written out in blocksize*TBLOCK (usually 512 byte) blocks.
     399
     400                        <listitem><para><parameter>b</parameter> - Blocksize. Must be followed
     401                        by a valid (greater than zero) blocksize.  Causes tar file to be
     402                        written out in blocksize*TBLOCK (512 byte) blocks.
    382403                        </para></listitem>
    383                        
    384                         <listitem><para><parameter>g</parameter> - Incremental. Only back up 
    385                         files that have the archive bit set. Useful only with the 
     404
     405                        <listitem><para><parameter>g</parameter> - Incremental. Only back up
     406                        files that have the archive bit set. Useful only with the
    386407                        <parameter>c</parameter> flag. </para></listitem>
    387408
    388                         <listitem><para><parameter>q</parameter> - Quiet. Keeps tar from printing 
    389                         diagnostics as it works.  This is the same as tarmode quiet. 
     409                        <listitem><para><parameter>q</parameter> - Quiet. Keeps tar from printing
     410                        diagnostics as it works.  This is the same as tarmode quiet.
    390411                        </para></listitem>
    391                        
    392                         <listitem><para><parameter>r</parameter> - Regular expression include
    393                         or exclude.  Uses regular  expression matching for
    394                         excluding or excluding files if  compiled with HAVE_REGEX_H.
    395                         However this mode can be very slow. If  not compiled with
    396                         HAVE_REGEX_H, does a limited wildcard match on '*' and  '?'.
     412
     413                        <listitem><para><parameter>r</parameter> - Use wildcard
     414                        matching to include or exclude. Deprecated.
    397415                        </para></listitem>
    398                        
    399                         <listitem><para><parameter>N</parameter> - Newer than. Must be followed 
    400                         by the name of a file whose date is compared against files found 
    401                         on the share during a create. Only files newer than the file 
    402                         specified are backed up to the tar file. Useful only with the 
     416
     417                        <listitem><para><parameter>N</parameter> - Newer than. Must be followed
     418                        by the name of a file whose date is compared against files found
     419                        on the share during a create. Only files newer than the file
     420                        specified are backed up to the tar file. Useful only with the
    403421                        <parameter>c</parameter> flag. </para></listitem>
    404                        
    405                         <listitem><para><parameter>a</parameter> - Set archive bit. Causes the 
    406                         archive bit to be reset when a file is backed up. Useful with the 
    407                         <parameter>g</parameter> and <parameter>c</parameter> flags. 
     422
     423                        <listitem><para><parameter>a</parameter> - Set archive bit. Causes the
     424                        archive bit to be reset when a file is backed up. Useful with the
     425                        <parameter>g</parameter> and <parameter>c</parameter> flags.
    408426                        </para></listitem>
    409427                </itemizedlist>
    410                        
     428
    411429                <para><emphasis>Tar Long File Names</emphasis></para>
    412                        
    413                 <para><command>smbclient</command>'s tar option now supports long 
    414                 file names both on backup and restore. However, the full path 
    415                 name of the file must be less than 1024 bytes.  Also, when
    416                 a tar archive is created, <command>smbclient</command>'s tar option places all 
    417                 files in the archive with relative names, not absolute names. 
     430
     431                <para><command>smbclient</command>'s tar option now supports long
     432                file names both on backup and restore. However, the full path
     433                name of the file must be less than 1024 bytes.  Also, when
     434                a tar archive is created, <command>smbclient</command>'s tar option places all
     435                files in the archive with relative names, not absolute names.
    418436                </para>
    419437
    420438                <para><emphasis>Tar Filenames</emphasis></para>
    421                        
    422                 <para>All file names can be given as DOS path names (with '\\' 
    423                 as the component separator) or as UNIX path names (with '/' as 
     439
     440                <para>All file names can be given as DOS path names (with '\\'
     441                as the component separator) or as UNIX path names (with '/' as
    424442                the component separator). </para>
    425                        
     443
    426444                <para><emphasis>Examples</emphasis></para>
    427                
    428                 <para>Restore from tar file <filename>backup.tar</filename> into myshare on mypc 
     445
     446                <para>Restore from tar file <filename>backup.tar</filename> into myshare on mypc
    429447                (no password on share). </para>
    430                
     448
    431449                <para><command>smbclient //mypc/myshare "" -N -Tx backup.tar
    432450                </command></para>
    433                
     451
    434452                <para>Restore everything except <filename>users/docs</filename>
    435453                </para>
    436                
    437                 <para><command>smbclient //mypc/myshare "" -N -TXx backup.tar 
     454
     455                <para><command>smbclient //mypc/myshare "" -N -TXx backup.tar
    438456                users/docs</command></para>
    439                
     457
    440458                <para>Create a tar file of the files beneath <filename>
    441459                users/docs</filename>. </para>
    442                
     460
    443461                <para><command>smbclient //mypc/myshare "" -N -Tc
    444462                backup.tar users/docs </command></para>
    445                
    446                 <para>Create the same tar file as above, but now use 
     463
     464                <para>Create the same tar file as above, but now use
    447465                a DOS path name. </para>
    448                
    449                 <para><command>smbclient //mypc/myshare "" -N -tc backup.tar
     466
     467                <para><command>smbclient //mypc/myshare "" -N -Tc backup.tar
    450468                users\edocs </command></para>
    451                
     469
    452470                <para>Create a tar file of the files listed in the file <filename>tarlist</filename>.</para>
    453                
     471
    454472                <para><command>smbclient //mypc/myshare "" -N -TcF
    455473                backup.tar tarlist</command></para>
    456                
    457                 <para>Create a tar file of all the files and directories in 
     474
     475                <para>Create a tar file of all the files and directories in
    458476                the share. </para>
    459                
     477
    460478                <para><command>smbclient //mypc/myshare "" -N -Tc backup.tar *
    461479                </command></para>
    462480                </listitem>
    463481                </varlistentry>
    464                
     482
    465483                <varlistentry>
    466484                <term>-D|--directory initial directory</term>
    467                 <listitem><para>Change to initial directory before starting. Probably 
     485                <listitem><para>Change to initial directory before starting. Probably
    468486                only of any use with the tar -T option. </para></listitem>
    469487                </varlistentry>
    470                
     488
    471489                <varlistentry>
    472490                <term>-c|--command command string</term>
    473                 <listitem><para>command string is a semicolon-separated list of 
     491                <listitem><para>command string is a semicolon-separated list of
    474492                commands to be executed instead of prompting from stdin. <parameter>
    475493                -N</parameter> is implied by <parameter>-c</parameter>.</para>
    476494
    477                 <para>This is particularly useful in scripts and for printing stdin 
     495                <para>This is particularly useful in scripts and for printing stdin
    478496                to the server, e.g. <command>-c 'print -'</command>. </para></listitem>
    479497                </varlistentry>
    … …  
    486504        <title>OPERATIONS</title>
    487505
    488         <para>Once the client is running, the user is presented with 
     506        <para>Once the client is running, the user is presented with
    489507        a prompt : </para>
    490508
    491509        <para><prompt>smb:\&gt; </prompt></para>
    492510
    493         <para>The backslash ("\\") indicates the current working directory 
    494         on the server, and will change if the current working directory 
     511        <para>The backslash ("\\") indicates the current working directory
     512        on the server, and will change if the current working directory
    495513        is changed. </para>
    496514
    497         <para>The prompt indicates that the client is ready and waiting to 
    498         carry out a user command. Each command is a single word, optionally 
    499         followed by parameters specific to that command. Command and parameters 
     515        <para>The prompt indicates that the client is ready and waiting to
     516        carry out a user command. Each command is a single word, optionally
     517        followed by parameters specific to that command. Command and parameters
    500518        are space-delimited unless these notes specifically
    501         state otherwise. All commands are case-insensitive.  Parameters to
    502         commands may or may not be case sensitive, depending on the command. 
     519        state otherwise. All commands are case-insensitive.      Parameters to
     520        commands may or may not be case sensitive, depending on the command.
    503521        </para>
    504522
    505         <para>You can specify file names which have spaces in them by quoting 
     523        <para>You can specify file names which have spaces in them by quoting
    506524        the name with double quotes, for example "a long file name". </para>
    507525
    508         <para>Parameters shown in square brackets (e.g., "[parameter]") are 
    509         optional.  If not given, the command will use suitable defaults. Parameters 
     526        <para>Parameters shown in square brackets (e.g., "[parameter]") are
     527        optional.  If not given, the command will use suitable defaults. Parameters
    510528        shown in angle brackets (e.g., "&lt;parameter&gt;") are required.
    511529        </para>
    512530
    513531
    514         <para>Note that all commands operating on the server are actually 
    515         performed by issuing a request to the server. Thus the behavior may 
    516         vary from server to server, depending on how the server was implemented. 
     532        <para>Note that all commands operating on the server are actually
     533        performed by issuing a request to the server. Thus the behavior may
     534        vary from server to server, depending on how the server was implemented.
    517535        </para>
    518536
    … …  
    556574                2 means only operate on files with this bit set and reset it after operation,
    557575                3 means operate on all files and reset it after operation. The default is 0.
     576                </para></listitem>
     577                </varlistentry>
     578
     579                <varlistentry>
     580                <term>backup</term>
     581                <listitem><para>Toggle the state of the "backup intent" flag
     582                sent to the server on directory listings and file opens. If
     583                the "backup intent" flag is true, the server will try and
     584                bypass some file system checks if the user has been granted
     585                SE_BACKUP or SE_RESTORE privileges. This state is useful when
     586                performing a backup or restore operation.
    558587                </para></listitem>
    559588                </varlistentry>
    … …  
    684713                <varlistentry>
    685714                <term>iosize &lt;bytes&gt;</term>
    686                 <listitem><para>When sending or receiving files, smbclient uses an
    687                 internal memory buffer by default of size 64512 bytes. This command
    688                 allows this size to be set to any range between 16384 (0x4000) bytes
    689                 and 16776960 (0xFFFF00) bytes. Larger sizes may mean more efficient
    690                 data transfer as smbclient will try and use the most efficient
    691                 read and write calls for the connected server.
     715                <listitem><para>
     716                When sending or receiving files, smbclient uses an
     717                internal buffer sized by the maximum number of allowed requests
     718                to the connected server. This command allows this size to be set to any
     719                range between 0 (which means use the default server controlled size) bytes
     720                and 16776960 (0xFFFF00) bytes. Using the server controlled size is the
     721                most efficient as smbclient will pipeline as many simultaneous reads or
     722                writes needed to keep the server as busy as possible. Setting this to
     723                any other size will slow down the transfer.
    692724                </para></listitem>
    693725                </varlistentry>
    … …  
    736768
    737769                <varlistentry>
     770                <term>logoff</term>
     771                <listitem><para>Logs the user off the server, closing the session.
     772                Used for internal Samba testing purposes.
     773                </para></listitem>
     774                </varlistentry>
     775
     776                <varlistentry>
    738777                <term>lowercase</term>
    739778                <listitem><para>Toggle lowercasing of filenames for the get and
    740                 mget commands.         
    741                 </para> 
     779                mget commands.
     780                </para>
    742781
    743782                <para>When lowercasing is toggled ON, local filenames are converted
    … …  
    816855                commands for more information. Note that all transfers in <command>smbclient</command>
    817856                are binary. </para></listitem>
     857                </varlistentry>
     858
     859                <varlistentry>
     860                <term>notify &lt;dir name&gt;</term>
     861                <listitem><para>Query a directory for change
     862                notifications. This command issues a recursive
     863                filechangenotify call for all possible changes. As
     864                changes come in will print one line per change. See
     865                <ulink url="https://msdn.microsoft.com/en-us/library/dn392331.aspx">https://msdn.microsoft.com/en-us/library/dn392331.aspx</ulink>
     866                for a description of the action numbers that this
     867                command prints.</para>
     868                <para>This command never ends, it waits for event
     869                indefinitely.
     870                </para></listitem>
    818871                </varlistentry>
    819872
    … …  
    9541007                <varlistentry>
    9551008                <term>rmdir &lt;directory name&gt;</term>
    956                 <listitem><para>Remove the specified directory (user access
     1009                <listitem><para>Remove the specified directory (user access
    9571010                privileges permitting) from the server. </para></listitem>
     1011                </varlistentry>
     1012
     1013                <varlistentry>
     1014                <term>scopy &lt;source filename&gt; &lt;destination filename&gt;</term>
     1015                <listitem><para>Attempt to copy a file on the server using the
     1016                most efficient server-side copy calls. Falls back to using
     1017                read then write if server doesn't support server-side copy.
     1018                </para></listitem>
    9581019                </varlistentry>
    9591020
    … …  
    9981059                <varlistentry>
    9991060                <term>tar &lt;c|x&gt;[IXbgNa]</term>
    1000                 <listitem><para>Performs a tar operation - see the <parameter>-T
    1001                 </parameter> command line option above. Behavior may be affected
    1002                 by the tarmode command (see below). Using g (incremental) and N
    1003                 (newer) will affect tarmode settings. Note that using the "-" option
    1004                 with tar x may not work - use the command line option instead.
    1005                 </para></listitem>
     1061                <listitem><para>Performs a tar operation - see the
     1062                <parameter>-T</parameter> command line option above. Behavior
     1063                may be affected by the tarmode command (see below). Using g
     1064                (incremental) and N (newer) will affect tarmode settings. Note
     1065                that using the "-" option with tar x may not work - use the
     1066                command line option instead.</para></listitem>
    10061067                </varlistentry>
    10071068
    … …  
    10101071                <listitem><para>Blocksize. Must be followed by a valid (greater
    10111072                than zero) blocksize. Causes tar file to be written out in
    1012                 <replaceable>blocksize</replaceable>*TBLOCK (usually 512 byte) blocks. </para></listitem>
    1013                 </varlistentry>
    1014 
    1015                 <varlistentry>
    1016                 <term>tarmode &lt;full|inc|reset|noreset&gt;</term>
    1017                 <listitem><para>Changes tar's behavior with regard to archive
    1018                 bits. In full mode, tar will back up everything regardless of the
    1019                 archive bit setting (this is the default mode). In incremental mode,
    1020                 tar will only back up files with the archive bit set. In reset mode,
    1021                 tar will reset the archive bit on all files it backs up (implies
    1022                 read/write share). </para></listitem>
     1073                <replaceable>blocksize</replaceable>*TBLOCK (512 byte) blocks. </para></listitem>
     1074                </varlistentry>
     1075
     1076                <varlistentry>
     1077                <term>tarmode &lt;full|inc|reset|noreset|system|nosystem|hidden|nohidden&gt;</term>
     1078                <listitem><para>Changes tar's behavior with regard to DOS
     1079                attributes. There are 4 modes which can be turned on or
     1080                off.</para>
     1081
     1082                <para>Incremental mode (default off). When off (using
     1083                <command>full</command>) tar will back up everything
     1084                regardless of the <emphasis>archive</emphasis> bit
     1085                setting. When on (using <command>inc</command>), tar will only
     1086                back up files with the archive bit set.</para>
     1087
     1088                <para>Reset mode (default off). When on (using
     1089                <command>reset</command>), tar will remove the archive bit on
     1090                all files it backs up (implies read/write share). Use
     1091                <command>noreset</command> to turn off.</para>
     1092
     1093                <para>System mode (default on). When off, tar will not backup
     1094                system files. Use <command>nosystem</command> to turn off.</para>
     1095
     1096                <para>Hidden mode (default on). When off, tar will not backup
     1097                hidden files. Use <command>nohidden</command> to turn off.</para>
     1098                </listitem>
     1099                </varlistentry>
     1100
     1101                <varlistentry>
     1102                <term>timeout &lt;per-operation timeout in seconds&gt;</term>
     1103                <listitem><para>This allows the user to tune the default
     1104                timeout used for each SMB request. The default setting is
     1105                20 seconds. Increase it if requests to the server sometimes
     1106                time out. This can happen when SMB3 encryption is selected
     1107                and smbclient is overwhelming the server with requests.
     1108                </para></listitem>
    10231109                </varlistentry>
    10241110
    … …  
    10451131                </varlistentry>
    10461132
     1133                <varlistentry>
     1134                <term>tcon &lt;sharename&gt;</term>
     1135                <listitem><para>Establishes a new tree connect (connection to a share).
     1136                Replaces the current tree connect. Prints the new tid (tree id).
     1137                Used for internal Samba testing purposes.
     1138                </para></listitem>
     1139                </varlistentry>
     1140
     1141                <varlistentry>
     1142                <term>tdis</term>
     1143                <listitem><para>Close the current share connection (tree disconnect).
     1144                Used for internal Samba testing purposes.
     1145                </para></listitem>
     1146                </varlistentry>
     1147
     1148                <varlistentry>
     1149                <term>tid &lt;number&gt;</term>
     1150                <listitem><para>Changes the current tree id (tid) in the
     1151                protocol to a new arbitrary number. Without an argument, it
     1152                prints out the tid currently used.
     1153                Used for internal Samba testing purposes.
     1154                </para></listitem>
     1155                </varlistentry>
     1156
    10471157        </variablelist>
    10481158</refsect1>
    … …  
    10611171        name that would be known to the server.</para>
    10621172
    1063         <para>smbclient supports long file names where the server 
     1173        <para>smbclient supports long file names where the server
    10641174        supports the LANMAN2 protocol or above. </para>
    10651175</refsect1>
    … …  
    10681178        <title>ENVIRONMENT VARIABLES</title>
    10691179
    1070         <para>The variable <envar>USER</envar> may contain the 
    1071         username of the person  using the client. This information is
    1072         used only if the protocol  level is high enough to support 
     1180        <para>The variable <envar>USER</envar> may contain the
     1181        username of the person  using the client. This information is
     1182        used only if the protocol  level is high enough to support
    10731183        session-level passwords.</para>
    10741184
    10751185
    1076         <para>The variable <envar>PASSWD</envar> may contain 
    1077         the password of the person using the client.  This information is 
    1078         used only if the protocol level is high enough to support 
     1186        <para>The variable <envar>PASSWD</envar> may contain
     1187        the password of the person using the client.  This information is
     1188        used only if the protocol level is high enough to support
    10791189        session-level passwords. </para>
    10801190
    1081         <para>The variable <envar>LIBSMB_PROG</envar> may contain 
    1082         the path, executed with system(), which the client should connect 
    1083         to instead of connecting to a server.  This functionality is primarily
    1084         intended as a development aid, and works best when using a LMHOSTS
    1085         file</para>
     1191        <para>The variable <envar>LIBSMB_PROG</envar> may contain
     1192        the path, executed with system(), which the client should connect
     1193                to instead of connecting to a server.  This functionality is primarily
     1194                intended as a development aid, and works best when using a LMHOSTS
     1195                file</para>
    10861196</refsect1>
    10871197
    … …  
    10901200        <title>INSTALLATION</title>
    10911201
    1092         <para>The location of the client program is a matter for 
     1202        <para>The location of the client program is a matter for
    10931203        individual system administrators. The following are thus
    10941204        suggestions only. </para>
    … …  
    10961206        <para>It is recommended that the smbclient software be installed
    10971207        in the <filename>/usr/local/samba/bin/</filename> or <filename>
    1098         /usr/samba/bin/</filename> directory, this directory readable 
    1099         by all, writeable only by root. The client program itself should 
    1100         be executable by all. The client should <emphasis>NOT</emphasis> be 
     1208        /usr/samba/bin/</filename> directory, this directory readable
     1209        by all, writeable only by root. The client program itself should
     1210        be executable by all. The client should <emphasis>NOT</emphasis> be
    11011211        setuid or setgid! </para>
    11021212
    1103         <para>The client log files should be put in a directory readable 
     1213        <para>The client log files should be put in a directory readable
    11041214        and writeable only by the user. </para>
    11051215
    1106         <para>To test the client, you will need to know the name of a 
     1216        <para>To test the client, you will need to know the name of a
    11071217        running SMB/CIFS server. It is possible to run <citerefentry><refentrytitle>smbd</refentrytitle>
    1108         <manvolnum>8</manvolnum></citerefentry> as an ordinary user - running that server as a daemon 
     1218        <manvolnum>8</manvolnum></citerefentry> as an ordinary user - running that server as a daemon
    11091219        on a user-accessible port (typically any port number over 1024)
    11101220        would provide a suitable test server. </para>
    … …  
    11151225        <title>DIAGNOSTICS</title>
    11161226
    1117         <para>Most diagnostics issued by the client are logged in a 
    1118         specified log file. The log file name is specified at compile time, 
     1227        <para>Most diagnostics issued by the client are logged in a
     1228        specified log file. The log file name is specified at compile time,
    11191229        but may be overridden on the command line. </para>
    11201230
    1121         <para>The number and nature of diagnostics available depends 
    1122         on the debug level used by the client. If you have problems, 
     1231        <para>The number and nature of diagnostics available depends
     1232        on the debug level used by the client. If you have problems,
    11231233        set the debug level to 3 and peruse the log files. </para>
    11241234</refsect1>
    … …  
    11341244<refsect1>
    11351245        <title>AUTHOR</title>
    1136        
    1137         <para>The original Samba software and related utilities 
     1246
     1247        <para>The original Samba software and related utilities
    11381248        were created by Andrew Tridgell. Samba is now developed
    1139         by the Samba Team as an Open Source project similar 
     1249        by the Samba Team as an Open Source project similar
    11401250        to the way the Linux kernel is developed.</para>
    1141        
    1142         <para>The original Samba man pages were written by Karl Auer. 
    1143         The man page sources were converted to YODL format (another 
     1251
     1252        <para>The original Samba man pages were written by Karl Auer.
     1253        The man page sources were converted to YODL format (another
    11441254        excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
    1145         ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0 
    1146         release by Jeremy Allison.  The conversion to DocBook for
     1255        ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
     1256        release by Jeremy Allison.      The conversion to DocBook for
    11471257        Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2 for Samba 3.0
    11481258        was done by Alexander Bokovoy.</para>

  • vendor/current/docs-xml/manpages/smbcontrol.1.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2020        <cmdsynopsis>
    2121                <command>smbcontrol</command>
    22                 <arg>-i</arg>
    2322                <arg>-s</arg>
     23                <arg>-t|--timeout</arg>
    2424        </cmdsynopsis>
    2525       
    … …  
    5050
    5151        <variablelist>
    52                 &stdarg.help;
     52                &popt.autohelp;
    5353                &stdarg.configfile;
    54                 <varlistentry>
    55                 <term>-i</term>
    56                 <listitem><para>Run interactively. Individual commands
    57                 of the form destination message-type parameters can be entered
    58                 on STDIN. An empty command line or a "q" will quit the
    59                 program.</para></listitem>
     54                &popt.common.samba.client;
     55                <varlistentry>
     56                <term>-t|--timeout</term>
     57                <listitem><para>
     58                                Set timeout to seconds.
     59                </para></listitem>
    6060                </varlistentry>
    6161
    6262                <varlistentry>
    6363                <term>destination</term>
    64                 <listitem><para>One of <parameter>nmbd</parameter>, <parameter>smbd</parameter> or a process ID.</para>
     64                <listitem><para>One of <parameter>nmbd</parameter>,
     65                <parameter>smbd</parameter>, <parameter>winbindd</parameter>
     66                or a process ID.</para>
    6567
    6668                <para>The <parameter>all</parameter> destination causes the
    … …  
    130132
    131133        <varlistentry>
     134        <term>kill-client-ip</term>
     135        <listitem><para>Order smbd to close the client connections from a
     136        given IP address. This message-type takes an argument of the IP
     137        address from which client connections will be closed. This message
     138        can only be sent to <constant>smbd</constant>.</para>
     139        </listitem>
     140        </varlistentry>
     141
     142        <varlistentry>
    132143        <term>force-election</term>
    133144        <listitem><para>This message causes the <command>nmbd</command> daemon to
    … …  
    224235
    225236        <varlistentry>
    226         <term>samsync</term>
    227         <listitem><para>Order smbd to synchronise sam database from PDC (being BDC). Can only be sent to <constant>smbd</constant>. </para>
    228         <note><para>Not working at the moment</para></note>
    229         </listitem>
    230         </varlistentry>
    231 
    232         <varlistentry>
    233         <term>samrepl</term>
    234         <listitem><para>Send sam replication message, with specified serial. Can only be sent to <constant>smbd</constant>. Should not be used manually.</para></listitem>
    235         </varlistentry>
    236 
    237         <varlistentry>
    238237        <term>dmalloc-mark</term>
    239238        <listitem><para>Set a mark for dmalloc. Can be sent to both smbd and nmbd. Only available if samba is built with dmalloc support. </para></listitem>
    … …  
    270269        <listitem><para>Force daemon to reload smb.conf configuration file. Can be sent
    271270        to <constant>smbd</constant>, <constant>nmbd</constant>, or <constant>winbindd</constant>.
     271        </para></listitem>
     272        </varlistentry>
     273
     274        <varlistentry>
     275        <term>reload-printers</term>
     276        <listitem><para>Force smbd to reload printers. Can only be sent to
     277        <constant>smbd</constant>.
    272278        </para></listitem>
    273279        </varlistentry>
    … …  
    299305        </varlistentry>
    300306
     307        <varlistentry>
     308        <term>num-children</term>
     309        <listitem><para>Query the number of smbd child processes. This
     310        message can only be sent
     311        to <constant>smbd</constant>.</para></listitem>
     312        </varlistentry>
     313
    301314</variablelist>
    302315</refsect1>

  • vendor/current/docs-xml/manpages/smbcquotas.1.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2121                <command>smbcquotas</command>
    2222                <arg choice="req">//server/share</arg>
    23                 <arg choice="opt">-u user</arg>
    24                 <arg choice="opt">-L</arg>
    25                 <arg choice="opt">-F</arg>
    26                 <arg choice="opt">-S QUOTA_SET_COMMAND</arg>
    27                 <arg choice="opt">-n</arg>
    28                 <arg choice="opt">-t</arg>
    29                 <arg choice="opt">-v</arg>
     23                <arg choice="opt">-u|--user user</arg>
     24                <arg choice="opt">-L|--list</arg>
     25                <arg choice="opt">-F|--fs</arg>
     26                <arg choice="opt">-S|--set QUOTA_SET_COMMAND</arg>
     27                <arg choice="opt">-n|--numeric</arg>
     28                <arg choice="opt">-t|--test-args</arg>
     29                <arg choice="opt">-v|--verbose</arg>
    3030
    3131                <arg choice="opt">-d debuglevel</arg>
    … …  
    6161        <variablelist>
    6262                <varlistentry>
    63                 <term>-u user</term>
     63                <term>-u|--user user</term>
    6464                <listitem><para> Specifies the user of whom the quotas are get or set.
    6565                By default the current user's username will be used.</para></listitem>
    … …  
    6969               
    7070                <varlistentry>
    71                 <term>-L</term>
     71                <term>-L|--list</term>
    7272                <listitem><para>Lists all quota records of the share.</para></listitem>
    7373                </varlistentry>
    … …  
    7676               
    7777                <varlistentry>
    78                 <term>-F</term>
     78                <term>-F|--fs</term>
    7979                <listitem><para>Show the share quota status and default limits.</para></listitem>
    8080                </varlistentry>
    … …  
    8383               
    8484                <varlistentry>
    85                 <term>-S QUOTA_SET_COMMAND</term>
     85                <term>-S|--set QUOTA_SET_COMMAND</term>
    8686                <listitem><para>This command sets/modifies quotas for a user or on the share,
    8787                depending on the QUOTA_SET_COMMAND parameter which is described later.</para></listitem>
    … …  
    9090               
    9191                <varlistentry>
    92                 <term>-n</term>
     92                <term>-n|--numeric</term>
    9393                <listitem><para>This option displays all QUOTA information in numeric
    9494                format.  The default is to convert SIDs to names and QUOTA limits
    … …  
    9797
    9898                <varlistentry>
    99                 <term>-t</term>
     99                <term>-t|--test-args</term>
    100100                <listitem><para>
    101101                Don't actually do anything, only validate the correctness of the arguments.
    … …  
    104104
    105105                <varlistentry>
    106                 <term>-v</term>
     106                <term>-v|--verbose</term>
    107107                <listitem><para>
    108108                Be verbose.
    … …  
    110110                </varlistentry>
    111111                               
    112                 &stdarg.help;
     112
    113113                &stdarg.server.debug;
    114114                &popt.common.samba;
    115115                &popt.common.credentials;
     116                &popt.autohelp;
     117
    116118        </variablelist>
    117119</refsect1>

  • vendor/current/docs-xml/manpages/smbd.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2020        <cmdsynopsis>
    2121                <command>smbd</command>
    22                 <arg choice="opt">-D</arg>
    23                 <arg choice="opt">-F</arg>
    24                 <arg choice="opt">-S</arg>
    25                 <arg choice="opt">-i</arg>
    26                 <arg choice="opt">-h</arg>
     22                <arg choice="opt">-D|--daemon</arg>
     23                <arg choice="opt">-F|--foreground</arg>
     24                <arg choice="opt">-S|--log-stdout</arg>
     25                <arg choice="opt">-i|--interactive</arg>
    2726                <arg choice="opt">-V</arg>
    28                 <arg choice="opt">-b</arg>
     27                <arg choice="opt">-b|--build-options</arg>
    2928                <arg choice="opt">-d &lt;debug level&gt;</arg>
    30                 <arg choice="opt">-l &lt;log directory&gt;</arg>
     29                <arg choice="opt">-l|--log-basename &lt;log directory&gt;</arg>
    3130                <arg choice="opt">-p &lt;port number(s)&gt;</arg>
    3231                <arg choice="opt">-P &lt;profiling level&gt;</arg>
    33                 <arg choice="opt">-O &lt;socket option&gt;</arg>
    3432                <arg choice="opt">-s &lt;configuration file&gt;</arg>
     33                <arg choice="opt">--no-process-group</arg>
    3534        </cmdsynopsis>
    3635</refsynopsisdiv>
    … …  
    8281        <variablelist>
    8382                <varlistentry>
    84                 <term>-D</term>
     83                <term>-D|--daemon</term>
    8584                <listitem><para>If specified, this parameter causes
    8685                the server to operate as a daemon. That is, it detaches
    … …  
    9594
    9695                <varlistentry>
    97                 <term>-F</term>
     96                <term>-F|--foreground</term>
    9897                <listitem><para>If specified, this parameter causes
    9998                the main <command>smbd</command> process to not daemonize,
    … …  
    110109
    111110                <varlistentry>
    112                 <term>-S</term>
     111                <term>-S|--log-stdout</term>
    113112                <listitem><para>If specified, this parameter causes
    114113                <command>smbd</command> to log to standard output rather
    … …  
    117116
    118117                <varlistentry>
    119                 <term>-i</term>
     118                <term>-i|--interactive</term>
    120119                <listitem><para>If this parameter is specified it causes the
    121120                server to run "interactively", not as a daemon, even if the
    122121                server is executed on the command line of a shell. Setting this
    123122                parameter negates the implicit daemon mode when run from the
    124                 command line. <command>smbd</command> also logs to standard
    125                 output, as if the <command>-S</command> parameter had been
    126                 given.
    127                 </para></listitem>
    128                 </varlistentry>
    129                
     123                command line. <command>smbd</command> will only accept one
     124                connection and terminate. It will also log to standard output,
     125                as if the <command>-S</command> parameter had been given.
     126                </para></listitem>
     127                </varlistentry>
     128
    130129                &stdarg.server.debug;
    131130                &popt.common.samba;
    132                 &stdarg.help;
    133 
    134                 <varlistentry>
    135                 <term>-b</term>
     131                &popt.autohelp;
     132
     133                <varlistentry>
     134                <term>--no-process-group</term>
     135                <listitem><para>Do not create a new process group for smbd.
     136                </para></listitem>
     137                </varlistentry>
     138
     139                <varlistentry>
     140                <term>-b|--build-options</term>
    136141                <listitem><para>Prints information about how
    137142                Samba was built.</para></listitem>
    … …  
    310315</varlistentry>
    311316
    312 <varlistentry><term>connections.tdb</term>
    313 <listitem><para>share connections (used to enforce max connections, etc...)</para></listitem>
    314 </varlistentry>
    315 
    316317<varlistentry><term>gencache.tdb</term>
    317318<listitem><para>generic caching db</para></listitem>
    … …  
    358359</varlistentry>
    359360
    360 <varlistentry><term>sessionid.tdb</term>
     361<varlistentry><term>smbXsrv_session_global.tdb</term>
    361362<listitem><para>session information (e.g. support for 'utmp = yes')</para></listitem>
     363</varlistentry>
     364
     365<varlistentry><term>smbXsrv_tcon_global.tdb</term>
     366<listitem><para>share connections (used to enforce max connections, etc...)</para></listitem>
     367</varlistentry>
     368
     369<varlistentry><term>smbXsrv_open_global.tdb</term>
     370<listitem><para>open file handles (used durable handles, etc...)</para></listitem>
    362371</varlistentry>
    363372
    … …  
    418427        <manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
    419428        <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testparm</refentrytitle>
    420         <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testprns</refentrytitle>
    421429        <manvolnum>1</manvolnum></citerefentry>, and the
    422430        Internet RFC's  <filename>rfc1001.txt</filename>, <filename>rfc1002.txt</filename>.

  • vendor/current/docs-xml/manpages/smbget.1.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2323                <arg choice="opt">-r, --resume</arg>
    2424                <arg choice="opt">-R, --recursive</arg>
    25                 <arg choice="opt">-u, --username=STRING</arg>
    26                 <arg choice="opt">-p, --password=STRING</arg>
     25                <arg choice="opt">-U, --username=STRING</arg>
    2726                <arg choice="opt">-w, --workgroup=STRING</arg>
    2827                <arg choice="opt">-n, --nonprompt</arg>
    2928                <arg choice="opt">-d, --debuglevel=INT</arg>
    3029                <arg choice="opt">-D, --dots</arg>
    31                 <arg choice="opt">-P, --keep-permissions</arg>
    3230                <arg choice="opt">-o, --outputfile</arg>
    3331                <arg choice="opt">-f, --rcfile</arg>
    … …  
    3634                <arg choice="opt">-b, --blocksize</arg>
    3735                <arg choice="opt">-O, --stdout</arg>
     36                <arg choice="opt">-u, --update</arg>
    3837                <arg choice="opt">-?, --help</arg>
    3938                <arg choice="opt">--usage</arg>
    … …  
    7877
    7978        <varlistentry>
    80                 <term>-u, --username=STRING</term>
    81                 <listitem><para>Username to use</para></listitem>
    82         </varlistentry>
    83 
    84         <varlistentry>
    85                 <term>-p, --password=STRING</term>
    86                 <listitem><para>Password to use</para></listitem>
     79                <term> -U, --username=<replaceable>username[%password]</replaceable></term>
     80                <listitem><para>Username (and password) to use</para></listitem>
    8781        </varlistentry>
    8882
    … …  
    108102
    109103        <varlistentry>
    110                 <term>-P, --keep-permissions</term>
    111                 <listitem><para>Set same permissions on local file as are set on remote file.</para></listitem>
    112         </varlistentry>
    113 
    114         <varlistentry>
    115104                <term>-o, --outputfile</term>
    116105                <listitem><para>Write the file that is being downloaded to the specified file. Can not be used together with -R.</para></listitem>
    … …  
    151140                <listitem><para>Display brief usage message</para></listitem>
    152141        </varlistentry>
     142
     143        <varlistentry>
     144                <term>-u, --update</term>
     145                <listitem><para>Download only when remote file is newer than local file or local file is missing.</para></listitem>
     146        </varlistentry>
     147
     148        &stdarg.encrypt;
     149
    153150</refsect1>
    154151

  • vendor/current/docs-xml/manpages/smbgetrc.5.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    5454                </varlistentry>
    5555
    56                 <varlistentry><term>username <replaceable>name</replaceable></term>
    57                         <listitem><para>Username to use when logging in to the remote server. Use an empty string for anonymous access.
     56                <varlistentry><term>user <replaceable>name[%password]</replaceable></term>
     57                        <listitem><para>Username (and password) to use when logging in to the remote server. Use an empty string for anonymous access.
    5858                        </para></listitem>
    59                 </varlistentry>
    60 
    61                 <varlistentry><term>password <replaceable>pass</replaceable></term>
    62                         <listitem><para>Password to use when logging in.</para></listitem>
    6359                </varlistentry>
    6460

  • vendor/current/docs-xml/manpages/smbpasswd.5.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    4040        is very similar to the familiar Unix <filename>passwd(5)</filename>
    4141        file. It is an ASCII file containing one line for each user. Each field
    42         ithin each line is separated from the next by a colon. Any entry
     42        within each line is separated from the next by a colon. Any entry
    4343        beginning with '#' is ignored. The smbpasswd file contains the
    4444        following information for each user: </para>

  • vendor/current/docs-xml/manpages/smbpasswd.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    327327                switch is used to specify the password to be used with the
    328328                <smbconfoption name="ldap admin dn"/>.  Note that the password is stored in
    329                 the <filename>secrets.tdb</filename> and is keyed off 
     329                the <filename>secrets.tdb</filename> and is keyed off
    330330                of the admin's DN.  This means that if the value of <parameter>ldap
    331331                admin dn</parameter> ever changes, the password will need to be

  • vendor/current/docs-xml/manpages/smbspool.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    5151                <listitem><para>smb://workgroup/server[:port]/printer</para></listitem>
    5252                <listitem><para>smb://username:password@server[:port]/printer</para></listitem>
     53                <listitem><para>smb://domain\username:password@server[:port]/printer</para></listitem>
    5354                <listitem><para>smb://username:password@workgroup/server[:port]/printer</para></listitem>
    5455        </itemizedlist>
    … …  
    6364        <envar>DEVICE_URI</envar> environment variable prior to
    6465        running smbspool.</para>
     66
     67        <para>smbspool will accept URI escaped characters.  This allows setting
     68        a domain in the username, or space in the printer name. For example
     69        smb://domain%5Cusername/printer%20name</para>
    6570</refsect1>
    6671

  • vendor/current/docs-xml/manpages/smbstatus.1.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2828                <arg choice="opt">-p</arg>
    2929                <arg choice="opt">-S</arg>
     30                <arg choice="opt">-N</arg>
     31                <arg choice="opt">-f</arg>
    3032                <arg choice="opt">-s &lt;configuration file&gt;</arg>
    3133                <arg choice="opt">-u &lt;username&gt;</arg>
     34                <arg choice="opt">-n|--numeric</arg>
     35                <arg choice="opt">-R|--profile-rates</arg>
    3236        </cmdsynopsis>
    3337</refsynopsisdiv>
    … …  
    4953                <varlistentry>
    5054                <term>-P|--profile</term>
    51                 <listitem><para>If samba has been compiled with the 
    52                 profiling option, print only the contents of the profiling 
     55                <listitem><para>If samba has been compiled with the
     56                profiling option, print only the contents of the profiling
    5357                shared memory area.</para></listitem>
     58                </varlistentry>
     59
     60                <varlistentry>
     61                <term>-R|--profile-rates</term>
     62                <listitem><para>If samba has been compiled with the
     63                profiling option, print the contents of the profiling
     64                shared memory area and the call rates.</para></listitem>
    5465                </varlistentry>
    5566
    … …  
    96107                </varlistentry>
    97108
     109                <varlistentry>
     110                <term>-N|--notify</term>
     111                <listitem><para>causes smbstatus to display registered file
     112                notifications</para>
     113                </listitem>
     114                </varlistentry>
     115
     116                <varlistentry>
     117                <term>-f|--fast</term>
     118                <listitem><para>causes smbstatus to not check if the status data
     119                is valid by checking if the processes that the status data refer to all still
     120                exist. This speeds up execution on busy systems and clusters but
     121                might display stale data of processes that died without cleaning up properly.</para>
     122                </listitem>
     123                </varlistentry>
     124
    98125                &stdarg.help;
    99126
    … …  
    101128                <term>-u|--user=&lt;username&gt;</term>
    102129                <listitem><para>selects information relevant to <parameter>username</parameter> only.</para>
     130                </listitem>
     131                </varlistentry>
     132
     133                <varlistentry>
     134                <term>-n|--numeric</term>
     135                <listitem><para>causes smbstatus to display numeric UIDs and GIDs instead of
     136                                resolving them to names.</para>
    103137                </listitem>
    104138                </varlistentry>

  • vendor/current/docs-xml/manpages/smbtar.1.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/smbtree.1.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    7171                &popt.common.samba;
    7272                &popt.common.credentials;
    73                 &stdarg.help;
     73                &popt.autohelp;
    7474               
    7575        </variablelist>

  • vendor/current/docs-xml/manpages/testparm.1.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2121        <cmdsynopsis>
    2222                <command>testparm</command>
    23                 <arg choice="opt">-s</arg>
    24                 <arg choice="opt">-h</arg>
    25                 <arg choice="opt">-v</arg>
    26                 <arg choice="opt">-t &lt;encoding&gt;</arg>
     23                <arg choice="opt">-s|--suppress-prompt</arg>
     24                <arg choice="opt">--help</arg>
     25                <arg choice="opt">-v|--verbose</arg>
    2726                <arg choice="req">config filename</arg>
    2827                <arg choice="opt">hostname hostIP</arg>
    … …  
    6463        <variablelist>
    6564                <varlistentry>
    66                 <term>-s</term>
     65                <term>-s|--suppress-prompt</term>
    6766                <listitem><para>Without this option, <command>testparm</command>
    6867                will prompt for a carriage return after printing the service
    … …  
    7069                </varlistentry>
    7170
    72                 &stdarg.help;
    7371                &stdarg.version;
    74                
    75                 <varlistentry>
    76                 <term>-v</term>
     72                &stdarg.option;
     73                &popt.autohelp;
     74                &stdarg.client.debug;
     75
     76                <varlistentry>
     77                <term>-v|--verbose</term>
    7778                <listitem><para>If this option is specified, testparm
    7879                will also output all options that were not used in <citerefentry>
    … …  
    8283
    8384                <varlistentry>
    84                 <term>-t encoding</term>
    85                 <listitem><para>
    86                 Output data in specified encoding.
    87                 </para></listitem>
    88                 </varlistentry>
    89 
    90                 <varlistentry>
    9185                <term>--parameter-name parametername</term>
    9286                <listitem><para>
    … …  
    10498                <listitem><para>
    10599                Dumps the named section.
     100                </para></listitem>
     101                </varlistentry>
     102
     103                <varlistentry>
     104                <term>--show-all-parameters</term>
     105                <listitem><para>
     106                                Show the parameters, type, possible values.
     107                </para></listitem>
     108                </varlistentry>
     109
     110                <varlistentry>
     111                <term>-l|--skip-logic-checks</term>
     112                <listitem><para>
     113                                Skip the global checks.
    106114                </para></listitem>
    107115                </varlistentry>

  • vendor/current/docs-xml/manpages/vfs_acl_tdb.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/vfs_acl_xattr.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/vfs_aio_fork.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    7070        <title>VERSION</title>
    7171
    72         <para>This man page is correct for version 3.6.0 of the Samba suite.
     72        <para>This man page is correct for version 4.0.0 of the Samba suite.
    7373        </para>
    7474</refsect1>

  • vendor/current/docs-xml/manpages/vfs_aio_pthread.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    104104        <title>VERSION</title>
    105105
    106         <para>This man page is correct for version 3.6.3 of the Samba suite.
     106        <para>This man page is correct for version 4.0 of the Samba suite.
    107107        </para>
    108108</refsect1>

  • vendor/current/docs-xml/manpages/vfs_audit.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/vfs_cacheprime.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    8585<refsect1>
    8686        <title>CAVEATS</title>
    87         <para><command>cacheprime</command> is not a a substitute for
     87        <para><command>cacheprime</command> is not a substitute for
    8888        a general-purpose readahead mechanism. It is intended for use
    8989        only in very specific environments where disk operations must

  • vendor/current/docs-xml/manpages/vfs_cap.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/vfs_catia.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    3838        <para>This module is stackable.</para>
    3939
    40         <para>Up to samba version 3.4.x a fixed character mapping was used.
    41         The invalid windows characters  \ / : * ? " &lt; &gt; | and the blank
    42         character were mapped in a hardcoded way.
     40        <para>The parameter "catia:mappings" specifies the mapping on a
     41        per-character basis, see below.
    4342        </para>
    44 
    45         <para>Starting with samba-3.5.0 a more flexible mapping was introduced.
    46         The new parameter "catia:mappings" now specifies the mapping on a char by char
    47         basis using the notation: unix hex char 0x.. : windows hex char 0x..
    48         Multiple character mappings are separated by a comma.
    49         </para>
     43</refsect1>
    5044
    5145
     46
     47<refsect1>
     48        <title>OPTIONS</title>
     49        <variablelist>
     50                <varlistentry>
     51                <term>catia:mappings = SERVER_HEX_CHAR:CLIENT_HEX_CHAR
     52                </term>
     53                <listitem>
     54                <para>SERVER_HEX_CHAR specifies a 0x prefixed hexedecimal
     55                character code that, when included in a Samba server-side
     56                filename, will be mapped to CLIENT_HEX_CHAR for the CIFS
     57                client.</para>
     58                <para>The same mapping occurs in the opposite direction.
     59                Multiple character mappings are separated by a comma.</para>
     60                </listitem>
     61                </varlistentry>
     62        </variablelist>
    5263</refsect1>
     64
    5365
    5466
    … …  
    5668        <title>EXAMPLES</title>
    5769
    58         <para>Samba versions up to 3.4.x:</para>
    59         <para>Map Catia filenames on the [CAD] share:</para>
    60 
    61 <programlisting>
    62         <smbconfsection name="[CAD]"/>
    63         <smbconfoption name="path">/data/cad</smbconfoption>
    64         <smbconfoption name="vfs objects">catia</smbconfoption>
    65 </programlisting>
    66 
    67         <para>Samba versions 3.5.0 and later:</para>
    68         <para>Map Catia filenames on the [CAD] share:</para>
     70        <para>Map server-side quotation-marks (") to client-side diaeresis
     71        (&#x00a8;) on filenames in the [CAD] share:</para>
    6972
    7073<programlisting>
    … …  
    7578</programlisting>
    7679
    77         <para>To get the full formerly fixed mappings:</para>
     80        <para>Perform comprehensive mapping of common Catia filename characters:</para>
    7881<programlisting>
    7982        <smbconfsection name="[CAD]"/>
    8083        <smbconfoption name="path">/data/cad</smbconfoption>
    8184        <smbconfoption name="vfs objects">catia</smbconfoption>
    82         <smbconfoption name="catia:mappings">0x22:0xa8,0x2a:0xa4,0x2f:0xf8,0x3a:0xf7,0x3c:0xab,0x3e:0xbb,0x3f:0xbf,0x5c:0xff,0x7c:0xa6,0x20:0xb1</smbconfoption>
     85        <smbconfoption name="catia:mappings">0x22:0xa8,0x2a:0xa4,0x2f:0xf8,0x3a:0xf7,0x3c:0xab,0x3e:0xbb,0x3f:0xbf,0x5c:0xff,0x7c:0xa6</smbconfoption>
    8386</programlisting>
    8487
    85         <para>Unix filename to be translated (Note that the path delimiter "/" is not used here):
     88        <para>Server-side filename to be translated (Note that the path delimiter "/" is not used here):
    8689        </para>
    87         <para>a\a:a*a?a"a&lt;a&gt;a|a a</para>
     90        <para>a\a:a*a?a"a&lt;a&gt;a|a</para>
    8891
    89         <para>Resulting windows filename:</para>
     92        <para>Resulting filename, as seen by the client:</para>
    9093
    91         <para>a&#x00ff;a&#x00f7;a&#x00a4;a&#x00bf;a&#x00a8;a&#x00ab;a&#x00bb;a&#x00a6;a&#x00b1;a
     94        <para>a&#x00ff;a&#x00f7;a&#x00a4;a&#x00bf;a&#x00a8;a&#x00ab;a&#x00bb;a&#x00a6;a
    9295        </para>
     96</refsect1>
    9397
    94         <para>Note that the character mapping must work in BOTH directions
    95         (unix -&gt; windows and windows -&gt; unix) to get unique and existing file names!
     98<refsect1>
     99        <title>CAVEATS</title>
     100
     101        <para>Character mapping must work in BOTH directions (server -&gt;
     102        client and client -&gt; server) to get unique and existing file names!
    96103        </para>
    97104
    … …  
    105112</programlisting>
    106113
    107          <para>Here the colon ":" is mapped to the underscore "_".</para>
    108          <para>Assuming a unix filename "a:should_work", which is well translated
    109          to windows as "a_should_work".</para>
    110          <para>BUT the reverse mapping from windows "a_should_work" to unix
    111          will result in "a:should:work" - something like "file not found"
    112          will be returned.
    113          </para>
     114        <para>Here the colon ":" is mapped to the underscore "_".</para>
     115        <para>Assuming a server-side filename "a:should_work", which is
     116        translated to "a_should_work" for the client.</para>
     117        <para>BUT the reverse mapping from client "a_should_work" to server
     118        will result in "a:should:work" - something like "file not found"
     119        will be returned.
     120        </para>
    114121
    115122</refsect1>
    … …  
    118125        <title>VERSION</title>
    119126
    120         <para>This man page is correct for all versions up to 4.0.3 of the Samba suite.
     127        <para>This man page is correct for Samba versions from 3.5.0 to 4.0.6.
    121128        </para>
    122129</refsect1>

  • vendor/current/docs-xml/manpages/vfs_commit.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/vfs_crossrename.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    102102<refsect1>
    103103        <title>VERSION</title>
    104         <para>This man page is correct for version 3.6.0 of the Samba suite.
     104        <para>This man page is correct for version 4.0.0 of the Samba suite.
    105105        </para>
    106106</refsect1>

  • vendor/current/docs-xml/manpages/vfs_default_quota.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/vfs_dirsort.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/vfs_extd_audit.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/vfs_fake_perms.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/vfs_fileid.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/vfs_full_audit.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    3939
    4040        <simplelist>
    41         <member>aio_cancel</member>
    42         <member>aio_error</member>
    43         <member>aio_fsync</member>
    44         <member>aio_read</member>
    45         <member>aio_return</member>
    46         <member>aio_suspend</member>
    47         <member>aio_write</member>
    4841        <member>chdir</member>
    4942        <member>chflags</member>
    … …  
    5447        <member>closedir</member>
    5548        <member>connect</member>
     49        <member>copy_chunk_send</member>
     50        <member>copy_chunk_recv</member>
    5651        <member>disconnect</member>
    5752        <member>disk_free</member>
    … …  
    6863        <member>fsync</member>
    6964        <member>ftruncate</member>
     65        <member>get_compression</member>
    7066        <member>get_nt_acl</member>
    7167        <member>get_quota</member>
    … …  
    7571        <member>getxattr</member>
    7672        <member>kernel_flock</member>
    77         <member>lgetxattr</member>
    7873        <member>link</member>
    7974        <member>linux_setlease</member>
    8075        <member>listxattr</member>
    81         <member>llistxattr</member>
    8276        <member>lock</member>
    83         <member>lremovexattr</member>
    8477        <member>lseek</member>
    85         <member>lsetxattr</member>
    8678        <member>lstat</member>
    8779        <member>mkdir</member>
    … …  
    10193        <member>seekdir</member>
    10294        <member>sendfile</member>
     95        <member>set_compression</member>
    10396        <member>set_nt_acl</member>
    10497        <member>set_quota</member>
    10598        <member>setxattr</member>
     99        <member>snap_check_path</member>
     100        <member>snap_create</member>
     101        <member>snap_delete</member>
    106102        <member>stat</member>
    107103        <member>statvfs</member>
    108104        <member>symlink</member>
    109         <member>sys_acl_add_perm</member>
    110         <member>sys_acl_clear_perms</member>
    111         <member>sys_acl_create_entry</member>
    112105        <member>sys_acl_delete_def_file</member>
    113         <member>sys_acl_free_acl</member>
    114         <member>sys_acl_free_qualifier</member>
    115         <member>sys_acl_free_text</member>
    116         <member>sys_acl_get_entry</member>
    117106        <member>sys_acl_get_fd</member>
    118107        <member>sys_acl_get_file</member>
    119         <member>sys_acl_get_perm</member>
    120         <member>sys_acl_get_permset</member>
    121         <member>sys_acl_get_qualifier</member>
    122         <member>sys_acl_get_tag_type</member>
    123         <member>sys_acl_init</member>
    124108        <member>sys_acl_set_fd</member>
    125109        <member>sys_acl_set_file</member>
    126         <member>sys_acl_set_permset</member>
    127         <member>sys_acl_set_qualifier</member>
    128         <member>sys_acl_set_tag_type</member>
    129         <member>sys_acl_to_text</member>
    130         <member>sys_acl_valid</member>
    131110        <member>telldir</member>
    132111        <member>unlink</member>
    … …  
    169148
    170149                <varlistentry>
    171                 <term>vfs_full_audit:prefix = STRING</term>
     150                <term>full_audit:prefix = STRING</term>
    172151                <listitem>
    173152                <para>Prepend audit messages with STRING. STRING is
    … …  
    181160
    182161                <varlistentry>
    183                 <term>vfs_full_audit:success = LIST</term>
     162                <term>full_audit:success = LIST</term>
    184163                <listitem>
    185164                <para>LIST is a list of VFS operations that should be
    186165                recorded if they succeed. Operations are specified using
    187166                the names listed above. Operations can be unset by prefixing
    188                 the names with "!".
     167                the names with "!". The default is all operations.
    189168                </para>
    190169
    … …  
    193172
    194173                <varlistentry>
    195                 <term>vfs_full_audit:failure = LIST</term>
     174                <term>full_audit:failure = LIST</term>
    196175                <listitem>
    197176                <para>LIST is a list of VFS operations that should be
    198177                recorded if they failed. Operations are specified using
    199178                the names listed above. Operations can be unset by prefixing
    200                 the names with "!".
     179                the names with "!". The default is all operations.
    201180                </para>
    202181
    … …  
    224203                </para>
    225204
     205                </listitem>
     206                </varlistentry>
     207
     208                <varlistentry>
     209                <term>full_audit:syslog = true/false</term>
     210                <listitem>
     211                <para>Log messages to syslog (default) or as a debug level 1
     212                message.
     213                </para>
     214                </listitem>
     215                </varlistentry>
     216
     217                <varlistentry>
     218                <term>full_audit:log_secdesc = true/false</term>
     219                <listitem>
     220                <para>Log an sddl form of the security descriptor coming in
     221                when a client sets an acl. Defaults to false.
     222                </para>
    226223                </listitem>
    227224                </varlistentry>

  • vendor/current/docs-xml/manpages/vfs_gpfs.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    4343        </para>
    4444
    45         <para><command>NOTE:</command>This module follows the posix-acl behaviour
     45        <para><command>NOTE:</command> This module follows the posix-acl behaviour
    4646        and hence allows permission stealing via chown. Samba might allow at a later
    4747        point in time, to restrict the chown via this module as such restrictions
    … …  
    4949        </para>
    5050
     51        <para>This module makes use of the smb.conf parameter
     52        <smbconfoption name="acl map full control"></smbconfoption>.
     53        When set to yes (the default), this parameter will add in the FILE_DELETE_CHILD
     54        bit on a returned ACE entry for a file (not a directory) that already
     55        contains all file permissions except for FILE_DELETE and FILE_DELETE_CHILD.
     56        This can prevent Windows applications that request GENERIC_ALL access
     57        from getting ACCESS_DENIED errors when running against a filesystem
     58        with NFSv4 compatible ACLs.
     59        </para>
     60
    5161        <para>This module is stackable.</para>
     62
     63        <para>Since Samba 4.0 all options are per share options.</para>
    5264
    5365</refsect1>
    … …  
    119131                </para></listitem>
    120132                <listitem><para>
    121                 <command>no</command> - Announce HSM.
    122                 </para></listitem>
    123                 </itemizedlist>
    124                 </listitem>
    125 
     133                <command>yes</command> - Announce HSM.
     134                </para></listitem>
     135                </itemizedlist>
     136                </listitem>
     137
     138                </varlistentry>
     139
     140                <varlistentry>
     141                <term>gpfs:recalls = [ yes | no ]</term>
     142                <listitem>
     143                <para> When this option is set to no, an attempt to
     144                open an offline file will be rejected with access
     145                denied.  This helps preventing recall storms triggered
     146                by careless applications like Finder and
     147                Explorer.</para>
     148
     149                <itemizedlist>
     150                <listitem><para><command>yes(default)</command> - Open
     151                files that are offline. This will recall the files
     152                from HSM.</para></listitem>
     153                <listitem><para><command>no</command> - Reject access
     154                to offline files with access denied. This will prevent
     155                recalls of files from HSM. Using this setting also
     156                requires gpfs:hsm to be set to yes.</para></listitem>
     157                </itemizedlist>
     158
     159                </listitem>
    126160                </varlistentry>
    127161
    … …  
    175209                <para>
    176210                GPFS ACLs doesn't know about the 'APPEND' right.
    177                 This optionen lets Samba map the 'APPEND' right to 'WRITE'.
     211                This option lets Samba map the 'APPEND' right to 'WRITE'.
    178212                </para>
    179213
    … …  
    184218                <listitem><para>
    185219                <command>no</command> - do not map 'APPEND' to 'WRITE'.
     220                </para></listitem>
     221                </itemizedlist>
     222                </listitem>
     223
     224                </varlistentry>
     225                <varlistentry>
     226
     227                <term>gpfs:acl = [ yes | no ]</term>
     228                <listitem>
     229                <para>
     230                This option lets Samba use or ignore GPFS ACLs.
     231                </para>
     232
     233                <itemizedlist>
     234                <listitem><para>
     235                <command>yes(default)</command> - use GPFS ACLs.
     236                </para></listitem>
     237                <listitem><para>
     238                <command>no</command> - do not use GPFS ACLs and pass everything
     239                to the next SMB_VFS module.
    186240                </para></listitem>
    187241                </itemizedlist>
    … …  
    222276                <varlistentry>
    223277
     278                <term>gpfs:dfreequota = [ yes | no ]</term>
     279                <listitem>
     280                <para>
     281                Adjust reporting of the size and free space of a share
     282                according to quotas. If this setting is "yes", a
     283                request for size and free space will also evaluate the
     284                user quota of the user requesting the data and the
     285                group quota of the primary group of the user. Fileset
     286                quotas are not queried, since GPFS already provides
     287                the option --dfreequota to reflect the fileset quota
     288                in the free space query. Please use that option to
     289                include fileset quotas in the reported disk space.
     290                </para>
     291
     292                <para>
     293                If any of the soft or hard quota limits has been
     294                reached, the free space will be reported as 0. If a
     295                quota is in place, but the limits have not been
     296                reached, the free space will be reported according to
     297                the space left in the quota. If more than one quota
     298                applies the free space will be reported as the smallest
     299                space left in those quotas. The size of the share
     300                will be reported according to the quota usage. If more
     301                than one quota applies, the smallest size will be
     302                reported for the share size according to these quotas.
     303                </para>
     304
     305                <itemizedlist>
     306                <listitem><para>
     307                <command>yes</command> - include the quotas
     308                when reporting the share size and free space
     309                </para></listitem>
     310                <listitem><para>
     311                <command>no(default)</command> - do not include quotas,
     312                simply report the size and free space of the file system
     313                </para></listitem>
     314                </itemizedlist>
     315                </listitem>
     316
     317                </varlistentry>
     318                <varlistentry>
     319
     320                <term>gpfs:prealloc = [ yes | no ]</term>
     321                <listitem>
     322                <para>
     323                If set to yes the gpfs_prealloc function will be used in the
     324                fallocate callback when appropriate. If set to no gpfs_prealloc
     325                will not be used. In both cases the system and libc calls are
     326                avoided.
     327                </para>
     328
     329                <itemizedlist>
     330                <listitem><para>
     331                <command>yes (default)</command> - Use gpfs_prealloc for the
     332                fallocate callback.
     333                </para></listitem>
     334                <listitem><para>
     335                <command>no</command> - Do not use gpfs_prealloc for the
     336                fallocate callback.
     337                </para></listitem>
     338                </itemizedlist>
     339                </listitem>
     340
     341                </varlistentry>
     342
     343                <varlistentry>
     344
     345                <term>gpfs:settimes = [ yes | no ]</term>
     346                <listitem>
     347                <para>
     348                Use the gpfs_set_times API when changing the
     349                timestamps of a file or directory. If the GPFS API is
     350                not available the old method of using utime and the
     351                GPFS winattr call will be used instead.
     352                </para>
     353
     354                <itemizedlist>
     355                <listitem><para>
     356                <command>yes(default)</command> - Use gpfs_set_times.
     357                Fall back to utime and winattr when it is not available.
     358                </para></listitem>
     359                <listitem><para>
     360                <command>no</command> - Do not use gpfs_set_times.
     361                </para></listitem>
     362                </itemizedlist>
     363                </listitem>
     364
     365                </varlistentry>
     366                <varlistentry>
     367
    224368                <term>nfs4:mode = [ simple | special ]</term>
    225369                <listitem>
    226370                <para>
    227                 Enable/Disable substitution of special IDs on GPFS. This parameter
    228                 should not affect the windows users in anyway. It only ensures that Samba
    229                 sets the special IDs - OWNER@ and GROUP@ ( mappings to simple uids )
    230                 that are relevant to GPFS.
     371                Controls substitution of special IDs (OWNER@ and GROUP@) on GPFS.
     372                The use of mode simple is recommended.
     373                In this mode only non inheriting ACL entries for the file owner
     374                and group are mapped to special IDs.
    231375                </para>
    232376
    233377                <para>The following MODEs are understood by the module:</para>
    234378                <itemizedlist>
    235                 <listitem><para><command>simple(default)</command> - do not use special IDs in GPFS ACEs</para></listitem>
    236                 <listitem><para><command>special</command> - use special IDs in GPFS ACEs. </para> </listitem>
     379                <listitem><para><command>simple(default)</command> - use OWNER@ and GROUP@ special IDs for non inheriting ACEs only.</para></listitem>
     380                <listitem><para><command>special(deprecated)</command> - use OWNER@ and GROUP@ special IDs in ACEs for all file owner and group ACEs.</para></listitem>
    237381                </itemizedlist>
    238382                </listitem>
    … …  
    288432                </para>
    289433                <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
     434                <listitem><para><command>yes</command> - Open files with O_SYNC
     435                </para></listitem>
     436                <listitem><para><command>no (default)</command> - Open files as
    293437                    normal Samba would do
    294438                </para></listitem>
    … …  
    328472        <para>
    329473        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
     474        is required, which is a symlink to <command>gpfs.h</command> in
    331475        gpfs versions newer than 3.2.1 PTF8.
    332476        </para>

  • vendor/current/docs-xml/manpages/vfs_netatalk.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/vfs_prealloc.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/vfs_preopen.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/vfs_readahead.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/vfs_readonly.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/vfs_recycle.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/vfs_shadow_copy.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    1414<refnamediv>
    1515        <refname>vfs_shadow_copy</refname>
    16         <refpurpose>Make a Samba share read only for a specified time period</refpurpose>
     16        <refpurpose>Expose snapshots to Windows clients as shadow copies.</refpurpose>
    1717</refnamediv>
    1818

  • vendor/current/docs-xml/manpages/vfs_shadow_copy2.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    1414<refnamediv>
    1515        <refname>vfs_shadow_copy2</refname>
    16         <refpurpose>Expose snapshots to Windows clients as shadow copies.</refpurpose>
     16        <refpurpose>Expose snapshots to Windows clients as shadow copies.
     17        </refpurpose>
    1718</refnamediv>
    1819
    … …  
    3031        <manvolnum>7</manvolnum></citerefentry> suite.</para>
    3132
    32         <para>The <command>vfs_shadow_copy2</command> VFS module functionality
    33         that is similar to Microsoft Shadow Copy services. When setup properly,
     33        <para>
     34        The <command>vfs_shadow_copy2</command> VFS module offers a
     35        functionality similar to Microsoft Shadow Copy services.
     36        When set up properly,
    3437        this module allows Microsoft Shadow Copy clients to browse
    35         "shadow copies" on Samba shares.
    36         </para>
    37 
    38         <para>This is a 2nd implementation of a shadow copy module. This
    39         version has the following features:</para>
     38        through file system snapshots as "shadow copies" on Samba shares.
     39        </para>
     40
     41        <para>
     42        This is a second implementation of a shadow copy module
     43        which has the following additional features (compared to the original
     44        <citerefentry><refentrytitle>shadow_copy</refentrytitle>
     45        <manvolnum>8</manvolnum></citerefentry> module):
     46        </para>
    4047        <orderedlist continuation="restarts" inheritnum="ignore" numeration="arabic">
    41         <listitem><para>You don't need to populate your shares with symlinks to the
    42         snapshots. This can be very important when you have thousands of
    43         shares, or use [homes].</para></listitem>
    44         <listitem><para>The inode number of the files is altered so it is different
    45         from the original. This allows the 'restore' button to work
    46         without a sharing violation.</para></listitem>
     48        <listitem><para>
     49        There is no need any more to populate your share's root directory
     50        with symlinks to the snapshots if the file system stores the
     51        snapshots elsewhere.
     52        Instead, you can flexibly configure the module where to look for
     53        the file system snapshots.
     54        This can be very important when you have thousands of
     55        shares, or use [homes].
     56        </para></listitem>
     57        <listitem><para>
     58        Snapshot directories need not be in one fixed central place but
     59        can be located anywhere in the directory tree. This mode helps to
     60        support file systems that offer snapshotting of particular
     61        subtrees, for example the GPFS independent file sets.
     62        </para></listitem>
     63        <listitem><para>
     64        Vanity naming for snapshots: snapshots can be named in any format
     65        compatible with str[fp]time conversions.
     66        </para></listitem>
     67        <listitem><para>
     68        Timestamps can be represented in localtime rather than UTC.
     69        </para></listitem>
     70        <listitem><para>
     71        The inode number of the files can optionally be altered to be
     72        different from the original. This fixes the 'restore' button
     73        in the Windows GUI to work without a sharing violation when
     74        serving from file systems, like GPFS, that return the same
     75        device and inode number for the snapshot file and the original.
     76        </para></listitem>
     77        <listitem><para>
     78        Shadow copy results are by default sorted before being sent to the
     79        client. This is beneficial for filesystems that don't read
     80        directories alphabetically (the default unix). Sort ordering can be
     81        configured and sorting can be turned off completely if the file
     82        system sorts its directory listing.
     83        </para></listitem>
    4784        </orderedlist>
    4885
    … …  
    5996        </para>
    6097
    61         <para>Filesystem snapshots must be mounted on
     98        <para>Filesystem snapshots must be available under
    6299        specially named directories in order to be recognized by
    63         <command>vfs_shadow_copy2</command>. The snapshot mount points must
    64         be immediate children of a the directory being shared.</para>
    65 
    66         <para>The snapshot naming convention is @GMT-YYYY.MM.DD-hh.mm.ss,
    67         where:
     100        <command>vfs_shadow_copy2</command>. These snapshot directory
     101        is typically a direct subdirectory of the share root's mountpoint
     102        but there are other modes that can be configured with the
     103        parameters described in detail below.</para>
     104
     105        <para>The snapshot at a given point in time is expected in a
     106        subdirectory of the snapshot directory where the snapshot's
     107        directory is expected to be a formatted version of the
     108        snapshot time. The default format which can be changed
     109        with the <command>shadow:format</command> option
     110        is @GMT-YYYY.MM.DD-hh.mm.ss, where:
    68111        <itemizedlist>
    69                 <listitem><para><command>YYYY</command> is the 4 digit year</para></listitem>
    70                 <listitem><para><command>MM</command> is the 2 digit month</para></listitem>
    71                 <listitem><para><command>DD</command> is the 2 digit day</para></listitem>
    72                 <listitem><para><command>hh</command> is the 2 digit hour</para></listitem>
    73                 <listitem><para><command>mm</command> is the 2 digit minute</para></listitem>
    74                 <listitem><para><command>ss</command> is the 2 digit second.</para></listitem>
    75                 </itemizedlist>
    76         </para>
    77 
    78         <para>The <command>vfs_shadow_copy2</command> snapshot naming convention can be
    79         produced with the following <citerefentry><refentrytitle>date</refentrytitle>
     112        <listitem><para><command>YYYY</command> is the 4 digit year</para></listitem>
     113        <listitem><para><command>MM</command> is the 2 digit month</para></listitem>
     114        <listitem><para><command>DD</command> is the 2 digit day</para></listitem>
     115        <listitem><para><command>hh</command> is the 2 digit hour</para></listitem>
     116        <listitem><para><command>mm</command> is the 2 digit minute</para></listitem>
     117        <listitem><para><command>ss</command> is the 2 digit second.</para></listitem>
     118        </itemizedlist>
     119        </para>
     120
     121        <para>The <command>vfs_shadow_copy2</command> snapshot naming
     122        convention can be produced with the following
     123        <citerefentry><refentrytitle>date</refentrytitle>
    80124        <manvolnum>1</manvolnum></citerefentry> command:
    81125        <programlisting>
    … …  
    90134        <variablelist>
    91135                <varlistentry>
     136                <term>shadow:mountpoint = MOUNTPOINT
     137                </term>
     138                <listitem>
     139                <para>
     140                With this parameter, one can specify the mount point
     141                of the filesystem that contains the share path.
     142                Usually this mount point is automatically detected.
     143                But for some constellations, in particular tests,
     144                it can be convenient to be able to specify it.
     145                </para>
     146                <para>Example: shadow:mountpoint = /path/to/filesystem</para>
     147                <para>Default: shadow:mountpoint = NOT SPECIFIED</para>
     148                </listitem>
     149                </varlistentry>
     150
     151                <varlistentry>
    92152                <term>shadow:snapdir = SNAPDIR
    93153                </term>
    94154                <listitem>
    95                 <para>Path to the directory where snapshots are kept.
    96                 </para>
     155                <para>
     156                Path to the directory where the file system of
     157                the share keeps its snapshots.
     158                If an absolute path is specified, it is used as-is.
     159                If a relative path is specified, then it is taken
     160                relative to the mount point of the filesystem of
     161                the share root. (See <command>shadow:mountpoint</command>.)
     162                </para>
     163                <para>
     164                Note that <command>shadow:snapdirseverywhere</command>
     165                depends on this parameter and needs a relative path.
     166                Setting an absolute path disables
     167                <command>shadow:snapdirseverywhere</command>.
     168                </para>
     169                <para>
     170                Note that the <command>shadow:crossmountpoints</command>
     171                option also requires a relative snapdir.
     172                Setting an absolute path disables
     173                <command>shadow:crossmountpoints</command>.
     174                </para>
     175                <para>Example: shadow:snapdir = /some/absolute/path</para>
     176                <para>Default: shadow:snapdir = .snapshots</para>
    97177                </listitem>
    98178                </varlistentry>
    … …  
    102182                </term>
    103183                <listitem>
    104                 <para>Path to the base directory that snapshots are from.
     184                <para>
     185                The basedir option allows one to specify a directory
     186                between the share's mount point and the share root,
     187                relative to which the file system's snapshots are taken.
     188                </para>
     189                <para>
     190                For example, if
     191                <itemizedlist>
     192                <listitem><para>
     193                <command>basedir = mountpoint/rel_basedir</command>
     194                </para></listitem>
     195                <listitem><para>
     196                <command>share_root = basedir/rel_share_root</command>
     197                </para></listitem>
     198                <listitem><para>
     199                <command>snapshot_path = mountpoint/snapdir</command>
     200                </para>
     201                <para>
     202                or
     203                <command>snapshot_path = snapdir</command>
     204                if snapdir is absolute
     205                </para></listitem>
     206                </itemizedlist>
     207                then the snapshot of a
     208                <command>file = mountpoint/rel_basedir/rel_share_root/rel_file</command>
     209                at a time TIME will be found under
     210                <command>snapshot_path/FS_GMT_TOKEN(TIME)/rel_share_root/rel_file</command>,
     211                where FS_GMT_TOKEN(TIME) is the timestamp string belonging
     212                to TIME in the format required by the file system.
     213                (See <command>shadow:format</command>.)
     214                </para>
     215                <para>The default for the basedir is the mount point
     216                of the file system of the share root
     217                (see <command>shadow:mountpoint</command>).
     218                </para>
     219                <para>
     220                Note that the <command>shadow:snapdirseverywhere</command>
     221                and  <command>shadow:crossmountpoints</command>
     222                options are incompatible with <command>shadow:basedir</command>
     223                and disable the basedir setting.
     224                </para>
     225                </listitem>
     226                </varlistentry>
     227
     228                <varlistentry>
     229                <term>shadow:snapsharepath = SNAPSHAREPATH
     230                </term>
     231                <listitem>
     232                <para>
     233                With this parameter, one can specify the path of the share's
     234                root directory in snapshots, relative to the snapshot's
     235                root directory. It is an alternative method to
     236                <command>shadow:basedir</command>, allowing greater control.
     237                </para>
     238                <para>
     239                For example, if within each
     240                snapshot the files of the share have a
     241                <command>path/to/share/</command> prefix, then
     242                <command>shadow:snapsharepath</command> can be
     243                set to <command>path/to/share</command>.
     244                </para>
     245                <para>
     246                With this parameter, it is no longer assumed that a
     247                snapshot represents an image of the original file system or
     248                a portion of it. For example, a system could perform
     249                backups of only files contained in shares, and then
     250                expose the backup files in a logical structure:
     251                </para>
     252                <itemizedlist>
     253                <listitem><para>share1/</para></listitem>
     254                <listitem><para>share2/</para></listitem>
     255                <listitem><para>.../</para></listitem>
     256                </itemizedlist>
     257                <para>
     258                Note that the <command>shadow:snapdirseverywhere</command>
     259                and the <command>shadow:basedir</command> options
     260                are incompatible with <command>shadow:snapsharepath</command>
     261                and disable <command>shadow:snapsharepath</command> setting.
     262                </para>
     263                <para>Example: shadow:snapsharepath = path/to/share</para>
     264                <para>Default: shadow:snapsharepath = NOT SPECIFIED</para>
     265                </listitem>
     266                </varlistentry>
     267
     268                <varlistentry>
     269                <term>shadow:sort = asc/desc
     270                </term>
     271                <listitem>
     272                <para>By default, this module sorts the shadow copy data
     273                alphabetically before sending it to the client.
     274                With this parameter, one can specify the sort order.
     275                Possible known values are desc (descending, the default)
     276                and asc (ascending). If the file system lists directories
     277                alphabetically sorted, one can turn off sorting in this
     278                module by specifying any other value.
     279                </para>
     280                <para>Example: shadow:sort = asc</para>
     281                <para>Example: shadow:sort = none</para>
     282                <para>Default: shadow:sort = desc</para>
     283                </listitem>
     284                </varlistentry>
     285
     286                <varlistentry>
     287                <term>shadow:localtime = yes/no
     288                </term>
     289                <listitem>
     290                <para>This is an optional parameter that indicates whether the
     291                snapshot names are in UTC/GMT or in local time. If it is
     292                disabled then UTC/GMT is expected.
    105293                </para>
    106                 </listitem>
    107                 </varlistentry>
    108 
    109                 <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.
     294                <para>shadow:localtime = no</para>
     295                </listitem>
     296                </varlistentry>
     297
     298                <varlistentry>
     299                <term>shadow:format = format specification for snapshot names
     300                </term>
     301                <listitem>
     302                <para>This is an optional parameter that specifies the format
     303                specification for the naming of snapshots in the file system.
     304                The format must be compatible with the conversion
     305                specifications recognized by str[fp]time.
    118306                </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>
     307                <para>Default: shadow:format = "@GMT-%Y.%m.%d-%H.%M.%S"</para>
     308                </listitem>
     309                </varlistentry>
     310
     311                <varlistentry>
     312                <term>shadow:sscanf = yes/no</term>
     313                <listitem>
     314                <para>
     315                This parameter can be used to specify that the time in
     316                format string is given as an unsigned long integer (%lu)
     317                rather than a time strptime() can parse.
     318                The result must be a unix time_t time.
     319                </para>
     320                <para>Default: shadow:sscanf = no</para>
     321                </listitem>
     322                </varlistentry>
    144323
    145324                <varlistentry>
    … …  
    156335                will fail with a sharing violation.
    157336                </para>
    158                 </listitem>
    159                 </varlistentry>
     337                <para>Default: shadow:fixinodes = no</para>
     338                </listitem>
     339                </varlistentry>
     340
     341                <varlistentry>
     342                <term>shadow:snapdirseverywhere = yes/no
     343                </term>
     344                <listitem>
     345                <para>
     346                If you enable
     347                <command moreinfo="none">shadow:snapdirseverywhere </command>
     348                then this module will look
     349                out for snapshot directories in the current working directory
     350                and all parent directories, stopping at the mount point
     351                by default.
     352                But see <command>shadow:crossmountpoints</command> how to change
     353                that behaviour.
     354                </para>
     355                <para>
     356                An example where this is needed are independent filesets in
     357                IBM's GPFS, but other filesystems might support snapshotting
     358                only particular subtrees of the filesystem as well.
     359                </para>
     360                <para>
     361                Note that <command>shadow:snapdirseverywhere</command>
     362                depends on <command>shadow:snapdir</command> and needs it to be
     363                a relative path. Setting an absolute snapdir path disables
     364                <command>shadow:snapdirseverywhere</command>.
     365                </para>
     366                <para>
     367                Note that this option is incompatible with the
     368                <command>shadow:basedir</command> option and removes the
     369                <command>shadow:basedir</command> setting by itself.
     370                </para>
     371                <para>Example: shadow:snapdirseverywhere = yes</para>
     372                <para>Default: shadow:snapdirseverywhere = no</para>
     373                </listitem>
     374                </varlistentry>
     375
     376                <varlistentry>
     377                <term>shadow:crossmountpoints = yes/no
     378                </term>
     379                <listitem>
     380                <para>
     381                This option is effective in the case of
     382                <command>shadow:snapdirseverywhere = yes</command>.
     383                Setting this option makes the module not stop at the
     384                first mount point encountered when looking for snapdirs,
     385                but lets it search potentially all through the path
     386                instead.
     387                </para>
     388                <para>
     389                An example where this is needed are independent filesets in
     390                IBM's GPFS, but other filesystems might support snapshotting
     391                only particular subtrees of the filesystem as well.
     392                </para>
     393                <para>
     394                Note that <command>shadow:crossmountpoints</command>
     395                depends on <command>shadow:snapdir</command> and needs it to be
     396                a relative path. Setting an absolute snapdir path disables
     397                <command>shadow:crossmountpoints</command>.
     398                </para>
     399                <para>
     400                Note that this option is incompatible with the
     401                <command>shadow:basedir</command> option and removes the
     402                <command>shadow:basedir</command> setting by itself.
     403                </para>
     404                <para>Example: shadow:crossmountpoints = yes</para>
     405                <para>Default: shadow:crossmountpoints = no</para>
     406                </listitem>
     407                </varlistentry>
     408
    160409                </variablelist>
    161410</refsect1>
    … …  
    195444        <title>VERSION</title>
    196445
    197         <para>This man page is correct for version 3.2.7 of the Samba suite.
     446        <para>This man page is correct for version 4.0 of the Samba suite.
    198447        </para>
    199448</refsect1>

  • vendor/current/docs-xml/manpages/vfs_streams_depot.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    5353                </varlistentry>
    5454
     55                <varlistentry>
     56                <term>streams_depot:delete_lost = [ yes | no ]</term>
     57                <listitem>
     58                <para>In the case of an already existing data streams directory
     59                for a newly created file the streams directory will be renamed
     60                to "lost-%lu", random(). With this option lost stream directories
     61                will be removed instead of renamed.</para>
     62                <itemizedlist>
     63                <listitem><para>
     64                <command>no(default)</command> - rename lost streams to
     65                "lost-%lu", random().
     66                </para></listitem>
     67                <listitem><para>
     68                <command>yes</command> - remove lost streams.
     69                </para></listitem>
     70                </itemizedlist>
     71                </listitem>
     72                </varlistentry>
     73
    5574        </variablelist>
    5675</refsect1>

  • vendor/current/docs-xml/manpages/vfs_streams_xattr.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    3434        system does not support the concept of multiple data streams per file,
    3535        the streams_xattr module stores the data in posix extended attributes
    36         (xattrs). The name of these attributes is
    37         user.DosStream."ADS-NAME".</para>
     36        (xattrs). The name of these attributes by default is
     37        user.DosStream."ADS-NAME". The prefix "user.DosStream." can be changed
     38        with the module option <command>streams_xattr:prefix</command>, but be
     39        aware that this will also expose those ADS over the SMB extended
     40        attributes interface.</para>
    3841
    3942        <para>The file system that is shared with this module enabled must
    … …  
    4447        that stores small zone information in streams but will fail for
    4548        applications that store serious amounts of data in ADSs.</para>
     49
     50        <para>CAUTION: Make sure to set "kernel oplocks = no" in smb.conf if
     51        if you use this module because this combination is currently broken.
     52        See Bug 7537 for details.</para>
     53</refsect1>
     54
     55<refsect1>
     56        <title>OPTIONS</title>
     57
     58        <variablelist>
     59
     60          <varlistentry>
     61            <term>streams_xattr:prefix = STRING</term>
     62            <listitem>
     63              <para>Name prefix used when storing an ADS in an xattr, defaults to
     64              <command>user.DosStream.</command>. Changing this will also
     65              expose ADS over the SMB extended attributes interface.</para>
     66            </listitem>
     67          </varlistentry>
     68
     69          <varlistentry>
     70            <term>streams_xattr:store_stream_type = [yes|no]</term>
     71            <listitem>
     72              <para>Whether the xattr names for Alternate Data Streams of type
     73              "$DATA" are suffixed by the stream type string ":$DATA".
     74              The default is <command>yes</command>.</para>
     75            </listitem>
     76          </varlistentry>
     77
     78        </variablelist>
     79
    4680</refsect1>
    4781

  • vendor/current/docs-xml/manpages/vfs_time_audit.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    3232        <para>The <command>time_audit</command> VFS module logs system calls
    3333        that take longer than the number of milliseconds defined by the variable
    34         <command>time_audit:audit_timeout</command>. It will log the calls and
     34        <command>time_audit:timeout</command>. It will log the calls and
    3535        the time spent in it.
    3636        </para>
    … …  
    5252                <varlistentry>
    5353
    54                 <term>time_audit:audit_timeout = number of milliseconds</term>
     54                <term>time_audit:timeout = number of milliseconds</term>
    5555                <listitem>
    5656                <para>VFS calls that take longer than the defined number of milliseconds
    … …  
    7575        <smbconfoption name="path">/test/sample_share</smbconfoption>
    7676        <smbconfoption name="vfs objects">time_audit</smbconfoption>
    77         <smbconfoption name="time_audit: audit_timeout">3000</smbconfoption>
     77        <smbconfoption name="time_audit:timeout">3000</smbconfoption>
    7878</programlisting>
    7979</refsect1>
    … …  
    8282<refsect1>
    8383        <title>VERSION</title>
    84         <para>This man page is correct for version 3.6.0 of the Samba suite.
     84        <para>This man page is correct for version 4.0.0 of the Samba suite.
    8585        </para>
    8686</refsect1>

  • vendor/current/docs-xml/manpages/vfs_xattr_tdb.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/vfstest.1.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    4848                <varlistentry>
    4949                <term>-c|--command=command</term>
    50                 <listitem><para>Execute the specified (colon-separated) commands.
     50                <listitem><para>Execute the specified (<constant>semicolon</constant>-separated) commands.
    5151                See below for the commands that are available.
    5252                </para> </listitem>
    … …  
    116116                <listitem><para><command>mknod</command> - VFS mknod()</para></listitem>
    117117                <listitem><para><command>realpath</command> - VFS realpath()</para></listitem>
     118
     119                <listitem><para><command>getxattr</command> - VFS getxattr()</para></listitem>
     120                <listitem><para><command>listxattr</command> - VFS listxattr()</para></listitem>
     121                <listitem><para><command>setxattr</command> - VFS setxattr()</para></listitem>
     122                <listitem><para><command>removexattr</command> - VFS removexattr()</para></listitem>
     123                <listitem><para><command>fget_nt_acl</command> - VFS fget_nt_acl()</para></listitem>
     124                <listitem><para><command>get_nt_acl</command> - VFS get_nt_acl()</para></listitem>
     125                <listitem><para><command>fset_nt_acl</command> - VFS fset_nt_acl()</para></listitem>
     126                <listitem><para><command>set_nt_acl</command> - VFS open() and fset_nt_acl()</para></listitem>
     127                <listitem><para><command>fchmod_acl</command> - VFS fchmod_acl()</para></listitem>
     128                <listitem><para><command>chmod_acl</command> - VFS chmod_acl()</para></listitem>
     129                <listitem><para><command>sys_acl_get_file</command> - VFS sys_acl_get_file()</para></listitem>
     130                <listitem><para><command>sys_acl_get_fd</command> - VFS sys_acl_get_fd()</para></listitem>
     131                <listitem><para><command>sys_acl_blob_get_file</command> - VFS sys_acl_blob_get_file()</para></listitem>
     132                <listitem><para><command>sys_acl_blob_get_fd</command> - VFS sys_acl_blob_get_fd()</para></listitem>
     133                <listitem><para><command>sys_acl_delete_def_file</command> - VFS sys_acl_delete_def_file()</para></listitem>
     134                <listitem><para><command>test_chain</command> - test chain code</para></listitem>
     135                <listitem><para><command>translate_name</command> - VFS translate_name()</para></listitem>
     136
    118137        </itemizedlist>
    119138
    … …  
    136155        <title>VERSION</title>
    137156
    138         <para>This man page is correct for version 3 of the Samba
     157        <para>This man page is correct for version 3 and 4 of the Samba
    139158        suite.</para>
    140159</refsect1>
    … …  
    148167        to the way the Linux kernel is developed.</para>
    149168
    150         <para>The vfstest man page was written by Jelmer Vernooij.</para>
     169        <para>The vfstest man page was written by Jelmer Vernooij. Updated version by Guenter Kukkukk.</para>
    151170</refsect1>
    152171

  • vendor/current/docs-xml/manpages/wbinfo.1.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">User Commands</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2525                <arg choice="opt">--allocate-uid</arg>
    2626                <arg choice="opt">-c</arg>
    27                 <arg choide="opt">--ccache-save</arg>
    28                 <arg choide="opt">--change-user-password</arg>
     27                <arg choice="opt">--ccache-save</arg>
     28                <arg choice="opt">--change-user-password</arg>
    2929                <arg choice="opt">-D domain</arg>
     30                <arg choice="opt">--dc-info domain</arg>
    3031                <arg choice="opt">--domain domain</arg>
    31                 <arg choide="opt">--dsgetdcname domain</arg>
     32                <arg choice="opt">--dsgetdcname domain</arg>
    3233                <arg choice="opt">-g</arg>
    3334                <arg choice="opt">--getdcname domain</arg>
    3435                <arg choice="opt">--get-auth-user</arg>
    3536                <arg choice="opt">-G gid</arg>
    36                 <arg choide="opt">--gid-info</arg>
    37                 <arg choide="opt">--group-info</arg>
     37                <arg choice="opt">--gid-info gid</arg>
     38                <arg choice="opt">--group-info group</arg>
    3839                <arg choice="opt">--help|-?</arg>
    3940                <arg choice="opt">-i user</arg>
    4041                <arg choice="opt">-I ip</arg>
    4142                <arg choice="opt">-K user%password</arg>
    42                 <arg choide="opt">--lanman</arg>
     43                <arg choice="opt">--krb5ccname cctype</arg>
     44                <arg choice="opt">--lanman</arg>
     45                <arg choice="opt">--logoff</arg>
     46                <arg choice="opt">--logoff-uid uid</arg>
     47                <arg choice="opt">--logoff-user username</arg>
     48                <arg choice="opt">--lookup-sids</arg>
    4349                <arg choice="opt">-m</arg>
    4450                <arg choice="opt">-n name</arg>
    4551                <arg choice="opt">-N netbios-name</arg>
    46                 <arg choide="opt">--ntlmv2</arg>
    47                 <arg choide="opt">--online-status</arg>
     52                <arg choice="opt">--ntlmv2</arg>
     53                <arg choice="opt">--online-status</arg>
    4854                <arg choice="opt">--own-domain</arg>
    4955                <arg choice="opt">-p</arg>
    5056                <arg choice="opt">-P|--ping-dc</arg>
     57                <arg choice="opt">--pam-logon user%password</arg>
    5158                <arg choice="opt">-r user</arg>
    52                 <arg choide="opt">-R|--lookup-rids</arg>
     59                <arg choice="opt">-R|--lookup-rids</arg>
     60                <arg choice="opt">--remove-gid-mapping gid,sid</arg>
     61                <arg choice="opt">--remove-uid-mapping uid,sid</arg>
    5362                <arg choice="opt">-s sid</arg>
    5463                <arg choice="opt">--separator</arg>
     64                <arg choice="opt">--sequence</arg>
    5565                <arg choice="opt">--set-auth-user user%password</arg>
     66                <arg choice="opt">--set-gid-mapping gid,sid</arg>
     67                <arg choice="opt">--set-uid-mapping uid,sid</arg>
    5668                <arg choice="opt">-S sid</arg>
    57                 <arg choide="opt">--sid-aliases</arg>
    58                 <arg choide="opt">--sid-to-fullname</arg>
     69                <arg choice="opt">--sid-aliases sid</arg>
     70                <arg choice="opt">--sid-to-fullname sid</arg>
     71                <arg choice="opt">--sids-to-unix-ids sidlist</arg>
    5972                <arg choice="opt">-t</arg>
    6073                <arg choice="opt">-u</arg>
    6174                <arg choice="opt">--uid-info uid</arg>
    62                 <arg choide="opt">--usage</arg>
     75                <arg choice="opt">--usage</arg>
    6376                <arg choice="opt">--user-domgroups sid</arg>
     77                <arg choice="opt">--user-sidinfo sid</arg>
    6478                <arg choice="opt">--user-sids sid</arg>
    6579                <arg choice="opt">-U uid</arg>
    … …  
    142156
    143157                <varlistentry>
     158                <term>--dc-info <replaceable>domain</replaceable></term>
     159                <listitem><para>Displays information about the current domain controller for a domain.
     160                </para></listitem>
     161                </varlistentry>
     162
     163                <varlistentry>
    144164                <term>--domain <replaceable>name</replaceable></term>
    145165                <listitem><para>This parameter sets the domain on which any specified
    146166                operations will performed.  If special domain name '.' is used to represent
    147167                the current domain to which <citerefentry><refentrytitle>winbindd</refentrytitle>
    148                 <manvolnum>8</manvolnum></citerefentry> belongs.  Currently only the
    149                 <option>-u</option>, and <option>-g</option> options honor this parameter.
     168                <manvolnum>8</manvolnum></citerefentry> belongs. A '*' as the domain name
     169                means to enumerate over all domains (NOTE: This can take a long time and use
     170                a lot of memory).
    150171                </para></listitem>
    151172                </varlistentry>
    … …  
    171192
    172193                <varlistentry>
    173                 <term>--group-info <replaceable>user</replaceable></term>
    174                 <listitem><para>Get group info for user.
     194                <term>--group-info <replaceable>group</replaceable></term>
     195                <listitem><para>Get group info from group name.
    175196                </para></listitem>
    176197                </varlistentry>
    … …  
    181202                in the Windows NT domain for which the <citerefentry><refentrytitle>samba</refentrytitle>
    182203                <manvolnum>7</manvolnum></citerefentry> daemon is operating in. Groups in all trusted domains
    183                 will also be listed.  Note that this operation does not assign
     204                can be listed with the --domain='*' option.  Note that this operation does not assign
    184205                group ids to any groups that have not already been
    185206                seen by <citerefentry><refentrytitle>winbindd</refentrytitle>
    … …  
    238259
    239260                <varlistentry>
     261                <term>--krb5ccname <replaceable>KRB5CCNAME</replaceable></term>
     262                <listitem><para>Allows one to request a sepcific kerberos credential
     263                                cache type used for authentication.
     264                </para></listitem>
     265                </varlistentry>
     266
     267                <varlistentry>
    240268                <term>--lanman</term>
    241269                <listitem><para>Use lanman cryptography for user authentication.
     270                </para></listitem>
     271                </varlistentry>
     272
     273                <varlistentry>
     274                <term>--logoff</term>
     275                <listitem><para>Logoff a user.
     276                </para></listitem>
     277                </varlistentry>
     278
     279                <varlistentry>
     280                <term>--logoff-uid <replaceable>UID</replaceable></term>
     281                <listitem><para>Define user uid used during logoff request.
     282                </para></listitem>
     283                </varlistentry>
     284
     285                <varlistentry>
     286                <term>--logoff-user <replaceable>USERNAME</replaceable></term>
     287                <listitem><para>Define username used during logoff request.
     288                </para></listitem>
     289                </varlistentry>
     290
     291                <varlistentry>
     292                <term>--lookup-sids <replaceable>SID1,SID2...</replaceable></term>
     293                <listitem><para>Looks up SIDs. SIDs must be specified as ASCII strings in the traditional Microsoft
     294                                format. For example, S-1-5-21-1455342024-3071081365-2475485837-500.
    242295                </para></listitem>
    243296                </varlistentry>
    … …  
    298351
    299352                <varlistentry>
     353                <term>--pam-logon <replaceable>username%password</replaceable></term>
     354                <listitem><para>Attempt to authenticate a user in the same way
     355                                pam_winbind would do.
     356                </para></listitem>
     357                </varlistentry>
     358
     359                <varlistentry>
    300360                <term>-p|--ping</term>
    301361                <listitem><para>Check whether <citerefentry><refentrytitle>winbindd</refentrytitle>
    … …  
    326386                <listitem><para>Converts RIDs to names. Uses a comma separated
    327387                                list of rids.
     388                </para></listitem>
     389                </varlistentry>
     390
     391                <varlistentry>
     392                <term>--remove-gid-mapping <replaceable>GID,SID</replaceable></term>
     393                <listitem><para>Removes an existing GID to SID mapping from the database.
     394                </para></listitem>
     395                </varlistentry>
     396
     397                <varlistentry>
     398                <term>--remove-uid-mapping <replaceable>UID,SID</replaceable></term>
     399                <listitem><para>Removes an existing UID to SID mapping from the database.
    328400                </para></listitem>
    329401                </varlistentry>
    … …  
    341413                <term>--separator</term>
    342414                <listitem><para>Get the active winbind separator.
     415                </para></listitem>
     416                </varlistentry>
     417
     418                <varlistentry>
     419                <term>--sequence</term>
     420                <listitem><para>This command has been deprecated.  Please use
     421                                the --online-status option instead.
    343422                </para></listitem>
    344423                </varlistentry>
    … …  
    356435
    357436                <varlistentry>
     437                <term>--set-gid-mapping <replaceable>GID,SID</replaceable></term>
     438                <listitem><para>Create a GID to SID mapping in the database.
     439                </para></listitem>
     440                </varlistentry>
     441
     442                <varlistentry>
     443                <term>--set-uid-mapping <replaceable>UID,SID</replaceable></term>
     444                <listitem><para>Create a UID to SID mapping in the database.
     445                </para></listitem>
     446                </varlistentry>
     447
     448                <varlistentry>
    358449                <term>-S|--sid-to-uid <replaceable>sid</replaceable></term>
    359450                <listitem><para>Convert a SID to a UNIX user id.  If the SID
    … …  
    374465                                (DOMAIN\username).
    375466                </para></listitem>
     467                </varlistentry>
     468
     469                <varlistentry>
     470                <term>--sids-to-unix-ids <replaceable>sid1,sid2,sid3...</replaceable></term>
     471                <listitem><para>Resolve SIDs to Unix IDs.
     472                SIDs must be specified as ASCII strings
     473                in the traditional Microsoft format. For example,
     474                S-1-5-21-1455342024-3071081365-2475485837-500. </para></listitem>
    376475                </varlistentry>
    377476
    … …  
    390489                in the Windows NT domain for which the <citerefentry><refentrytitle>winbindd</refentrytitle>
    391490                <manvolnum>8</manvolnum></citerefentry> daemon is operating in. Users in all trusted domains
    392                 will also be listed.  Note that this operation does not assign
     491                can be listed with the --domain='*' option.  Note that this operation does not assign
    393492                user ids to any users that have not already been seen by <citerefentry>
    394493                <refentrytitle>winbindd</refentrytitle><manvolnum>8</manvolnum></citerefentry>
    … …  
    413512                </para></listitem>
    414513                </varlistentry>
     514
     515                <varlistentry>
     516                <term>--user-sidinfo <replaceable>sid</replaceable></term>
     517                <listitem><para>Get user info by sid.
     518                </para></listitem>
     519                </varlistentry>
     520
    415521
    416522                <varlistentry>

  • vendor/current/docs-xml/manpages/winbind_krb5_locator.7.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">7</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212

  • vendor/current/docs-xml/manpages/winbindd.8.xml

    r860 r988  
    88        <refmiscinfo class="source">Samba</refmiscinfo>
    99        <refmiscinfo class="manual">System Administration tools</refmiscinfo>
    10         <refmiscinfo class="version">3.6</refmiscinfo>
     10        <refmiscinfo class="version">4.4</refmiscinfo>
    1111</refmeta>
    1212
    … …  
    2121        <cmdsynopsis>
    2222                <command>winbindd</command>
    23                 <arg choice="opt">-D</arg>
    24                 <arg choice="opt">-F</arg>
    25                 <arg choice="opt">-S</arg>
    26                 <arg choice="opt">-i</arg>
     23                <arg choice="opt">-D|--daemon</arg>
     24                <arg choice="opt">-F|--foreground</arg>
     25                <arg choice="opt">-S|--stdout</arg>
     26                <arg choice="opt">-i|--interactive</arg>
    2727                <arg choice="opt">-d &lt;debug level&gt;</arg>
    2828                <arg choice="opt">-s &lt;smb config file&gt;</arg>
    29                 <arg choice="opt">-n</arg>
     29                <arg choice="opt">-n|--no-caching</arg>
     30                <arg choice="opt">--no-process-group</arg>
    3031        </cmdsynopsis>
    3132</refsynopsisdiv>
    … …  
    136137        <variablelist>
    137138                <varlistentry>
    138                 <term>-D</term>
     139                <term>-D|--daemon</term>
    139140                <listitem><para>If specified, this parameter causes
    140141                the server to operate as a daemon. That is, it detaches
    … …  
    146147
    147148                <varlistentry>
    148                 <term>-F</term>
     149                <term>-F|--foreground</term>
    149150                <listitem><para>If specified, this parameter causes
    150151                the main <command>winbindd</command> process to not daemonize,
    … …  
    161162
    162163                <varlistentry>
    163                 <term>-S</term>
     164                <term>-S|--stdout</term>
    164165                <listitem><para>If specified, this parameter causes
    165166                <command>winbindd</command> to log to standard output rather
    … …  
    169170                &stdarg.server.debug;
    170171                &popt.common.samba;
    171                 &stdarg.help;
    172 
    173                 <varlistentry>
    174                 <term>-i</term>
     172                &popt.autohelp;
     173
     174                <varlistentry>
     175                <term>-i|--interactive</term>
    175176                <listitem><para>Tells <command>winbindd</command> to not
    176177                become a daemon and detach from the current terminal. This
    … …  
    183184
    184185                <varlistentry>
    185                 <term>-n</term>
    186                 <listitem><para>Disable caching. This means winbindd will
    187                 always have to wait for a response from the domain controller
     186                <term>-n|--no-caching</term>
     187                <listitem><para>Disable some caching. This means winbindd will
     188                often have to wait for a response from the domain controller
    188189                before it can respond to a client and this thus makes things
    189190                slower. The results will however be more accurate, since
    190191                results from the cache might not be up-to-date. This
    191192                might also temporarily hang winbindd if the DC doesn't respond.
     193                This does not disable the samlogon cache, which is required for
     194                group membership tracking in trusted environments.
     195                </para></listitem>
     196                </varlistentry>
     197
     198                <varlistentry>
     199                <term>--no-process-group</term>
     200                <listitem><para>Do not create a new process group for winbindd.
    192201                </para></listitem>
    193202                </varlistentry>
    … …  
    363372        machine, unless a shared <smbconfoption name="idmap config * : backend"/> is configured.</para>
    364373
    365         <para>If the the Windows NT SID to UNIX user and group id mapping
     374        <para>If the Windows NT SID to UNIX user and group id mapping
    366375        file is damaged or destroyed then the mappings will be lost. </para>
    367376</refsect1>
Note: See TracChangeset for help on using the changeset viewer.