Changeset 988 for vendor/current/docs-xml/manpages/smb.conf.5.xml

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:

• . (moved) (moved from vendor/current/docs-xml/manpages-3 )
• smb.conf.5.xml (modified) (9 diffs)

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

@@ -7 +7 @@
         <refmiscinfo class="source">Samba</refmiscinfo>
         <refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
-        <refmiscinfo class="version">3.6</refmiscinfo>
+        <refmiscinfo class="version">4.4</refmiscinfo>
 </refmeta>
 
@@ -22 +22 @@
         The <filename moreinfo="none">smb.conf</filename> file is a configuration  file for the Samba suite. <filename
         moreinfo="none">smb.conf</filename> contains  runtime configuration information for the Samba programs. The
-         <filename moreinfo="none">smb.conf</filename> file is designed to be configured and administered by the
-         <citerefentry><refentrytitle>swat</refentrytitle> <manvolnum>8</manvolnum></citerefentry> program. The
         complete description of the file format and possible parameters held within are here for reference purposes.
-        </para> 
+        </para>
 </refsect1>
 
@@ -473 +471 @@
                 <varlistentry>
                 <term>%R</term>
-                <listitem><para>the selected protocol level after protocol negotiation. It can be one of CORE, COREPLUS, 
-                        LANMAN1, LANMAN2 or NT1.</para></listitem>
+                <listitem><para>the selected protocol level after protocol negotiation. It can be one of
+                        CORE, COREPLUS, LANMAN1, LANMAN2, NT1,
+                        SMB2_02, SMB2_10, SMB2_22, SMB2_24,
+                        SMB3_00, SMB3_02, SMB3_10, SMB3_11
+                        or SMB2_FF.</para></listitem>
                 </varlistentry>
 
@@ -504 +505 @@
                 <term>%I</term>
                 <listitem><para>the IP address of the client machine.</para>
-                <para>Before 3.6.0 it could contain IPv4 mapped IPv6 addresses,
+                <para>Before 4.0.0 it could contain IPv4 mapped IPv6 addresses,
                         now it only contains IPv4 or IPv6 addresses.</para>
                 </listitem>
@@ -512 +513 @@
                 <term>%i</term>
                 <listitem><para>the local IP address to which a client connected.</para>
-                <para>Before 3.6.0 it could contain IPv4 mapped IPv6 addresses,
+                <para>Before 4.0.0 it could contain IPv4 mapped IPv6 addresses,
                         now it only contains IPv4 or IPv6 addresses.</para>
                 </listitem>
@@ -671 +672 @@
 </refsect1>
 
-<refsect1 id="VALIDATIONSECT">
-        <title>NOTE ABOUT USERNAME/PASSWORD VALIDATION</title>
-
-        <para>
-        There are a number of ways in which a user can connect to a service. The server uses the following steps
-        in determining if it will allow a connection to a specified service. If all the steps fail, the connection
-        request is rejected.  However, if one of the steps succeeds, the following steps are not checked.
-        </para>
-
-        <para>
-        If the service is marked <quote>guest only = yes</quote> and the server is running with share-level
-        security (<quote>security = share</quote>, steps 1 to 5 are skipped.
-        </para>
-
-
-        <orderedlist continuation="restarts" inheritnum="ignore" numeration="arabic">
-                <listitem><para>
-                If the client has passed a username/password pair and that username/password pair is validated by the UNIX 
-                system's password programs, the connection is made as that username. This includes the
-                <literal>\\server\service</literal>%<replaceable>username</replaceable> method of passing a username.
-                </para></listitem>
-
-                <listitem><para>
-                If the client has previously registered a username with the system and now supplies a correct password for that 
-                username, the connection is allowed.
-                </para></listitem>
-                
-                <listitem><para>
-                The client's NetBIOS name and any previously used usernames are checked against the supplied password. If 
-                they match, the connection is allowed as the corresponding user.
-                </para></listitem>
-                
-                <listitem><para>
-                If the client has previously validated a username/password pair with the server and the client has passed 
-                the validation token, that username is used.
-                </para></listitem>
-
-                <listitem><para>
-                If a <literal>user = </literal> field is given in the <filename moreinfo="none">smb.conf</filename> file for the
-                service and the client has supplied a password, and that password matches (according to the UNIX system's
-                password checking) with one of the usernames from the <literal>user =</literal> field, the connection is made as
-                the username in the <literal>user =</literal> line. If one of the usernames in the <literal>user =</literal> list
-                begins with a <literal>@</literal>, that name expands to a list of names in the group of the same name.
-                </para></listitem>
-
-                <listitem><para>
-                If the service is a guest service, a connection is made as the username given in the <literal>guest account
-                =</literal> for the service, irrespective of the supplied password.
-                </para></listitem>
-        </orderedlist>
-
-</refsect1>
-
 <refsect1>
         <title>REGISTRY-BASED CONFIGURATION</title>
@@ -811 +759 @@
         
         <samba:parameterlist>
-                <xi:include href="../smbdotconf/parameters.all.xml" parse="xml"/>
+                <!-- The URI below is resolved to local generated version of parameters.all.xml //-->
+                <!-- WAF build places it in bin/default/docs-xml/smbdotconf/parameters.all.xml //-->
+                <!-- and we redirect there via use of XML_CATALOG_FILES, see docs-xml/build/catalog.xml.in //-->
+                <xi:include href="http://www.samba.org/samba/smbdotconf/parameters.all.xml" parse="xml"/>
         </samba:parameterlist>
 
@@ -843 +794 @@
         <title>VERSION</title>
 
-        <para>This man page is correct for version 3 of the Samba suite.</para>
+        <para>This man page is correct for version 4 of the Samba suite.</para>
 </refsect1>
 
@@ -851 +802 @@
         <citerefentry><refentrytitle>samba</refentrytitle>
         <manvolnum>7</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbpasswd</refentrytitle>
-        <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>swat</refentrytitle>
         <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbd</refentrytitle>
         <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmbd</refentrytitle>
+        <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>winbindd</refentrytitle>
+        <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>samba</refentrytitle>
+        <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>samba-tool</refentrytitle>
         <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
         <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmblookup</refentrytitle>
         <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testparm</refentrytitle>
-        <manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testprns</refentrytitle>
         <manvolnum>1</manvolnum></citerefentry>.</para>
 </refsect1>